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

Proposed by Cosme Domínguez on 2011-12-03
Status: Work in progress
Proposed branch: lp:~cosme/ubuntu/precise/freeimage/freeimage-3.15.1
Merge into: lp:ubuntu/precise/freeimage
Diff against target: 280 lines (+68/-122)
7 files modified
debian/changelog (+19/-0)
debian/compat (+1/-1)
debian/control (+2/-3)
debian/freeimage-get-orig-source (+7/-14)
debian/libfreeimage-dev.install (+5/-5)
debian/libfreeimage3.install (+4/-4)
debian/rules (+30/-95)
To merge this branch: bzr merge lp:~cosme/ubuntu/precise/freeimage/freeimage-3.15.1
Reviewer Review Type Date Requested Status
Evan Broder (community) Needs Fixing on 2011-12-05
Ubuntu Review Team 2011-12-03 Pending
Ubuntu branches 2011-12-03 Pending
Review via email: mp+84346@code.launchpad.net
To post a comment you must log in.
Evan Broder (broder) wrote :

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.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-07-20 13:42:15 +0000
3+++ debian/changelog 2011-12-03 00:34:29 +0000
4@@ -1,3 +1,22 @@
5+freeimage (3.15.1-0ubuntu1) precise; urgency=low
6+
7+ * New upstream release: (LP: #898845)
8+ - Fix multiple vulnerabilities
9+ in embedded code copies (LP: #898825)
10+ - Switch to dpkg-source 3.0 (quilt) format.
11+ * debian/rules
12+ - Switch to dh tiny rules.
13+ - Add parallel build support.
14+ * debian/freeimage-get-orig-source
15+ - Update for the new release.
16+ - Don't ship obsolete Chinese doc.
17+ - Make bzip2 tarball.
18+ * debian/control
19+ - Remove unneeded tofrodos dependency.
20+ - Bump debhelper to 8.
21+
22+ -- Cosme Domínguez Díaz <cosme.ddiaz@gmail.com> Thu, 01 Dec 2011 21:51:25 +0000
23+
24 freeimage (3.13.1-0ubuntu1) maverick; urgency=low
25
26 * New upstream release. Closes: (LP: #607800)
27
28=== modified file 'debian/compat'
29--- debian/compat 2007-05-07 15:35:21 +0000
30+++ debian/compat 2011-12-03 00:34:29 +0000
31@@ -1,1 +1,1 @@
32-5
33+8
34
35=== modified file 'debian/control'
36--- debian/control 2010-07-20 13:42:15 +0000
37+++ debian/control 2011-12-03 00:34:29 +0000
38@@ -2,8 +2,8 @@
39 Priority: optional
40 Maintainer: Federico Di Gregorio <fog@debian.org>
41 Uploaders: Andres Mejia <mcitadel@gmail.com>, Michael Koch <konqueror@gmx.de>
42-Build-Depends: debhelper (>= 5), tofrodos
43-Standards-Version: 3.8.3
44+Build-Depends: debhelper (>= 8)
45+Standards-Version: 3.9.2
46 Section: libs
47 DM-Upload-Allowed: yes
48 Homepage: http://freeimage.sourceforge.net/
49@@ -25,7 +25,6 @@
50 programs using FreeImage.
51
52 Package: libfreeimage3
53-Section: libs
54 Architecture: any
55 Depends: ${shlibs:Depends}, ${misc:Depends}
56 Description: Support library for graphics image formats (library)
57
58=== modified file 'debian/freeimage-get-orig-source'
59--- debian/freeimage-get-orig-source 2010-07-20 13:42:15 +0000
60+++ debian/freeimage-get-orig-source 2011-12-03 00:34:29 +0000
61@@ -4,14 +4,12 @@
62 # package.
63
64 # Some variables to make maintaining this script easier
65-FREEIMAGE_VERSION="3.13.1"
66+FREEIMAGE_VERSION="3.15.1"
67 FREEIMAGE_URL_DIR="http://downloads.sourceforge.net/freeimage"
68-FREEIMAGE_TARBALL="FreeImage3131.zip"
69-FREEIMAGE_TARBALL_CHECKSUM="a2e20b223a2cf6a5791cc47686364e99"
70-FREEIMAGE_DOC="FreeImage3131.pdf"
71-FREEIMAGE_DOC_CHECKSUM="19be2782bac9cc387b33045bd27fb60a"
72-FREEIMAGE_CHINESE_DOC="FreeImage380Chinese.pdf"
73-FREEIMAGE_CHINESE_DOC_CHECKSUM="8d9481a75b7b86eac8d642f8dc443cf7"
74+FREEIMAGE_TARBALL="FreeImage3151.zip"
75+FREEIMAGE_TARBALL_CHECKSUM="450d2ff278690b0d1d7d7d58fad083cc"
76+FREEIMAGE_DOC="FreeImage3151.pdf"
77+FREEIMAGE_DOC_CHECKSUM="49325c97ba1f557f5fa34e1c480082b5"
78
79 USAGE="\n\
80 This script is used to generate the orig tarball used in building\n\
81@@ -70,12 +68,10 @@
82 #Download the files
83 download $FREEIMAGE_URL_DIR $FREEIMAGE_TARBALL
84 download $FREEIMAGE_URL_DIR $FREEIMAGE_DOC
85-download $FREEIMAGE_URL_DIR $FREEIMAGE_CHINESE_DOC
86
87 # Verify the checksums
88 verify_checksum $FREEIMAGE_TARBALL $FREEIMAGE_TARBALL_CHECKSUM
89 verify_checksum $FREEIMAGE_DOC $FREEIMAGE_DOC_CHECKSUM
90-verify_checksum $FREEIMAGE_CHINESE_DOC $FREEIMAGE_CHINESE_DOC_CHECKSUM
91
92 # Unpack the upstream source
93 if [ ! -d FreeImage -a ! -d freeimage-$FREEIMAGE_VERSION ]; then
94@@ -96,12 +92,10 @@
95 mkdir -p freeimage-$FREEIMAGE_VERSION/extra.Debian
96 cp -f $FREEIMAGE_DOC \
97 freeimage-$FREEIMAGE_VERSION/extra.Debian/$FREEIMAGE_DOC
98- cp -f $FREEIMAGE_CHINESE_DOC \
99- freeimage-$FREEIMAGE_VERSION/extra.Debian/$FREEIMAGE_CHINESE_DOC
100- tar -czf freeimage_$FREEIMAGE_VERSION.orig.tar.gz \
101+ tar --owner=root --group=root -cjf freeimage_$FREEIMAGE_VERSION.orig.tar.bz2 \
102 freeimage-$FREEIMAGE_VERSION
103 else
104- echo "Please remove or move freeimage_$FREEIMAGE_VERSION.orig.tar.gz."
105+ echo "Please remove or move freeimage_$FREEIMAGE_VERSION.orig.tar.bz2."
106 exit 1
107 fi
108
109@@ -114,5 +108,4 @@
110 echo "Removing upstream files."
111 rm $FREEIMAGE_TARBALL
112 rm $FREEIMAGE_DOC
113- rm $FREEIMAGE_CHINESE_DOC
114 fi
115
116=== modified file 'debian/libfreeimage-dev.install'
117--- debian/libfreeimage-dev.install 2007-05-07 15:35:21 +0000
118+++ debian/libfreeimage-dev.install 2011-12-03 00:34:29 +0000
119@@ -1,5 +1,5 @@
120-debian/tmp/usr/include/*
121-debian/tmp/usr/lib/libfreeimage.a
122-debian/tmp/usr/lib/libfreeimage.so
123-debian/tmp/usr/lib/libfreeimageplus.a
124-debian/tmp/usr/lib/libfreeimageplus.so
125+usr/include/*
126+usr/lib/libfreeimage.so
127+usr/lib/libfreeimageplus.so
128+usr/lib/libfreeimage.a
129+usr/lib/libfreeimageplus.a
130
131=== modified file 'debian/libfreeimage3.install'
132--- debian/libfreeimage3.install 2008-05-15 03:18:00 +0000
133+++ debian/libfreeimage3.install 2011-12-03 00:34:29 +0000
134@@ -1,4 +1,4 @@
135-debian/tmp/usr/lib/libfreeimage-*.so
136-debian/tmp/usr/lib/libfreeimage.so.3
137-debian/tmp/usr/lib/libfreeimageplus-*.so
138-debian/tmp/usr/lib/libfreeimageplus.so.3
139+usr/lib/libfreeimage-*.so
140+usr/lib/libfreeimageplus-*.so
141+usr/lib/libfreeimage.so.3
142+usr/lib/libfreeimageplus.so.3
143
144=== modified file 'debian/rules'
145--- debian/rules 2010-07-20 13:42:15 +0000
146+++ debian/rules 2011-12-03 00:34:29 +0000
147@@ -1,103 +1,38 @@
148 #!/usr/bin/make -f
149 # -*- makefile -*-
150
151-# export DH_VERBOSE=1
152-
153-# Used for setting the compiler
154-export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
155-
156-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
157- DEB_OPTFLAGS += -O0 -fPIC -D_REENTRANT -g -Wall -pipe
158-else
159- DEB_OPTFLAGS += -O2 -fPIC -fexceptions -fvisibility=hidden -D_REENTRANT -g -Wall -pipe
160-endif
161-
162-# Setting our own compiler flags
163-include $(CURDIR)/Makefile.srcs
164-DEB_CFLAGS ?= $(DEB_OPTFLAGS) -DNO_LCMS
165-DEB_CXXFLAGS ?= $(DEB_OPTFLAGS) -Wno-ctor-dtor-privacy
166-DEB_CFLAGS += $(INCLUDE)
167-DEB_CXXFLAGS += $(INCLUDE)
168-
169-include $(CURDIR)/fipMakefile.srcs
170-DEB_FIP_CFLAGS ?= $(DEB_OPTFLAGS) -DNO_LCMS
171-DEB_FIP_CXXFLAGS ?= $(DEB_OPTFLAGS) -Wno-ctor-dtor-privacy
172-DEB_FIP_CFLAGS += $(INCLUDE)
173-DEB_FIP_CXXFLAGS += $(INCLUDE)
174-
175-fromdos: fromdos-stamp
176-fromdos-stamp:
177- dh_testdir
178- fromdos -e Makefile.gnu
179- fromdos -e Makefile.fip
180- fromdos -e Source/FreeImage/PluginBMP.cpp
181- fromdos -e Source/Metadata/Exif.cpp
182-
183-patch: fromdos
184-
185-build: patch build-stamp
186-build-stamp:
187- dh_testdir
188- $(MAKE) CFLAGS="$(DEB_CFLAGS)" CXXFLAGS="$(DEB_CXXFLAGS)" \
189- CC=$(DEB_BUILD_GNU_TYPE)-gcc CXX=$(DEB_BUILD_GNU_TYPE)-g++
190- $(MAKE) -f Makefile.fip CFLAGS="$(DEB_FIP_CFLAGS)" CXXFLAGS="$(DEB_FIP_CXXFLAGS)" \
191- CC=$(DEB_BUILD_GNU_TYPE)-gcc CXX=$(DEB_BUILD_GNU_TYPE)-g++
192- touch build-stamp
193-
194-clean: clean-stamp todos
195-clean-stamp:
196- dh_testdir
197- dh_testroot
198- rm -f build-stamp
199- $(MAKE) clean
200+DEB_PARALLEL_JOBS := $(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1)
201+
202+override_dh_installchangelogs:
203+ dh_installchangelogs Whatsnew.txt
204+
205+override_dh_installdocs:
206+ dh_installdocs
207+ dh_installdocs -plibfreeimage-dev extra.Debian/*
208+
209+override_dh_auto_clean:
210+ $(MAKE) -f Makefile clean && \
211 $(MAKE) -f Makefile.fip clean
212- dh_clean
213-
214-todos:
215- dh_testdir
216- todos -e Makefile.fip
217- todos -e Makefile.gnu
218- todos -e Source/FreeImage/PluginBMP.cpp
219- todos -e Source/Metadata/Exif.cpp
220-
221-install: build
222- dh_testdir
223- dh_testroot
224- dh_clean -k
225- mkdir -p debian/tmp/usr/include
226- mkdir -p debian/tmp/usr/lib
227+
228+build:
229+ $(MAKE) -j$(DEB_PARALLEL_JOBS) && \
230+ $(MAKE) -j$(DEB_PARALLEL_JOBS) -f Makefile.fip
231+
232+override_dh_auto_install:
233 $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
234 $(MAKE) -f Makefile.fip install DESTDIR=$(CURDIR)/debian/tmp
235- ln -sf libfreeimage-*.so libfreeimage.so.3
236+ ln -sf libfreeimageplus-*.so libfreeimageplus.so
237 ln -sf libfreeimageplus-*.so libfreeimageplus.so.3
238- ln -sf libfreeimage-*.so libfreeimage.so
239- ln -sf libfreeimageplus-*.so libfreeimageplus.so
240- mv *.so.3 libfreeimage.so libfreeimageplus.so debian/tmp/usr/lib
241-
242-# Build architecture-independent files here.
243-binary-indep:
244-# We have nothing to do by default.
245-
246-# Build architecture-dependent files here.
247-binary-arch: build install
248- dh_testdir
249- dh_testroot
250- dh_installchangelogs
251- dh_installdocs extra.Debian/*
252- dh_install
253- dh_link
254+ mv libfreeimageplus.so *.so.3 debian/tmp/usr/lib
255+
256+override_dh_builddeb:
257+ dh_builddeb -- -Zlzma
258+
259+override_dh_strip:
260 dh_strip -plibfreeimage3 --dbg-package=libfreeimage3-dbg
261- dh_compress
262- dh_fixperms
263- dh_makeshlibs -V
264- dh_installdeb
265- dh_shlibdeps
266- dh_gencontrol
267- dh_md5sums
268- dh_builddeb -- -Zlzma
269-
270-get-orig-source:
271- $(dir $_)freeimage-get-orig-source
272-
273-binary: binary-indep binary-arch
274-.PHONY: build clean binary-indep binary-arch binary install
275+
276+%:
277+ dh $@
278+
279+get-orig-source::
280+ ./debian/freeimage-get-orig-source

Subscribers

People subscribed via source and target branches