Uploading

diff --git a/debian/changelog b/debian/changelog
index d88cc07..b662772 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+xli (1.17.0+20061110-4) unstable; urgency=low
+
+  * Update my email address in Maintainer field
+  * Add disable-libjpeg-scaling patch to disable using libjpeg for
+    scaling, which broke after upgrading from libjpeg62 to libjpeg8
+    (Closes: #677113)
+  * Add Vcs-* fields, maintaining the package within collab-maint
+  * Use dpkg-buildflags in debian/rules to enable hardening
+
+ -- Ryan Niebur <ryan@debian.org>  Mon, 02 Jul 2012 14:37:10 -0700
+
 xli (1.17.0+20061110-3.1) unstable; urgency=medium
 
   * Non-maintainer upload.

diff --git a/debian/control b/debian/control
index 74adc81..41fa981 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,10 +1,12 @@
 Source: xli
 Section: graphics
 Priority: optional
-Maintainer: Ryan Niebur <ryanryan52@gmail.com>
+Maintainer: Ryan Niebur <ryan@debian.org>
 Build-Depends: debhelper (>= 5), libjpeg-dev, libpng-dev, libx11-dev, libxext-dev, xutils-dev, zlib1g-dev, quilt (>= 0.40)
 Standards-Version: 3.7.3
 Homepage: http://pantransit.reptiles.org/prog/
+Vcs-Git: git://git.debian.org/git/collab-maint/xli.git
+Vcs-Browser: http://git.debian.org/?p=collab-maint/xli.git;a=summary
 
 Package: xli
 Architecture: any

diff --git a/debian/patches/disable-libjpeg-scaling b/debian/patches/disable-libjpeg-scaling
new file mode 100644 (file)
index 0000000..a1b8e65
--- /dev/null
+++ b/debian/patches/disable-libjpeg-scaling
@@ -0,0 +1,40 @@
+This patch changes xli to no longer try to use libjpeg's scaling
+functionality, handling zooming JPEGs like any other image type.
+
+It seems there was a regression in libjpeg's scaling functionality
+between libjpeg62 and libjpeg8, see: http://bugs.debian.org/677113
+
+Index: xli/jpeg.c
+===================================================================
+--- xli.orig/jpeg.c    2012-07-02 13:47:16.000000000 -0700
++++ xli/jpeg.c 2012-07-02 13:48:17.000000000 -0700
+@@ -248,20 +248,6 @@
+       if (verbose)
+               describe_jpeg(&cinfo, fullname);
+ 
+-      if (image_ops->iscale > 0 && image_ops->iscale < 4) {
+-              cinfo.scale_num = 1;
+-              cinfo.scale_denom = 1 << image_ops->iscale;
+-      } else if (image_ops->iscale_auto) {
+-              image_ops->iscale = 0;
+-              while (image_ops->iscale < 3 && (cinfo.image_width >>
+-                              image_ops->iscale > globals.dinfo.width * .9 ||
+-                              cinfo.image_height >> image_ops->iscale >
+-                              globals.dinfo.height * .9))
+-                      image_ops->iscale += 1;
+-              cinfo.scale_denom = 1 << image_ops->iscale;
+-              if (verbose)
+-                      printf("auto-scaling to 1/%d\n", cinfo.scale_denom);
+-      }
+       znocache(zfp);
+ 
+       jpeg_start_decompress(&cinfo);
+@@ -288,8 +274,6 @@
+       }
+ 
+       image->gamma = RETURN_GAMMA;
+-      if (cinfo.scale_denom > 1)
+-              image->flags |= FLAG_ISCALE;
+ 
+       rowbytes = cinfo.output_width * cinfo.output_components;
+       assert(image->pixlen * image->width == rowbytes);

diff --git a/debian/patches/series b/debian/patches/series
index 470e4a7..0910266 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,4 @@ documentzooming.diff
 zoom_auto_440768.diff
 manpage_fixes.diff
 fix-x-resource-leak
+disable-libjpeg-scaling

diff --git a/debian/rules b/debian/rules
index d9dcd1e..d23a8c5 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -5,11 +5,10 @@
 # include quilt stuff
 include /usr/share/quilt/quilt.make
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-       CFLAGS=-Wall -g -O0
-else
-       CFLAGS=-Wall -g -O2
-endif
+CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
+CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
+LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
 
 pkgdir="$(CURDIR)/debian/xli"
 
@@ -17,7 +16,7 @@ build-arch: build-arch-stamp
 build-arch-stamp: $(QUILT_STAMPFN)
        dh_testdir
        xmkmf
-       make CDEBUGFLAGS="$(CFLAGS)"
+       make CDEBUGFLAGS="-Wall $(CFLAGS)" CXXDEBUGFLAGS="$(CXXFLAGS)" LOCAL_LDFLAGS="$(LDFLAGS)" PROJECT_DEFINES="$(CPPFLAGS)"
        touch build-arch-stamp
 
 build-indep: build-indep-stamp