Merge lp:~cosme/ubuntu/precise/freeimage/freeimage-3.15.1 into lp:ubuntu/precise/freeimage

[Cosme Domínguez]

[Evan Broder (broder)]

I'm going to mark the status of this merge as "Work In Progress" - due to the discussion on the bug about embedded libraries, I don't think it's ready to be merged.

I think I've successfully tangled apart the embedded libraries issues, and will be pursuing an upload to Debian with the new upstream version within the next few days.

review: Needs Fixing

Unmerged revisions

6. By Cosme Domínguez on 2011-12-02

* New upstream release: (LP: #898845)
 - Fix multiple vulnerabilities
   in embedded code copies (LP: #898825)
 - Switch to dpkg-source 3.0 (quilt) format.
* debian/rules
 - Switch to dh tiny rules.
 - Add parallel build support.
* debian/freeimage-get-orig-source
 - Update for the new release.
 - Don't ship obsolete Chinese doc.
 - Make bzip2 tarball.
* debian/control
 - Remove unneeded tofrodos dependency.
 - Bump debhelper to 8.

=== modified file 'debian/changelog'
--- debian/changelog	2010-07-20 13:42:15 +0000
+++ debian/changelog	2011-12-03 00:34:29 +0000
@@ -1,3 +1,22 @@
+freeimage (3.15.1-0ubuntu1) precise; urgency=low
+
+  * New upstream release: (LP: #898845)
+   - Fix multiple vulnerabilities
+     in embedded code copies (LP: #898825)
+   - Switch to dpkg-source 3.0 (quilt) format.
+  * debian/rules
+   - Switch to dh tiny rules.
+   - Add parallel build support.
+  * debian/freeimage-get-orig-source
+   - Update for the new release.
+   - Don't ship obsolete Chinese doc.
+   - Make bzip2 tarball.
+  * debian/control
+   - Remove unneeded tofrodos dependency.
+   - Bump debhelper to 8.
+
+ -- Cosme Domínguez Díaz <[e-mail]>  Thu, 01 Dec 2011 21:51:25 +0000
+
 freeimage (3.13.1-0ubuntu1) maverick; urgency=low
 
   * New upstream release. Closes: (LP: #607800)

=== modified file 'debian/compat'
--- debian/compat	2007-05-07 15:35:21 +0000
+++ debian/compat	2011-12-03 00:34:29 +0000
@@ -1,1 +1,1 @@
-5
+8

=== modified file 'debian/control'
--- debian/control	2010-07-20 13:42:15 +0000
+++ debian/control	2011-12-03 00:34:29 +0000
@@ -2,8 +2,8 @@
 Priority: optional
 Maintainer: Federico Di Gregorio <[e-mail]>
 Uploaders: Andres Mejia <[e-mail]>, Michael Koch <[e-mail]>
-Build-Depends: debhelper (>= 5), tofrodos
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 8)
+Standards-Version: 3.9.2
 Section: libs
 DM-Upload-Allowed: yes
 Homepage: http://freeimage.sourceforge.net/
@@ -25,7 +25,6 @@
  programs using FreeImage.
 
 Package: libfreeimage3
-Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Support library for graphics image formats (library)

=== modified file 'debian/freeimage-get-orig-source'
--- debian/freeimage-get-orig-source	2010-07-20 13:42:15 +0000
+++ debian/freeimage-get-orig-source	2011-12-03 00:34:29 +0000
@@ -4,14 +4,12 @@
 # package.
 
 # Some variables to make maintaining this script easier
-FREEIMAGE_VERSION="3.13.1"
+FREEIMAGE_VERSION="3.15.1"
 FREEIMAGE_URL_DIR="http://downloads.sourceforge.net/freeimage"
-FREEIMAGE_TARBALL="FreeImage3131.zip"
-FREEIMAGE_TARBALL_CHECKSUM="a2e20b223a2cf6a5791cc47686364e99"
-FREEIMAGE_DOC="FreeImage3131.pdf"
-FREEIMAGE_DOC_CHECKSUM="19be2782bac9cc387b33045bd27fb60a"
-FREEIMAGE_CHINESE_DOC="FreeImage380Chinese.pdf"
-FREEIMAGE_CHINESE_DOC_CHECKSUM="8d9481a75b7b86eac8d642f8dc443cf7"
+FREEIMAGE_TARBALL="FreeImage3151.zip"
+FREEIMAGE_TARBALL_CHECKSUM="450d2ff278690b0d1d7d7d58fad083cc"
+FREEIMAGE_DOC="FreeImage3151.pdf"
+FREEIMAGE_DOC_CHECKSUM="49325c97ba1f557f5fa34e1c480082b5"
 
 USAGE="\n\
 This script is used to generate the orig tarball used in building\n\
@@ -70,12 +68,10 @@
 #Download the files
 download $FREEIMAGE_URL_DIR $FREEIMAGE_TARBALL
 download $FREEIMAGE_URL_DIR $FREEIMAGE_DOC
-download $FREEIMAGE_URL_DIR $FREEIMAGE_CHINESE_DOC
 
 # Verify the checksums
 verify_checksum $FREEIMAGE_TARBALL $FREEIMAGE_TARBALL_CHECKSUM
 verify_checksum $FREEIMAGE_DOC $FREEIMAGE_DOC_CHECKSUM
-verify_checksum $FREEIMAGE_CHINESE_DOC $FREEIMAGE_CHINESE_DOC_CHECKSUM
 
 # Unpack the upstream source
 if [ ! -d FreeImage -a ! -d freeimage-$FREEIMAGE_VERSION ]; then
@@ -96,12 +92,10 @@
         mkdir -p freeimage-$FREEIMAGE_VERSION/extra.Debian
     cp -f $FREEIMAGE_DOC \
         freeimage-$FREEIMAGE_VERSION/extra.Debian/$FREEIMAGE_DOC
-    cp -f $FREEIMAGE_CHINESE_DOC \
-        freeimage-$FREEIMAGE_VERSION/extra.Debian/$FREEIMAGE_CHINESE_DOC
-    tar -czf freeimage_$FREEIMAGE_VERSION.orig.tar.gz \
+    tar --owner=root --group=root -cjf freeimage_$FREEIMAGE_VERSION.orig.tar.bz2 \
         freeimage-$FREEIMAGE_VERSION
 else
-    echo "Please remove or move freeimage_$FREEIMAGE_VERSION.orig.tar.gz."
+    echo "Please remove or move freeimage_$FREEIMAGE_VERSION.orig.tar.bz2."
     exit 1
 fi
 
@@ -114,5 +108,4 @@
     echo "Removing upstream files."
     rm $FREEIMAGE_TARBALL
     rm $FREEIMAGE_DOC
-    rm $FREEIMAGE_CHINESE_DOC
 fi

=== modified file 'debian/libfreeimage-dev.install'
--- debian/libfreeimage-dev.install	2007-05-07 15:35:21 +0000
+++ debian/libfreeimage-dev.install	2011-12-03 00:34:29 +0000
@@ -1,5 +1,5 @@
-debian/tmp/usr/include/*
-debian/tmp/usr/lib/libfreeimage.a
-debian/tmp/usr/lib/libfreeimage.so
-debian/tmp/usr/lib/libfreeimageplus.a
-debian/tmp/usr/lib/libfreeimageplus.so
+usr/include/*
+usr/lib/libfreeimage.so
+usr/lib/libfreeimageplus.so
+usr/lib/libfreeimage.a
+usr/lib/libfreeimageplus.a

=== modified file 'debian/libfreeimage3.install'
--- debian/libfreeimage3.install	2008-05-15 03:18:00 +0000
+++ debian/libfreeimage3.install	2011-12-03 00:34:29 +0000
@@ -1,4 +1,4 @@
-debian/tmp/usr/lib/libfreeimage-*.so
-debian/tmp/usr/lib/libfreeimage.so.3
-debian/tmp/usr/lib/libfreeimageplus-*.so
-debian/tmp/usr/lib/libfreeimageplus.so.3
+usr/lib/libfreeimage-*.so
+usr/lib/libfreeimageplus-*.so
+usr/lib/libfreeimage.so.3
+usr/lib/libfreeimageplus.so.3

=== modified file 'debian/rules'
--- debian/rules	2010-07-20 13:42:15 +0000
+++ debian/rules	2011-12-03 00:34:29 +0000
@@ -1,103 +1,38 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-# export DH_VERBOSE=1
-
-# Used for setting the compiler
-export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	DEB_OPTFLAGS += -O0 -fPIC -D_REENTRANT -g -Wall -pipe
-else
-	DEB_OPTFLAGS += -O2 -fPIC -fexceptions -fvisibility=hidden -D_REENTRANT -g -Wall -pipe
-endif
-
-# Setting our own compiler flags
-include $(CURDIR)/Makefile.srcs
-DEB_CFLAGS ?= $(DEB_OPTFLAGS) -DNO_LCMS
-DEB_CXXFLAGS ?= $(DEB_OPTFLAGS) -Wno-ctor-dtor-privacy
-DEB_CFLAGS += $(INCLUDE)
-DEB_CXXFLAGS += $(INCLUDE)
-
-include $(CURDIR)/fipMakefile.srcs
-DEB_FIP_CFLAGS ?= $(DEB_OPTFLAGS) -DNO_LCMS
-DEB_FIP_CXXFLAGS ?= $(DEB_OPTFLAGS) -Wno-ctor-dtor-privacy
-DEB_FIP_CFLAGS += $(INCLUDE)
-DEB_FIP_CXXFLAGS += $(INCLUDE)
-
-fromdos: fromdos-stamp
-fromdos-stamp:
-	dh_testdir
-	fromdos -e Makefile.gnu
-	fromdos -e Makefile.fip
-	fromdos -e Source/FreeImage/PluginBMP.cpp
-	fromdos -e Source/Metadata/Exif.cpp
-
-patch: fromdos
-
-build: patch build-stamp
-build-stamp:
-	dh_testdir
-	$(MAKE) CFLAGS="$(DEB_CFLAGS)" CXXFLAGS="$(DEB_CXXFLAGS)" \
-		CC=$(DEB_BUILD_GNU_TYPE)-gcc CXX=$(DEB_BUILD_GNU_TYPE)-g++
-	$(MAKE) -f Makefile.fip CFLAGS="$(DEB_FIP_CFLAGS)" CXXFLAGS="$(DEB_FIP_CXXFLAGS)" \
-		CC=$(DEB_BUILD_GNU_TYPE)-gcc CXX=$(DEB_BUILD_GNU_TYPE)-g++
-	touch build-stamp
-
-clean: clean-stamp todos
-clean-stamp:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
-	$(MAKE) clean
+DEB_PARALLEL_JOBS := $(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1)
+
+override_dh_installchangelogs:
+	dh_installchangelogs Whatsnew.txt
+
+override_dh_installdocs:
+	dh_installdocs
+	dh_installdocs -plibfreeimage-dev extra.Debian/*
+
+override_dh_auto_clean:
+	$(MAKE) -f Makefile clean && \
 	$(MAKE) -f Makefile.fip clean
-	dh_clean
-
-todos:
-	dh_testdir
-	todos -e Makefile.fip
-	todos -e Makefile.gnu
-	todos -e Source/FreeImage/PluginBMP.cpp
-	todos -e Source/Metadata/Exif.cpp
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	mkdir -p debian/tmp/usr/include
-	mkdir -p debian/tmp/usr/lib
+
+build:
+	$(MAKE) -j$(DEB_PARALLEL_JOBS) && \
+	$(MAKE) -j$(DEB_PARALLEL_JOBS) -f Makefile.fip
+
+override_dh_auto_install:
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 	$(MAKE) -f Makefile.fip install DESTDIR=$(CURDIR)/debian/tmp
-	ln -sf libfreeimage-*.so libfreeimage.so.3
+	ln -sf libfreeimageplus-*.so libfreeimageplus.so
 	ln -sf libfreeimageplus-*.so libfreeimageplus.so.3
-	ln -sf libfreeimage-*.so libfreeimage.so
-	ln -sf libfreeimageplus-*.so libfreeimageplus.so
-	mv *.so.3 libfreeimage.so libfreeimageplus.so debian/tmp/usr/lib
-
-# Build architecture-independent files here.
-binary-indep:
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs
-	dh_installdocs extra.Debian/*
-	dh_install
-	dh_link
+	mv libfreeimageplus.so *.so.3 debian/tmp/usr/lib
+
+override_dh_builddeb:
+	dh_builddeb -- -Zlzma
+
+override_dh_strip:
 	dh_strip -plibfreeimage3 --dbg-package=libfreeimage3-dbg
-	dh_compress
-	dh_fixperms
-	dh_makeshlibs -V
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb -- -Zlzma
-
-get-orig-source:
-	$(dir $_)freeimage-get-orig-source
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+
+%:
+	dh $@
+
+get-orig-source::
+	./debian/freeimage-get-orig-source