diff options
author | cos <cos> | 2013-06-16 15:53:26 +0200 |
---|---|---|
committer | cos <cos> | 2013-06-16 15:53:26 +0200 |
commit | c1e280da5137ba06e66a902ff8d3cbfe89b29d89 (patch) | |
tree | e23e2d9fb73f9153aa531f121b8aed9534da7df1 | |
parent | 1bc4668b57fd05d8240152c142ca778f817b728d (diff) | |
download | dwb-c1e280da5137ba06e66a902ff8d3cbfe89b29d89.zip |
Imported debian packaging from dwb_20130503hg-2.debian.tar.gz
-rw-r--r-- | debian/changelog | 52 | ||||
-rw-r--r-- | debian/compat | 1 | ||||
-rw-r--r-- | debian/control | 36 | ||||
-rw-r--r-- | debian/copyright | 42 | ||||
-rw-r--r-- | debian/docs | 1 | ||||
-rw-r--r-- | debian/dwb.postinst | 11 | ||||
-rw-r--r-- | debian/dwb.prerm | 7 | ||||
-rw-r--r-- | debian/menu | 2 | ||||
-rw-r--r-- | debian/patches/dwb-js_7.patch | 83 | ||||
-rw-r--r-- | debian/patches/dwb_1.patch | 31 | ||||
-rw-r--r-- | debian/patches/series | 2 | ||||
-rwxr-xr-x | debian/rules | 21 | ||||
-rw-r--r-- | debian/source/format | 1 | ||||
-rw-r--r-- | debian/watch | 2 |
14 files changed, 292 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 00000000..8bf8caf0 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,52 @@ +dwb (20130503hg-2) unstable; urgency=low + + * Fixed update-alternatives from failing during upgrade + * Enabling all hardening options, hardening was already enabled + - but now all hardening options are enabled. + * Changed libglib2.0-dev to libglib2.0-dev (>= 2.36) + Newer libglib2 is needed to run correctly + + -- Nathan Owens <ndowens@gmx.us> Thu, 09 May 2013 07:50:13 +0000 + +dwb (20130503hg-1) unstable; urgency=low + + * Updated version to latest git release + * Added patch config-mk.patch to fix .git not found during compile + * Fixes redundant call to update-menu in init scripts (Closes: #706688) + * Added dwb.1 as part of alternative for x-www-browser (Closes: #706685) + * Release fixes implicit conversion of double to enum (Closes: #688568) + + -- Nathan Owens <ndowens@gmx.us> Sat, 04 May 2013 18:17:43 -0500 + +dwb (20130424hg-1) unstable; urgency=low + + * Tentative fixing https-related bug that crashes browser (Closes: #699072). + * Fixed typo 'histroy" in control file (Closes: #685152). + * Changed 'webkit' to 'WebKit' (Closes: #685152). + * Added requested support for update-alternatives (Closes: #688301). + * Added #DEBHELPER# to postinst and postrm script. + * Removed dwb/.git and .pc files. + * Cleaned up control and rules file to make it easier to read. + * Created manpage patch to fix some typos in the manpage(doc/dwb-js.7). + * Updated Package to the latest version from GIT from 04/09/2013. + + -- Nathan Owens <ndowens@gmx.us> Tue, 23 Apr 2013 05:18:37 -0500 +dwb (20120628hg-1) unstable; urgency=low + + * New upstream snapshot version. + * Fixes URL redirection issue (Closes: #673279). + * Enhance dwb security using hardening flags, build-dep on hardening-wrapper. + * Recommends on wget and xterm, enhances downloading features. + * Update local patch: + - debian/patches/manpage patch, new upstream manpage introduced a typo. + * Removed deprecated patches with updated release: + - debian/patches/configh-spelling.patch (Upstream adopted). + - debian/patches/nulldereferences.patch (Upstream backported). + + -- Nathan Owens <ndowens@gmx.us> Thu, 28 Jun 2012 12:33:23 -0500 + +dwb (20120402hg-1) unstable; urgency=low + + * Initial Release (Closes: #656145). + + -- Nathan Owens <ndowens@gmx.us> Tue, 03 Apr 2012 20:00:27 -0500 diff --git a/debian/compat b/debian/compat new file mode 100644 index 00000000..ec635144 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 00000000..0db3d694 --- /dev/null +++ b/debian/control @@ -0,0 +1,36 @@ +Source: dwb +Section: web +Priority: extra +Maintainer: Nathan Owens <ndowens@gmx.us> +Build-Depends: debhelper (>= 9), + libwebkitgtk-3.0-dev, + libgnutls-dev, + libsoup2.4-dev, + libjson0-dev, + m4, + libglib2.0-dev (>= 2.36) +Standards-Version: 3.9.4 +Homepage: http://portix.bitbucket.org/dwb/ + +Package: dwb +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Provides: www-browser +Recommends: wget, xterm +Description: lightweight WebKit browser + Highly customizable browser that can be easily configured through a web + interface. Intends to be mostly keyboard driven. + . + Features: + - vi like shortcuts + - Link followed by keyboard hints + - Bookmarks + - Quickmarks + - Cookie support + - Proxy support + - Userscript support + - Tab completion for history, bookmarks, userscripts + - Custom CSS Stylesheets + - Tiling layouts + - and more... diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 00000000..f39040af --- /dev/null +++ b/debian/copyright @@ -0,0 +1,42 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: dwb +Source: https://bitbucket.org/portix/dwb/downloads/ + +Files: * +Copyright: 2010-2011 Stefan Bolte <portix@gmx.net> +License: GPL-3 + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/> + . + On Debian systems, the complete text of the GNU General + Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". + +Files: debian/* +Copyright: 2013 Nathan Owens <ndowens@gmx.us> +License: GPL-3 + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/> + . + On Debian systems, the complete text of the GNU General + Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". + diff --git a/debian/docs b/debian/docs new file mode 100644 index 00000000..e845566c --- /dev/null +++ b/debian/docs @@ -0,0 +1 @@ +README diff --git a/debian/dwb.postinst b/debian/dwb.postinst new file mode 100644 index 00000000..ed5eb249 --- /dev/null +++ b/debian/dwb.postinst @@ -0,0 +1,11 @@ +#!/bin/sh +set -e + +if [ "$!" = "configure" ] || [ "$1" = "abort-upgrade" ]; then + update-alternatives --install /usr/bin/x-www-browser \ + x-www-browser /usr/bin/dwb 50 \ + --slave /usr/share/man/man1/x-www-browser.1.gz \ + x-www-browser.1.gz \ + /usr/share/man/man1/dwb.1.gz +fi +#DEBHELPER# diff --git a/debian/dwb.prerm b/debian/dwb.prerm new file mode 100644 index 00000000..ff458990 --- /dev/null +++ b/debian/dwb.prerm @@ -0,0 +1,7 @@ +#!/bin/sh +set -e + +if [ "$1" != "upgrade" ]; then + update-alternatives --remove x-www-browser /usr/bin/dwb +fi +#DEBHELPER# diff --git a/debian/menu b/debian/menu new file mode 100644 index 00000000..a0c8cebd --- /dev/null +++ b/debian/menu @@ -0,0 +1,2 @@ +?package(dwb):needs="X11" section="Applications/Network/Web Browsing"\ + title="dwb" command="/usr/bin/dwb" diff --git a/debian/patches/dwb-js_7.patch b/debian/patches/dwb-js_7.patch new file mode 100644 index 00000000..a4b1acc7 --- /dev/null +++ b/debian/patches/dwb-js_7.patch @@ -0,0 +1,83 @@ +Description: Fixes several spelling errors +Author: Stefan Bolte <portix@gmx.net> +Origin: vendor +Bug: https://bitbucket.org/portix/dwb/issue/310/debian-cant-break-line +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/doc/dwb-js.7 ++++ b/doc/dwb-js.7 +@@ -68,7 +68,7 @@ + .sp -1 + .IP \(bu 2.3 + .\} +-The execution context of userscripts is completely seperated from the web execution context\&. Due to security concerns it is not possible to communicate with the web execution context, it is only possible to inject scripts into the web context\&. ++The execution context of userscripts is completely separated from the web execution context\&. Due to security concerns it is not possible to communicate with the web execution context, it is only possible to inject scripts into the web context\&. + .RE + .sp + .RS 4 +@@ -302,7 +302,7 @@ + .PP + \fInames\fR + .RS 4 +-An array of module names or null to get all modules, a module name can also contain a path, the path must be seperated with a ++An array of module names or null to get all modules, a module name can also contain a path, the path must be separated with a + \fB!\fR + from the module name, see also MODULES for details\&. + .RE +@@ -715,7 +715,7 @@ + .PP + \fIenviron\fR + .RS 4 +-Object that can be used to add environment variables to the childs environment, optional\&. ++Object that can be used to add environment variables to the environment, optional\&. + .RE + .PP + \fIreturns\fR +@@ -741,7 +741,7 @@ + .PP + \fIenvironment\fR + .RS 4 +-Object that can be used to add environment variables to the childs environment, optional\&. ++Object that can be used to add environment variables to the environment, optional\&. + .RE + .PP + \fIreturns\fR +@@ -1376,7 +1376,7 @@ + .RE + .SS "Deferred" + .sp +-Deferred objects can be used to manage asynchronous operations\&. It can trigger a callback function when an asynchrounous operation has finished, and allows chaining of callbacks\&. Deferred basically has 2 callback chains, a \fIdone\fR\-chain and a \fIfail\fR\-chain\&. If a asynchronous operation is successful the deferred should be resolved and the done callback chain of the deferred is called\&. If a asynchronous operation fails the deferred should be rejected and the fail callback chain of the deferred is called\&. ++Deferred objects can be used to manage asynchronous operations\&. It can trigger a callback function when an asynchrounous operation has finished, and allows one to chaining of callbacks\&. Deferred basically has 2 callback chains, a \fIdone\fR\-chain and a \fIfail\fR\-chain\&. If a asynchronous operation is successful the deferred should be resolved and the done callback chain of the deferred is called\&. If a asynchronous operation fails the deferred should be rejected and the fail callback chain of the deferred is called\&. + .sp + Deferreds implement the following methods: + .sp +@@ -2446,9 +2446,9 @@ + .RE + .SH "SIGNALS" + .sp +-Execute code on certain events\&. dwb emits some signals, e\&.g\&. before a new site is loaded, the signals object can be used to handle these signals\&. All events are emitted on the signals object itself, for example "signals\&.keyPress = function() { \&... };" would connect to the keyPress signal but it is strongly discouraged to use this pattern since it will only allow to connect one callback to a certain signal\&. To handle signals Signal\-objects can be used, it manages signals, allows to connect to more than one signal and also allows to easily disconnect/reconnect to signals\&. ++Execute code on certain events\&. dwb emits some signals, e\&.g\&. before a new site is loaded, the signals object can be used to handle these signals\&. All events are emitted on the signals object itself, for example "signals\&.keyPress = function() { \&... };" would connect to the keyPress signal but it is strongly discouraged to use this pattern since it will only allow to connect one callback to a certain signal\&. To handle signals Signal\-objects can be used, it manages signals, allows one to to connect to more than one signal and also allows one to to easily disconnect/reconnect to signals\&. + .sp +-There is just one convenient pattern that allows setting callbacks directly on signals: if the signal name starts with "on" dwb will internally create a new Signal and connect to it with the given callback function, i\&.e\&. using signals\&.onResource = function () {\&...} allows to connect more than one callback to the "resource"\-event, however it doesn\(cqt give you as much control as creating a Signal\&. When connected with this pattern it is not possible to disconnect from the signal with signals\&.onResource = null;, instead Signal\&.disconnect must be used\&. ++There is just one convenient pattern that allows one to setting callbacks directly on signals: if the signal name starts with "on" dwb will internally create a new Signal and connect to it with the given callback function, i\&.e\&. using signals\&.onResource = function () {\&...} allows one to to connect more than one callback to the "resource"\-event, however it doesn\(cqt give you as much control as creating a Signal\&. When connected with this pattern it is not possible to disconnect from the signal with signals\&.onResource = null;, instead Signal\&.disconnect must be used\&. + .SS "Emitted signals" + .sp + Custom signals can be created by simply calling +@@ -3019,7 +3019,7 @@ + .RE + .\} + .sp +-Emitted when the load has just commited, no data has been loaded when this signal is emitted\&. This is the preferred signal for injected scripts that do not manipulate the DOM\&. ++Emitted when the load has just committed, no data has been loaded when this signal is emitted\&. This is the preferred signal for injected scripts that do not manipulate the DOM\&. + .PP + \fIwebview\fR + .RS 4 +@@ -4237,7 +4237,7 @@ + \fBunique_tabs\fR + .RS 4 + .sp +-Extension that allows to remove duplicate tabs or avoids duplicate tabs automatically\&. ++Extension that allows one to to remove duplicate tabs or avoids duplicate tabs automatically\&. + .PP + \fBConfiguration options\fR + .RS 4 diff --git a/debian/patches/dwb_1.patch b/debian/patches/dwb_1.patch new file mode 100644 index 00000000..b78d8e58 --- /dev/null +++ b/debian/patches/dwb_1.patch @@ -0,0 +1,31 @@ +Description: Fixes lintian error that line can't break +Author: Nathan Owens <ndowens@gmx.us> +Origin: vendor +Bug: https://bitbucket.org/portix/dwb/issue/310/debian-cant-break-line +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/doc/dwb.1 ++++ b/doc/dwb.1 +@@ -1413,20 +1413,18 @@ + .sp + Allow persistent cookies for current site + T} +-T{ + .sp + allow_session_cookie +-T}:T{ ++T{ + .sp + scookie + T}:T{ + .sp + Allow session cookies for currrent site + T} +-T{ + .sp + allow_session_cookie_tmp +-T}:T{ ++T{ + .sp + tcookie + T}:T{ diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 00000000..e6e118f5 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,2 @@ +dwb_1.patch +dwb-js_7.patch diff --git a/debian/rules b/debian/rules new file mode 100755 index 00000000..a257481e --- /dev/null +++ b/debian/rules @@ -0,0 +1,21 @@ +#!/usr/bin/make -f +# -*- makefile -*- +export DEB_BUILD_MAINT_OPTIONS = hardening=+all +export GTK=3 +export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed + +COMMIT=d6755999c1b16af33353a4fc248a3e8c56abe49d +get-orig-source: + TMPD=`mktemp -d` && \ + git clone https://bitbucket.org/portix/dwb.git \ + "$$TMPD/dwb" && \ + CDATE=`git --git-dir="$$TMPD/dwb/.git" show \ + --format=format:%ci -s $(COMMIT) | \ + awk '{ gsub(/-/,""); print $$1 }'` && \ + git --git-dir="$$TMPD/dwb/.git" archive \ + --prefix=dwb/ $(COMMIT) | \ + bzip2 > ../dwb_"$$CDATE"hg.orig.tar.bz2 && \ + rm -rf $$TMPD + +%: + dh $@ diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 00000000..46ebe026 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt)
\ No newline at end of file diff --git a/debian/watch b/debian/watch new file mode 100644 index 00000000..58209eb6 --- /dev/null +++ b/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://bitbucket.org/portix/dwb/downloads/dwb-(.+).tar.gz |