Gitweb links: ...log http://git.netsurf-browser.org/packaging/debian.git/shortlog/40998857966097a32d8f77e491b29b335202f146 ...commit http://git.netsurf-browser.org/packaging/debian.git/commit/40998857966097a32d8f77e491b29b335202f146 ...tree http://git.netsurf-browser.org/packaging/debian.git/tree/40998857966097a32d8f77e491b29b335202f146
The branch, squeeze has been updated via 40998857966097a32d8f77e491b29b335202f146 (commit) via 3a348169e2b25ca739d1e0098a3022a050d86ce2 (commit) via f80d77917323908154fb841c9237b443c1b120f5 (commit) via c7f2999376ed85dc88656b442ca16490cd525511 (commit) via 851fa6abe00ac7340cdd65031c67639e67b32178 (commit) via 9bc65fdec39f779434cdb11e01ed687e0acf7841 (commit) via ca0e9c788812d58f2a33aa84c97ddea48daff77f (commit) via 5710cd9a5c3e080799d538431cc8bbdc13c7e211 (commit) from 0c3ed81bfee28fe50e63ef24d3b6ed03d08ceddd (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/packaging/debian.git/commit/?id=40998857966097a32d8f77e491b29b335202f146 commit 40998857966097a32d8f77e491b29b335202f146 Author: Vincent Sanders <vi...@kyllikki.org> Commit: Vincent Sanders <vi...@kyllikki.org> add verbose flags to build diff --git a/rules b/rules index a3b3ec2..4348a4c 100755 --- a/rules +++ b/rules @@ -12,8 +12,8 @@ export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed dh $@ override_dh_auto_build: - dh_auto_build -- PREFIX=/usr TARGET=gtk - dh_auto_build -- PREFIX=/usr TARGET=framebuffer + dh_auto_build -- V=1 PREFIX=/usr TARGET=gtk + dh_auto_build -- V=1 PREFIX=/usr TARGET=framebuffer override_dh_auto_install: dh_auto_install -- PREFIX=/usr TARGET=gtk commitdiff http://git.netsurf-browser.org/packaging/debian.git/commit/?id=3a348169e2b25ca739d1e0098a3022a050d86ce2 commit 3a348169e2b25ca739d1e0098a3022a050d86ce2 Author: Vincent Sanders <vi...@kyllikki.org> Commit: Vincent Sanders <vi...@kyllikki.org> remove unecessary patch to install targets diff --git a/patches/change-install-binary-targets b/patches/change-install-binary-targets deleted file mode 100644 index 3865c8c..0000000 --- a/patches/change-install-binary-targets +++ /dev/null @@ -1,22 +0,0 @@ ---- a/netsurf/frontends/framebuffer/Makefile -+++ b/netsurf/frontends/framebuffer/Makefile -@@ -173,7 +173,7 @@ - install-framebuffer: - $(Q)mkdir -p $(DESTDIR)$(NETSURF_FRAMEBUFFER_BIN) - $(Q)mkdir -p $(DESTDIR)$(NETSURF_FRAMEBUFFER_RESOURCES) -- $(Q)cp -v $(EXETARGET) $(DESTDIR)/$(NETSURF_FRAMEBUFFER_BIN)netsurf$(SUBTARGET) -+ $(Q)cp -v $(EXETARGET) $(DESTDIR)/$(NETSURF_FRAMEBUFFER_BIN)netsurf-fb - $(Q)for F in $(NETSURF_FRAMEBUFFER_RESOURCE_LIST); do cp -vL framebuffer/res/$$F $(DESTDIR)/$(NETSURF_FRAMEBUFFER_RESOURCES); done - $(Q)$(SPLIT_MESSAGES) -l en -p fb -f messages resources/FatMessages | gzip -9n > $(DESTDIR)$(NETSURF_FRAMEBUFFER_RESOURCES)messages - ---- a/netsurf/frontends/gtk/Makefile -+++ b/netsurf/frontends/gtk/Makefile -@@ -190,7 +190,7 @@ - - install-gtk: - $(Q)mkdir -p $(DESTDIR)$(NETSURF_GTK_BIN) -- $(Q)install nsgtk $(DESTDIR)$(NETSURF_GTK_BIN)netsurf -+ $(Q)install nsgtk $(DESTDIR)$(NETSURF_GTK_BIN)netsurf-gtk - $(Q)mkdir -p $(DESTDIR)$(NETSURF_GTK_RESOURCES)icons - $(Q)install -m 0644 $(NSGTK_RESOURCES_DIR)/icons/*.png $(DESTDIR)$(NETSURF_GTK_RESOURCES)/icons - $(Q)mkdir -p $(DESTDIR)$(NETSURF_GTK_RESOURCES)throbber diff --git a/patches/series b/patches/series index 3ba4a07..a8f7a18 100644 --- a/patches/series +++ b/patches/series @@ -1,2 +1 @@ set-netsurf-config.patch -change-install-binary-targets commitdiff http://git.netsurf-browser.org/packaging/debian.git/commit/?id=f80d77917323908154fb841c9237b443c1b120f5 commit f80d77917323908154fb841c9237b443c1b120f5 Author: Vincent Sanders <vi...@kyllikki.org> Commit: Vincent Sanders <vi...@kyllikki.org> update rules to cope with gtk resources being moved in source diff --git a/rules b/rules index a34f111..a3b3ec2 100755 --- a/rules +++ b/rules @@ -19,8 +19,8 @@ override_dh_auto_install: dh_auto_install -- PREFIX=/usr TARGET=gtk mkdir -p debian/netsurf-gtk/usr/share/pixmaps mkdir -p debian/netsurf-gtk/usr/share/applications - convert netsurf/gtk/res/netsurf.xpm -resize \!32x\!32 debian/netsurf-gtk/usr/share/pixmaps/netsurf.xpm - convert netsurf/gtk/res/netsurf.xpm debian/netsurf-gtk/usr/share/pixmaps/netsurf.png + convert netsurf/frontends/gtk/res/netsurf.xpm -resize \!32x\!32 debian/netsurf-gtk/usr/share/pixmaps/netsurf.xpm + convert netsurf/frontends/gtk/res/netsurf.xpm debian/netsurf-gtk/usr/share/pixmaps/netsurf.png install -m 644 debian/netsurf-gtk.desktop debian/netsurf-gtk/usr/share/applications dh_auto_install -- PREFIX=/usr TARGET=framebuffer commitdiff http://git.netsurf-browser.org/packaging/debian.git/commit/?id=c7f2999376ed85dc88656b442ca16490cd525511 commit c7f2999376ed85dc88656b442ca16490cd525511 Author: Vincent Sanders <vi...@kyllikki.org> Commit: Vincent Sanders <vi...@kyllikki.org> add licences for new libraries diff --git a/copyright b/copyright index 8789eca..49a01aa 100644 --- a/copyright +++ b/copyright @@ -106,10 +106,18 @@ Files: libnsutils/* Copyright: 2014-2015 Vincent Sanders <vi...@netsurf-browser.org> License: MIT +Files: libnspsl/* +Copyright: 2016 Vincent Sanders <vi...@netsurf-browser.org> +License: MIT + Files: librosprite/* Copyright: 2007-2008 James Shaw <js...@netsurf-browser.org> License: MIT +Files: libpencil/* +Copyright: 2005 James Bursa <ja...@netsurf-browser.org> +License: MIT + Files: librufl/* Copyright: 2005-2007 James Bursa <ja...@netsurf-browser.org> 2005-2014 John-Mark Bell <j...@netsurf-browser.org> commitdiff http://git.netsurf-browser.org/packaging/debian.git/commit/?id=851fa6abe00ac7340cdd65031c67639e67b32178 commit 851fa6abe00ac7340cdd65031c67639e67b32178 Author: Vincent Sanders <vi...@kyllikki.org> Commit: Vincent Sanders <vi...@kyllikki.org> remove fuzz from gtk binary install patch diff --git a/patches/change-install-binary-targets b/patches/change-install-binary-targets index 226f937..3865c8c 100644 --- a/patches/change-install-binary-targets +++ b/patches/change-install-binary-targets @@ -18,5 +18,5 @@ - $(Q)install nsgtk $(DESTDIR)$(NETSURF_GTK_BIN)netsurf + $(Q)install nsgtk $(DESTDIR)$(NETSURF_GTK_BIN)netsurf-gtk $(Q)mkdir -p $(DESTDIR)$(NETSURF_GTK_RESOURCES)icons - $(Q)install -m 0644 gtk/res/icons/*.png $(DESTDIR)$(NETSURF_GTK_RESOURCES)/icons + $(Q)install -m 0644 $(NSGTK_RESOURCES_DIR)/icons/*.png $(DESTDIR)$(NETSURF_GTK_RESOURCES)/icons $(Q)mkdir -p $(DESTDIR)$(NETSURF_GTK_RESOURCES)throbber commitdiff http://git.netsurf-browser.org/packaging/debian.git/commit/?id=9bc65fdec39f779434cdb11e01ed687e0acf7841 commit 9bc65fdec39f779434cdb11e01ed687e0acf7841 Author: Vincent Sanders <vi...@kyllikki.org> Commit: Vincent Sanders <vi...@kyllikki.org> fixup patch for 3.6 code layout diff --git a/patches/change-install-binary-targets b/patches/change-install-binary-targets index e10ebef..226f937 100644 --- a/patches/change-install-binary-targets +++ b/patches/change-install-binary-targets @@ -1,6 +1,6 @@ ---- a/netsurf/frontends/framebuffer/Makefile.target -+++ b/netsurf/frontends/framebuffer/Makefile.target -@@ -191,7 +191,7 @@ +--- a/netsurf/frontends/framebuffer/Makefile ++++ b/netsurf/frontends/framebuffer/Makefile +@@ -173,7 +173,7 @@ install-framebuffer: $(Q)mkdir -p $(DESTDIR)$(NETSURF_FRAMEBUFFER_BIN) $(Q)mkdir -p $(DESTDIR)$(NETSURF_FRAMEBUFFER_RESOURCES) @@ -9,9 +9,9 @@ $(Q)for F in $(NETSURF_FRAMEBUFFER_RESOURCE_LIST); do cp -vL framebuffer/res/$$F $(DESTDIR)/$(NETSURF_FRAMEBUFFER_RESOURCES); done $(Q)$(SPLIT_MESSAGES) -l en -p fb -f messages resources/FatMessages | gzip -9n > $(DESTDIR)$(NETSURF_FRAMEBUFFER_RESOURCES)messages ---- a/netsurf/frontends/gtk/Makefile.target -+++ b/netsurf/frontends/gtk/Makefile.target -@@ -142,7 +142,7 @@ +--- a/netsurf/frontends/gtk/Makefile ++++ b/netsurf/frontends/gtk/Makefile +@@ -190,7 +190,7 @@ install-gtk: $(Q)mkdir -p $(DESTDIR)$(NETSURF_GTK_BIN) commitdiff http://git.netsurf-browser.org/packaging/debian.git/commit/?id=ca0e9c788812d58f2a33aa84c97ddea48daff77f commit ca0e9c788812d58f2a33aa84c97ddea48daff77f Author: Vincent Sanders <vi...@kyllikki.org> Commit: Vincent Sanders <vi...@kyllikki.org> update for 3.6 release branch diff --git a/changelog b/changelog index f200edb..0cc05bc 100644 --- a/changelog +++ b/changelog @@ -1,10 +1,17 @@ -netsurf (3.5-1) UNRELEASED; urgency=medium +netsurf (3.6-1) UNRELEASED; urgency=medium + + * Update standards version (no change) + * New upstream release + + -- Vincent Sanders <vi...@debian.org> Tue, 04 Oct 2016 09:04:59 +0100 + +netsurf (3.5-1) unstable; urgency=medium * Update standards version (no change) * New upstream release (closes: #803313) * Correct VCS headers (closes: #819882) - -- Vincent Sanders <vi...@debian.org> Sun, 17 Jul 2016 21:56:12 +0100 + -- Vincent Sanders <vi...@debian.org> Tue, 04 Sep 2016 09:04:20 +0100 netsurf (3.2+dfsg-3) unstable; urgency=medium diff --git a/control b/control index bf84971..4bdce4e 100644 --- a/control +++ b/control @@ -2,7 +2,7 @@ Source: netsurf Section: web Priority: extra Maintainer: Vincent Sanders <vi...@debian.org> -Build-Depends: debhelper (>= 8~), libcurl4-openssl-dev, libpng-dev, libgtk2.0-dev, flex, bison, libhtml-parser-perl, libmozjs-dev [!s390x], librsvg2-dev, libjpeg-dev, imagemagick, libfreetype6-dev, libvncserver-dev, libsdl1.2-dev, libxcb1-dev, libxcb-icccm1-dev, libxcb-image0-dev, libxcb-keysyms1-dev, libxcb-aux0-dev, libssl-dev, gperf +Build-Depends: debhelper (>= 8~), libcurl4-openssl-dev, libpng-dev, libgtk2.0-dev, flex, bison, libhtml-parser-perl, librsvg2-dev, libjpeg-dev, imagemagick, libfreetype6-dev, libvncserver-dev, libsdl1.2-dev, libxcb1-dev, libxcb-icccm1-dev, libxcb-image0-dev, libxcb-keysyms1-dev, libxcb-aux0-dev, libssl-dev, gperf Standards-Version: 3.9.8 Homepage: http://www.netsurf-browser.org Vcs-Browser: http://source.netsurf-browser.org/packaging/debian.git/ diff --git a/patches/change-install-binary-targets b/patches/change-install-binary-targets index 9e1a7fd..e10ebef 100644 --- a/patches/change-install-binary-targets +++ b/patches/change-install-binary-targets @@ -1,5 +1,5 @@ ---- a/netsurf/framebuffer/Makefile.target -+++ b/netsurf/framebuffer/Makefile.target +--- a/netsurf/frontends/framebuffer/Makefile.target ++++ b/netsurf/frontends/framebuffer/Makefile.target @@ -191,7 +191,7 @@ install-framebuffer: $(Q)mkdir -p $(DESTDIR)$(NETSURF_FRAMEBUFFER_BIN) @@ -9,8 +9,8 @@ $(Q)for F in $(NETSURF_FRAMEBUFFER_RESOURCE_LIST); do cp -vL framebuffer/res/$$F $(DESTDIR)/$(NETSURF_FRAMEBUFFER_RESOURCES); done $(Q)$(SPLIT_MESSAGES) -l en -p fb -f messages resources/FatMessages | gzip -9n > $(DESTDIR)$(NETSURF_FRAMEBUFFER_RESOURCES)messages ---- a/netsurf/gtk/Makefile.target -+++ b/netsurf/gtk/Makefile.target +--- a/netsurf/frontends/gtk/Makefile.target ++++ b/netsurf/frontends/gtk/Makefile.target @@ -142,7 +142,7 @@ install-gtk: diff --git a/patches/libpng16-fix.patch b/patches/libpng16-fix.patch deleted file mode 100644 index 4da88ce..0000000 --- a/patches/libpng16-fix.patch +++ /dev/null @@ -1,24 +0,0 @@ -Description: use png native types, they are platform dependent. - (and also silence some warnings about missing memcpy prototype) -Author: Tobias Frost <t...@debian.org> ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/netsurf/framebuffer/convert_image.c -+++ b/netsurf/framebuffer/convert_image.c -@@ -21,6 +21,7 @@ - #include <stdio.h> - #include <png.h> - #include <stdlib.h> -+#include <string.h> - - #if PNG_LIBPNG_VER < 10209 - #define png_set_expand_gray_1_2_4_to_8(png) png_set_gray_1_2_4_to_8(png) -@@ -219,7 +220,7 @@ - { - int bit_depth, color_type, interlace, intent; - double gamma; -- unsigned long width, height; -+ png_uint_32 width, height; - - /* Read the PNG details */ - png_get_IHDR(png, info, &width, &height, &bit_depth, diff --git a/patches/series b/patches/series index c649698..3ba4a07 100644 --- a/patches/series +++ b/patches/series @@ -1,3 +1,2 @@ set-netsurf-config.patch change-install-binary-targets -libpng16-fix.patch commitdiff http://git.netsurf-browser.org/packaging/debian.git/commit/?id=5710cd9a5c3e080799d538431cc8bbdc13c7e211 commit 5710cd9a5c3e080799d538431cc8bbdc13c7e211 Author: Vincent Sanders <vi...@kyllikki.org> Commit: Vincent Sanders <vi...@kyllikki.org> update to include relevant NMU and prepare for 3.5 release diff --git a/changelog b/changelog index 18aef9a..f200edb 100644 --- a/changelog +++ b/changelog @@ -1,9 +1,28 @@ -netsurf (3.2-3) UNRELEASED; urgency=medium +netsurf (3.5-1) UNRELEASED; urgency=medium * Update standards version (no change) - * Acknowledge NMU, thanks to Peter Michael Green + * New upstream release (closes: #803313) + * Correct VCS headers (closes: #819882) - -- Vincent Sanders <vi...@debian.org> Sun, 28 Jun 2015 21:56:12 +0100 + -- Vincent Sanders <vi...@debian.org> Sun, 17 Jul 2016 21:56:12 +0100 + +netsurf (3.2+dfsg-3) unstable; urgency=medium + + * Heap overflow fix Fixes: CVE-2015-7508 (Closes: #810491) + * Out of bounds read fix Fixes: CVE-2015-7507 + * Out of bounds read fix Fixes: CVE-2015-7506 + * Stack overflow fix Fixes: CVE-2015-7505 + * Update package copyright to fix lintian warnings + * Acknowledge NMU, thanks to Tobias Frost + + -- Vincent Sanders <vi...@debian.org> Fri, 15 Jul 2016 13:58:09 +0100 + +netsurf (3.2+dfsg-2.3) unstable; urgency=medium + + * Non-maintainer upload. + * Fix compilation error on s390x, use libpng own types. (Closes: #820612) + + -- Tobias Frost <t...@debian.org> Sun, 10 Apr 2016 17:36:37 +0200 netsurf (3.2+dfsg-2.2) unstable; urgency=medium @@ -172,6 +191,5 @@ netsurf (1.0-1) unstable; urgency=low * Fix for runaway cpu usage on sites with frames. * Fix for cookie handling. * Fix scrollbar handling for anchors. - - -- Vincent Sanders <vi...@debian.org> Sun, 3 Jun 2007 18:14:27 +0100 + -- Vincent Sanders <vi...@debian.org> Sun, 3 Jun 2007 18:14:27 +0100 diff --git a/control b/control index 12d2c39..bf84971 100644 --- a/control +++ b/control @@ -3,10 +3,10 @@ Section: web Priority: extra Maintainer: Vincent Sanders <vi...@debian.org> Build-Depends: debhelper (>= 8~), libcurl4-openssl-dev, libpng-dev, libgtk2.0-dev, flex, bison, libhtml-parser-perl, libmozjs-dev [!s390x], librsvg2-dev, libjpeg-dev, imagemagick, libfreetype6-dev, libvncserver-dev, libsdl1.2-dev, libxcb1-dev, libxcb-icccm1-dev, libxcb-image0-dev, libxcb-keysyms1-dev, libxcb-aux0-dev, libssl-dev, gperf -Standards-Version: 3.9.0 +Standards-Version: 3.9.8 Homepage: http://www.netsurf-browser.org -Vcs-Browser: http://source.netsurf-browser.org/ -Vcs-Git: git://git.netsurf-browser.org/netsurf-all.git +Vcs-Browser: http://source.netsurf-browser.org/packaging/debian.git/ +Vcs-Git: git://git.netsurf-browser.org/packaging/debian.git Package: netsurf Architecture: all diff --git a/copyright b/copyright index 6d459c1..8789eca 100644 --- a/copyright +++ b/copyright @@ -1,44 +1,44 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: NetSurf Upstream-Contact: NetSurf Developers <netsurf-...@netsurf-browser.org> -Source: http://download.netsurf-browser.org/netsurf/releases/source-full/netsurf-all-3.3.tar.gz +Source: http://download.netsurf-browser.org/netsurf/releases/source-full/netsurf-all-3.5.tar.gz Files: netsurf/* -Copyright: 2003-2015 John-Mark Bell <j...@netsurf-browser.org> - 2003-2011 James Bursa <bu...@users.sourceforge.net> - 2003 Philip Pemberton <phil...@users.sourceforge.net> - 2003 Phil Mellor <monkey...@users.sourceforge.net> - 2003 Rob Jackson <ja...@xms.ms> - 2004-2009 Richard Wilson <i...@tinct.net> - 2004-2009 John Tytgat <j...@netsurf-browser.org> - 2004 Andrew Timmins <atimm...@blueyonder.co.uk> - 2004 Kevin Bagust <kevin.bag...@ntlworld.com> - 2005-2009 Adrian Lees <adri...@users.sourceforge.net> - 2005,2008-2012 Chris Young <ch...@unsatisfactorysoftware.co.uk> - 2006-2015 Daniel Silverstone <dsilv...@netsurf-browser.org> - 2006-2015 Rob Kendrick <r...@netsurf-browser.org> - 2007-2015 Vincent Sanders <vi...@netsurf-browser.org> - 2008 Adam Blokus <adamblo...@gmail.com> - 2008 Andrew Sidwell <takka...@netsurf-browser.org> - 2008-2012 François Revol <mmu_...@users.sourceforge.net> +Copyright: 2003-2016 John-Mark Bell <j...@netsurf-browser.org> + 2003-2011 James Bursa <bu...@users.sourceforge.net> + 2003 Philip Pemberton <phil...@users.sourceforge.net> + 2003 Phil Mellor <monkey...@users.sourceforge.net> + 2003 Rob Jackson <ja...@xms.ms> + 2004-2009 Richard Wilson <i...@tinct.net> + 2004-2009 John Tytgat <j...@netsurf-browser.org> + 2004 Andrew Timmins <atimm...@blueyonder.co.uk> + 2004 Kevin Bagust <kevin.bag...@ntlworld.com> + 2005-2009 Adrian Lees <adri...@users.sourceforge.net> + 2005,2008-2012 Chris Young <ch...@unsatisfactorysoftware.co.uk> + 2006-2016 Daniel Silverstone <dsilv...@netsurf-browser.org> + 2006-2016 Rob Kendrick <r...@netsurf-browser.org> + 2007-2016 Vincent Sanders <vi...@netsurf-browser.org> + 2008 Adam Blokus <adamblo...@gmail.com> + 2008 Andrew Sidwell <takka...@netsurf-browser.org> + 2008-2012 François Revol <mmu_...@users.sourceforge.net> 2008 James Shaw <js...@zepler.net> - 2008-2015 Michael Drake <t...@netsurf-browser.org> - 2008-2009 Michael Lester <element3...@gmail.com> - 2008 Sean Fox <dynt...@gmail.com> - 2009 Mark Benjamin <markbenja...@dfgh.net> - 2009 Paul Blokus <paul...@users.sourceforge.net> - 2009 Rene W. Olsen <a...@rebels.com> - 2009 Stephen Fellner <sf.am...@gmail.com> + 2008-2016 Michael Drake <t...@netsurf-browser.org> + 2008-2009 Michael Lester <element3...@gmail.com> + 2008 Sean Fox <dynt...@gmail.com> + 2009 Mark Benjamin <markbenja...@dfgh.net> + 2009 Paul Blokus <paul...@users.sourceforge.net> + 2009 Rene W. Olsen <a...@rebels.com> + 2009 Stephen Fellner <sf.am...@gmail.com> 2009 Chris Tarnowski - 2010-2011 Stephen Fryatt <ste...@netsurf-browser.org> - 2010 Ole Loots <o...@monochrom.net> - 2011 Sven Weidauer <sven.weida...@gmail.com> - 1997-2009 Sam Lantinga - 1998-2004 Daniel Stenberg <dan...@haxx.se> - 2004-2006 Christian Hammond. - 2004-2005 Andrew Tridgell - 2006 Stefan Metzmacher - 2005 Tim Tyler + 2010-2011 Stephen Fryatt <ste...@netsurf-browser.org> + 2010 Ole Loots <o...@monochrom.net> + 2011 Sven Weidauer <sven.weida...@gmail.com> + 1997-2009 Sam Lantinga + 1998-2004 Daniel Stenberg <dan...@haxx.se> + 2004-2006 Christian Hammond. + 2004-2005 Andrew Tridgell + 2006 Stefan Metzmacher + 2005 Tim Tyler License: GPL-2 with OpenSSL exception Files: netsurf/!NetSurf/* @@ -71,7 +71,7 @@ License: MIT Files: libhubbub/* Copyright: 2007-2008 John-Mark Bell <j...@netsurf-browser.org> - 2008 Andrew Sidwell <takka...@netsurf-browser.org> + 2008 Andrew Sidwell <takka...@netsurf-browser.org> License: MIT Files: libcss/* @@ -87,19 +87,19 @@ Copyright: 2007-2015 John-Mark Bell <j...@netsurf-browser.org> License: MIT Files: nsgenbind/* -Copyright: 2012-2015 Vincent Sanders <vi...@netsurf-browser.org> +Copyright: 2012-2016 Vincent Sanders <vi...@netsurf-browser.org> License: MIT Files: buildsystem/* Copyright: 2009-2014 John-Mark Bell <j...@netsurf-browser.org> - 2012-2015 Vincent Sanders <vi...@netsurf-browser.org> - 2009-2013 Daniel Silverstone <dsilv...@netsurf-browser.org> + 2012-2016 Vincent Sanders <vi...@netsurf-browser.org> + 2009-2013 Daniel Silverstone <dsilv...@netsurf-browser.org> License: MIT Files: libnsfb/* Copyright: 2009-2015 Vincent Sanders <vi...@netsurf-browser.org> - 2008-2014 Michael Drake <t...@netsurf-browser.org> - 2009-2014 John-Mark Bell <j...@netsurf-browser.org> + 2008-2014 Michael Drake <t...@netsurf-browser.org> + 2009-2014 John-Mark Bell <j...@netsurf-browser.org> License: MIT Files: libnsutils/* @@ -133,8 +133,8 @@ Copyright: 2012-2015 Vincent Sanders <vi...@netsurf-browser.org> License: MIT Files: debian/* -Copyright: 2009,2011-2015 Vincent Sanders <vi...@debian.org> - 2009 Daniel Silverstone <dsilv...@debian.org> +Copyright: 2009,2011-2015 Vincent Sanders <vi...@debian.org> + 2009 Daniel Silverstone <dsilv...@debian.org> License: GPL-2+ License: GPL-2+ @@ -157,7 +157,7 @@ License: GPL-2+ . On Debian systems, the full text of the GNU General Public License version 2 can be found in the file - `/usr/share/common-licenses/GPL-2'. + `/usr/share/common-licenses/GPL-2'. License: GPL-2 with OpenSSL exception NetSurf is free software; you can redistribute it and/or modify @@ -166,10 +166,10 @@ License: GPL-2 with OpenSSL exception . In addition, as a special exception, permission is granted to link the code of this release of NetSurf with the OpenSSL project's "OpenSSL" - library (or with modified versions of it that use the same licence as + library (or with modified versions of it that use the same licence as the "OpenSSL" library), and distribute the linked executables. You must - obey the GNU General Public License version 2 in all respects for all of - the code used other than "OpenSSL". If you modify the code, you may + obey the GNU General Public License version 2 in all respects for all of + the code used other than "OpenSSL". If you modify the code, you may extend this exception to your version of the code, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -178,23 +178,23 @@ License: GPL-2 with OpenSSL exception License, version 2, can be found in /usr/share/common-licenses/GPL-2. License: MIT - Permission is hereby granted, free of charge, to any person obtaining a copy + Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: . - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. . - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. License: Unicode diff --git a/patches/libpng16-fix.patch b/patches/libpng16-fix.patch new file mode 100644 index 0000000..4da88ce --- /dev/null +++ b/patches/libpng16-fix.patch @@ -0,0 +1,24 @@ +Description: use png native types, they are platform dependent. + (and also silence some warnings about missing memcpy prototype) +Author: Tobias Frost <t...@debian.org> +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/netsurf/framebuffer/convert_image.c ++++ b/netsurf/framebuffer/convert_image.c +@@ -21,6 +21,7 @@ + #include <stdio.h> + #include <png.h> + #include <stdlib.h> ++#include <string.h> + + #if PNG_LIBPNG_VER < 10209 + #define png_set_expand_gray_1_2_4_to_8(png) png_set_gray_1_2_4_to_8(png) +@@ -219,7 +220,7 @@ + { + int bit_depth, color_type, interlace, intent; + double gamma; +- unsigned long width, height; ++ png_uint_32 width, height; + + /* Read the PNG details */ + png_get_IHDR(png, info, &width, &height, &bit_depth, diff --git a/patches/series b/patches/series index 3ba4a07..c649698 100644 --- a/patches/series +++ b/patches/series @@ -1,2 +1,3 @@ set-netsurf-config.patch change-install-binary-targets +libpng16-fix.patch ----------------------------------------------------------------------- Summary of changes: changelog | 35 +++++++-- control | 8 +-- copyright | 126 ++++++++++++++++++--------------- patches/change-install-binary-targets | 22 ------ patches/series | 1 - rules | 8 +-- 6 files changed, 105 insertions(+), 95 deletions(-) delete mode 100644 patches/change-install-binary-targets diff --git a/changelog b/changelog index 18aef9a..0cc05bc 100644 --- a/changelog +++ b/changelog @@ -1,9 +1,35 @@ -netsurf (3.2-3) UNRELEASED; urgency=medium +netsurf (3.6-1) UNRELEASED; urgency=medium * Update standards version (no change) - * Acknowledge NMU, thanks to Peter Michael Green + * New upstream release + + -- Vincent Sanders <vi...@debian.org> Tue, 04 Oct 2016 09:04:59 +0100 + +netsurf (3.5-1) unstable; urgency=medium + + * Update standards version (no change) + * New upstream release (closes: #803313) + * Correct VCS headers (closes: #819882) + + -- Vincent Sanders <vi...@debian.org> Tue, 04 Sep 2016 09:04:20 +0100 + +netsurf (3.2+dfsg-3) unstable; urgency=medium - -- Vincent Sanders <vi...@debian.org> Sun, 28 Jun 2015 21:56:12 +0100 + * Heap overflow fix Fixes: CVE-2015-7508 (Closes: #810491) + * Out of bounds read fix Fixes: CVE-2015-7507 + * Out of bounds read fix Fixes: CVE-2015-7506 + * Stack overflow fix Fixes: CVE-2015-7505 + * Update package copyright to fix lintian warnings + * Acknowledge NMU, thanks to Tobias Frost + + -- Vincent Sanders <vi...@debian.org> Fri, 15 Jul 2016 13:58:09 +0100 + +netsurf (3.2+dfsg-2.3) unstable; urgency=medium + + * Non-maintainer upload. + * Fix compilation error on s390x, use libpng own types. (Closes: #820612) + + -- Tobias Frost <t...@debian.org> Sun, 10 Apr 2016 17:36:37 +0200 netsurf (3.2+dfsg-2.2) unstable; urgency=medium @@ -172,6 +198,5 @@ netsurf (1.0-1) unstable; urgency=low * Fix for runaway cpu usage on sites with frames. * Fix for cookie handling. * Fix scrollbar handling for anchors. - - -- Vincent Sanders <vi...@debian.org> Sun, 3 Jun 2007 18:14:27 +0100 + -- Vincent Sanders <vi...@debian.org> Sun, 3 Jun 2007 18:14:27 +0100 diff --git a/control b/control index 12d2c39..4bdce4e 100644 --- a/control +++ b/control @@ -2,11 +2,11 @@ Source: netsurf Section: web Priority: extra Maintainer: Vincent Sanders <vi...@debian.org> -Build-Depends: debhelper (>= 8~), libcurl4-openssl-dev, libpng-dev, libgtk2.0-dev, flex, bison, libhtml-parser-perl, libmozjs-dev [!s390x], librsvg2-dev, libjpeg-dev, imagemagick, libfreetype6-dev, libvncserver-dev, libsdl1.2-dev, libxcb1-dev, libxcb-icccm1-dev, libxcb-image0-dev, libxcb-keysyms1-dev, libxcb-aux0-dev, libssl-dev, gperf -Standards-Version: 3.9.0 +Build-Depends: debhelper (>= 8~), libcurl4-openssl-dev, libpng-dev, libgtk2.0-dev, flex, bison, libhtml-parser-perl, librsvg2-dev, libjpeg-dev, imagemagick, libfreetype6-dev, libvncserver-dev, libsdl1.2-dev, libxcb1-dev, libxcb-icccm1-dev, libxcb-image0-dev, libxcb-keysyms1-dev, libxcb-aux0-dev, libssl-dev, gperf +Standards-Version: 3.9.8 Homepage: http://www.netsurf-browser.org -Vcs-Browser: http://source.netsurf-browser.org/ -Vcs-Git: git://git.netsurf-browser.org/netsurf-all.git +Vcs-Browser: http://source.netsurf-browser.org/packaging/debian.git/ +Vcs-Git: git://git.netsurf-browser.org/packaging/debian.git Package: netsurf Architecture: all diff --git a/copyright b/copyright index 6d459c1..49a01aa 100644 --- a/copyright +++ b/copyright @@ -1,44 +1,44 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: NetSurf Upstream-Contact: NetSurf Developers <netsurf-...@netsurf-browser.org> -Source: http://download.netsurf-browser.org/netsurf/releases/source-full/netsurf-all-3.3.tar.gz +Source: http://download.netsurf-browser.org/netsurf/releases/source-full/netsurf-all-3.5.tar.gz Files: netsurf/* -Copyright: 2003-2015 John-Mark Bell <j...@netsurf-browser.org> - 2003-2011 James Bursa <bu...@users.sourceforge.net> - 2003 Philip Pemberton <phil...@users.sourceforge.net> - 2003 Phil Mellor <monkey...@users.sourceforge.net> - 2003 Rob Jackson <ja...@xms.ms> - 2004-2009 Richard Wilson <i...@tinct.net> - 2004-2009 John Tytgat <j...@netsurf-browser.org> - 2004 Andrew Timmins <atimm...@blueyonder.co.uk> - 2004 Kevin Bagust <kevin.bag...@ntlworld.com> - 2005-2009 Adrian Lees <adri...@users.sourceforge.net> - 2005,2008-2012 Chris Young <ch...@unsatisfactorysoftware.co.uk> - 2006-2015 Daniel Silverstone <dsilv...@netsurf-browser.org> - 2006-2015 Rob Kendrick <r...@netsurf-browser.org> - 2007-2015 Vincent Sanders <vi...@netsurf-browser.org> - 2008 Adam Blokus <adamblo...@gmail.com> - 2008 Andrew Sidwell <takka...@netsurf-browser.org> - 2008-2012 François Revol <mmu_...@users.sourceforge.net> +Copyright: 2003-2016 John-Mark Bell <j...@netsurf-browser.org> + 2003-2011 James Bursa <bu...@users.sourceforge.net> + 2003 Philip Pemberton <phil...@users.sourceforge.net> + 2003 Phil Mellor <monkey...@users.sourceforge.net> + 2003 Rob Jackson <ja...@xms.ms> + 2004-2009 Richard Wilson <i...@tinct.net> + 2004-2009 John Tytgat <j...@netsurf-browser.org> + 2004 Andrew Timmins <atimm...@blueyonder.co.uk> + 2004 Kevin Bagust <kevin.bag...@ntlworld.com> + 2005-2009 Adrian Lees <adri...@users.sourceforge.net> + 2005,2008-2012 Chris Young <ch...@unsatisfactorysoftware.co.uk> + 2006-2016 Daniel Silverstone <dsilv...@netsurf-browser.org> + 2006-2016 Rob Kendrick <r...@netsurf-browser.org> + 2007-2016 Vincent Sanders <vi...@netsurf-browser.org> + 2008 Adam Blokus <adamblo...@gmail.com> + 2008 Andrew Sidwell <takka...@netsurf-browser.org> + 2008-2012 François Revol <mmu_...@users.sourceforge.net> 2008 James Shaw <js...@zepler.net> - 2008-2015 Michael Drake <t...@netsurf-browser.org> - 2008-2009 Michael Lester <element3...@gmail.com> - 2008 Sean Fox <dynt...@gmail.com> - 2009 Mark Benjamin <markbenja...@dfgh.net> - 2009 Paul Blokus <paul...@users.sourceforge.net> - 2009 Rene W. Olsen <a...@rebels.com> - 2009 Stephen Fellner <sf.am...@gmail.com> + 2008-2016 Michael Drake <t...@netsurf-browser.org> + 2008-2009 Michael Lester <element3...@gmail.com> + 2008 Sean Fox <dynt...@gmail.com> + 2009 Mark Benjamin <markbenja...@dfgh.net> + 2009 Paul Blokus <paul...@users.sourceforge.net> + 2009 Rene W. Olsen <a...@rebels.com> + 2009 Stephen Fellner <sf.am...@gmail.com> 2009 Chris Tarnowski - 2010-2011 Stephen Fryatt <ste...@netsurf-browser.org> - 2010 Ole Loots <o...@monochrom.net> - 2011 Sven Weidauer <sven.weida...@gmail.com> - 1997-2009 Sam Lantinga - 1998-2004 Daniel Stenberg <dan...@haxx.se> - 2004-2006 Christian Hammond. - 2004-2005 Andrew Tridgell - 2006 Stefan Metzmacher - 2005 Tim Tyler + 2010-2011 Stephen Fryatt <ste...@netsurf-browser.org> + 2010 Ole Loots <o...@monochrom.net> + 2011 Sven Weidauer <sven.weida...@gmail.com> + 1997-2009 Sam Lantinga + 1998-2004 Daniel Stenberg <dan...@haxx.se> + 2004-2006 Christian Hammond. + 2004-2005 Andrew Tridgell + 2006 Stefan Metzmacher + 2005 Tim Tyler License: GPL-2 with OpenSSL exception Files: netsurf/!NetSurf/* @@ -71,7 +71,7 @@ License: MIT Files: libhubbub/* Copyright: 2007-2008 John-Mark Bell <j...@netsurf-browser.org> - 2008 Andrew Sidwell <takka...@netsurf-browser.org> + 2008 Andrew Sidwell <takka...@netsurf-browser.org> License: MIT Files: libcss/* @@ -87,29 +87,37 @@ Copyright: 2007-2015 John-Mark Bell <j...@netsurf-browser.org> License: MIT Files: nsgenbind/* -Copyright: 2012-2015 Vincent Sanders <vi...@netsurf-browser.org> +Copyright: 2012-2016 Vincent Sanders <vi...@netsurf-browser.org> License: MIT Files: buildsystem/* Copyright: 2009-2014 John-Mark Bell <j...@netsurf-browser.org> - 2012-2015 Vincent Sanders <vi...@netsurf-browser.org> - 2009-2013 Daniel Silverstone <dsilv...@netsurf-browser.org> + 2012-2016 Vincent Sanders <vi...@netsurf-browser.org> + 2009-2013 Daniel Silverstone <dsilv...@netsurf-browser.org> License: MIT Files: libnsfb/* Copyright: 2009-2015 Vincent Sanders <vi...@netsurf-browser.org> - 2008-2014 Michael Drake <t...@netsurf-browser.org> - 2009-2014 John-Mark Bell <j...@netsurf-browser.org> + 2008-2014 Michael Drake <t...@netsurf-browser.org> + 2009-2014 John-Mark Bell <j...@netsurf-browser.org> License: MIT Files: libnsutils/* Copyright: 2014-2015 Vincent Sanders <vi...@netsurf-browser.org> License: MIT +Files: libnspsl/* +Copyright: 2016 Vincent Sanders <vi...@netsurf-browser.org> +License: MIT + Files: librosprite/* Copyright: 2007-2008 James Shaw <js...@netsurf-browser.org> License: MIT +Files: libpencil/* +Copyright: 2005 James Bursa <ja...@netsurf-browser.org> +License: MIT + Files: librufl/* Copyright: 2005-2007 James Bursa <ja...@netsurf-browser.org> 2005-2014 John-Mark Bell <j...@netsurf-browser.org> @@ -133,8 +141,8 @@ Copyright: 2012-2015 Vincent Sanders <vi...@netsurf-browser.org> License: MIT Files: debian/* -Copyright: 2009,2011-2015 Vincent Sanders <vi...@debian.org> - 2009 Daniel Silverstone <dsilv...@debian.org> +Copyright: 2009,2011-2015 Vincent Sanders <vi...@debian.org> + 2009 Daniel Silverstone <dsilv...@debian.org> License: GPL-2+ License: GPL-2+ @@ -157,7 +165,7 @@ License: GPL-2+ . On Debian systems, the full text of the GNU General Public License version 2 can be found in the file - `/usr/share/common-licenses/GPL-2'. + `/usr/share/common-licenses/GPL-2'. License: GPL-2 with OpenSSL exception NetSurf is free software; you can redistribute it and/or modify @@ -166,10 +174,10 @@ License: GPL-2 with OpenSSL exception . In addition, as a special exception, permission is granted to link the code of this release of NetSurf with the OpenSSL project's "OpenSSL" - library (or with modified versions of it that use the same licence as + library (or with modified versions of it that use the same licence as the "OpenSSL" library), and distribute the linked executables. You must - obey the GNU General Public License version 2 in all respects for all of - the code used other than "OpenSSL". If you modify the code, you may + obey the GNU General Public License version 2 in all respects for all of + the code used other than "OpenSSL". If you modify the code, you may extend this exception to your version of the code, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -178,23 +186,23 @@ License: GPL-2 with OpenSSL exception License, version 2, can be found in /usr/share/common-licenses/GPL-2. License: MIT - Permission is hereby granted, free of charge, to any person obtaining a copy + Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: . - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. . - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. License: Unicode diff --git a/patches/change-install-binary-targets b/patches/change-install-binary-targets deleted file mode 100644 index 9e1a7fd..0000000 --- a/patches/change-install-binary-targets +++ /dev/null @@ -1,22 +0,0 @@ ---- a/netsurf/framebuffer/Makefile.target -+++ b/netsurf/framebuffer/Makefile.target -@@ -191,7 +191,7 @@ - install-framebuffer: - $(Q)mkdir -p $(DESTDIR)$(NETSURF_FRAMEBUFFER_BIN) - $(Q)mkdir -p $(DESTDIR)$(NETSURF_FRAMEBUFFER_RESOURCES) -- $(Q)cp -v $(EXETARGET) $(DESTDIR)/$(NETSURF_FRAMEBUFFER_BIN)netsurf$(SUBTARGET) -+ $(Q)cp -v $(EXETARGET) $(DESTDIR)/$(NETSURF_FRAMEBUFFER_BIN)netsurf-fb - $(Q)for F in $(NETSURF_FRAMEBUFFER_RESOURCE_LIST); do cp -vL framebuffer/res/$$F $(DESTDIR)/$(NETSURF_FRAMEBUFFER_RESOURCES); done - $(Q)$(SPLIT_MESSAGES) -l en -p fb -f messages resources/FatMessages | gzip -9n > $(DESTDIR)$(NETSURF_FRAMEBUFFER_RESOURCES)messages - ---- a/netsurf/gtk/Makefile.target -+++ b/netsurf/gtk/Makefile.target -@@ -142,7 +142,7 @@ - - install-gtk: - $(Q)mkdir -p $(DESTDIR)$(NETSURF_GTK_BIN) -- $(Q)install nsgtk $(DESTDIR)$(NETSURF_GTK_BIN)netsurf -+ $(Q)install nsgtk $(DESTDIR)$(NETSURF_GTK_BIN)netsurf-gtk - $(Q)mkdir -p $(DESTDIR)$(NETSURF_GTK_RESOURCES)icons - $(Q)install -m 0644 gtk/res/icons/*.png $(DESTDIR)$(NETSURF_GTK_RESOURCES)/icons - $(Q)mkdir -p $(DESTDIR)$(NETSURF_GTK_RESOURCES)throbber diff --git a/patches/series b/patches/series index 3ba4a07..a8f7a18 100644 --- a/patches/series +++ b/patches/series @@ -1,2 +1 @@ set-netsurf-config.patch -change-install-binary-targets diff --git a/rules b/rules index a34f111..4348a4c 100755 --- a/rules +++ b/rules @@ -12,15 +12,15 @@ export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed dh $@ override_dh_auto_build: - dh_auto_build -- PREFIX=/usr TARGET=gtk - dh_auto_build -- PREFIX=/usr TARGET=framebuffer + dh_auto_build -- V=1 PREFIX=/usr TARGET=gtk + dh_auto_build -- V=1 PREFIX=/usr TARGET=framebuffer override_dh_auto_install: dh_auto_install -- PREFIX=/usr TARGET=gtk mkdir -p debian/netsurf-gtk/usr/share/pixmaps mkdir -p debian/netsurf-gtk/usr/share/applications - convert netsurf/gtk/res/netsurf.xpm -resize \!32x\!32 debian/netsurf-gtk/usr/share/pixmaps/netsurf.xpm - convert netsurf/gtk/res/netsurf.xpm debian/netsurf-gtk/usr/share/pixmaps/netsurf.png + convert netsurf/frontends/gtk/res/netsurf.xpm -resize \!32x\!32 debian/netsurf-gtk/usr/share/pixmaps/netsurf.xpm + convert netsurf/frontends/gtk/res/netsurf.xpm debian/netsurf-gtk/usr/share/pixmaps/netsurf.png install -m 644 debian/netsurf-gtk.desktop debian/netsurf-gtk/usr/share/applications dh_auto_install -- PREFIX=/usr TARGET=framebuffer -- Debian Packaging for NetSurf _______________________________________________ netsurf-commits mailing list netsurf-commits@netsurf-browser.org http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org