From ca0e9c788812d58f2a33aa84c97ddea48daff77f Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Tue, 4 Oct 2016 22:14:16 +0100 Subject: update for 3.6 release branch --- changelog | 11 +++++++++-- control | 2 +- patches/change-install-binary-targets | 8 ++++---- patches/libpng16-fix.patch | 24 ------------------------ patches/series | 1 - 5 files changed, 14 insertions(+), 32 deletions(-) delete mode 100644 patches/libpng16-fix.patch 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 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 Sun, 17 Jul 2016 21:56:12 +0100 + -- Vincent Sanders 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 -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 ---- -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 - #include - #include -+#include - - #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 -- cgit v1.2.3