Merge lp:~laney/gimp/gimp-2.6.11-2-merge into lp:~ubuntu-desktop/gimp/ubuntu

Proposed by Iain Lane
Status: Merged
Merged at revision: 24
Proposed branch: lp:~laney/gimp/gimp-2.6.11-2-merge
Merge into: lp:~ubuntu-desktop/gimp/ubuntu
Diff against target: 427 lines (+107/-200)
6 files modified
debian/changelog (+29/-2)
debian/control (+28/-93)
debian/patches/04_gold_linker.patch (+0/-100)
debian/patches/07_binutils-gold.patch (+42/-0)
debian/patches/series (+2/-2)
debian/rules (+6/-3)
To merge this branch: bzr merge lp:~laney/gimp/gimp-2.6.11-2-merge
Reviewer Review Type Date Requested Status
Ubuntu Sponsors Team Pending
Review via email: mp+59887@code.launchpad.net

Description of the change

Merge.

I opted to drop some unnecessary changes to minimise the delta to Debian — just the wrapping of control fields and adding of ${misc:Depends}.

To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

Could it be that you forgot to 'bzr add' the gold patch?

Revision history for this message
Iain Lane (laney) wrote :

Looks like it. I just pushed an update but I don't have time to test build. I'll confirm later if you don't review it.

lp:~laney/gimp/gimp-2.6.11-2-merge updated
25. By Iain Lane

Add forgotten 07_binutils-gold.patch

Revision history for this message
Daniel Holbach (dholbach) wrote :

It might be worth to use dh-translations at some stage, but apart from that it looks good. I'll wait for my build to succeed before I upload it though.

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 2011-04-07 20:17:48 +0000
3+++ debian/changelog 2011-05-17 16:24:30 +0000
4@@ -1,3 +1,31 @@
5+gimp (2.6.11-2ubuntu1) oneiric; urgency=low
6+
7+ * Merge with Debian unstable, remaining changes:
8+ - debian/patches/02_help-message.patch,
9+ debian/patches/03_gimp.desktop.in.in.patch:
10+ + Update some strings for Ubuntu
11+ - debian/control:
12+ + Update description
13+ + Change build-depends from libwebkit-dev to libwebkitgtk-dev
14+ - debian/rules:
15+ + Set gettext domain and update translation templates
16+
17+ -- Iain Lane <laney@ubuntu.com> Tue, 03 May 2011 21:54:00 +0100
18+
19+gimp (2.6.11-2) unstable; urgency=high
20+
21+ * Fix security issues when reading plugin configuration files and PSP files
22+ (CVE-2010-4540, CVE-2010-4541, CVE-2010-4542, CVE-2010-4543)
23+ (Closes: #608497)
24+ - patches imported from Ubuntu
25+ * Drop libgimp2.0's recommendation on gimp (Closes: #600226)
26+ * remove .la files, even from python modules (Closes: #621230)
27+ * Remove HAL support (Closes: #613201)
28+ * 07_binutils-gold.patch:
29+ - Allow package to build with binutils-gold
30+
31+ -- Ari Pollak <ari@debian.org> Tue, 12 Apr 2011 19:04:28 -0400
32+
33 gimp (2.6.11-1ubuntu6) natty; urgency=low
34
35 * SECURITY UPDATE: denial of service and possible code execution via
36@@ -1871,7 +1899,7 @@
37 so I'm satisfied. Closes: #52634
38
39 -- Ben Gertzfield <che@debian.org> Thu, 10 Aug 2000 11:15:10 -0700
40-
41+
42 gimp1.1 (1.1.19-1) unstable; urgency=low
43
44 * New upstream version. Please don't let there be any i18n breakage
45@@ -2371,4 +2399,3 @@
46
47 -- Rob Browning <osiris@cs.utexas.edu> Mon, 27 Jan 1997 01:04:31 -0600
48
49-
50
51=== modified file 'debian/control'
52--- debian/control 2011-01-27 08:29:24 +0000
53+++ debian/control 2011-05-17 16:24:30 +0000
54@@ -3,59 +3,32 @@
55 Section: graphics
56 Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
57 XSBC-Original-Maintainer: Ari Pollak <ari@debian.org>
58-Standards-Version: 3.9.1
59-Build-Depends: debhelper (>= 5.0.53),
60- dh-autoreconf,
61- cdbs (>= 0.4.37),
62- autotools-dev,
63- patchutils,
64- gettext,
65- intltool (>= 0.36.3),
66- libx11-dev,
67- libice-dev,
68- libsm-dev,
69- libxmu-dev,
70- libxpm-dev,
71- libxt-dev,
72- libaa1-dev,
73- libgtk2.0-dev (>= 2.19.1),
74- libglib2.0-dev (>= 2.16.0),
75- libpango1.0-dev (>= 1.12.2),
76- libwebkitgtk-dev,
77- libjpeg-dev,
78- libart-2.0-dev,
79- libpng12-dev | libpng-dev,
80- zlib1g-dev,
81- libtiff4-dev,
82- python-dev (>= 2.3.5),
83- python-gtk2-dev (>= 2.10.4),
84- python-support (>= 0.4),
85- libexif-dev (>= 0.6.15),
86- libmng-dev,
87- librsvg2-dev (>= 2.7.2-2),
88- libfontconfig1-dev (>= 2.2.0),
89- libwmf-dev (>= 0.2.8-1.1),
90- libfreetype6-dev (>= 2.2),
91- libpoppler-glib-dev (>= 0.3.1),
92- libasound2-dev (>= 1.0.0) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
93- libdbus-glib-1-dev (>= 0.70),
94- liblcms1-dev | liblcms-dev,
95- libgegl-0.0-dev,
96- libbabl-0.0-0-dev
97+Standards-Version: 3.8.2
98+Build-Depends: debhelper (>= 5.0.53), cdbs (>= 0.4.37), autotools-dev,
99+ patchutils, gettext, intltool (>= 0.36.3), libx11-dev, libice-dev, libsm-dev,
100+ libxmu-dev, libxpm-dev, libxt-dev,
101+ libaa1-dev, libgtk2.0-dev (>= 2.19.1), libglib2.0-dev (>= 2.16.0),
102+ libpango1.0-dev (>= 1.12.2), libwebkitgtk-dev, libjpeg-dev,
103+ libart-2.0-dev, libpng12-dev | libpng-dev,
104+ zlib1g-dev, libtiff4-dev, python-dev (>= 2.3.5), python-gtk2-dev (>= 2.10.4),
105+ python-support (>= 0.4), libexif-dev (>= 0.6.15), libmng-dev,
106+ librsvg2-dev (>= 2.7.2-2), libfontconfig1-dev (>= 2.2.0),
107+ libwmf-dev (>= 0.2.8-1.1), libfreetype6-dev (>= 2.2),
108+ libpoppler-glib-dev (>= 0.3.1),
109+ libasound2-dev (>= 1.0.0) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
110+ libdbus-glib-1-dev (>= 0.70),
111+ liblcms1-dev | liblcms-dev, libgegl-0.0-dev, libbabl-0.0-0-dev
112 #Build-Conflicts: libgimp2.0
113-XS-Vcs-Svn: svn://svn.debian.org/svn/collab-maint/deb-maint/gimp/
114-XS-Vcs-Browser: http://svn.debian.org/wsvn/collab-maint/deb-maint/gimp/
115+XS-Vcs-Git: git://git.debian.org/git/collab-maint/gimp.git
116+XS-Vcs-Browser: http://git.debian.org/?p=collab-maint/gimp.git
117 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gimp/ubuntu
118 Homepage: http://www.gimp.org
119
120 Package: libgimp2.0
121 Architecture: any
122 Section: libs
123-Depends: ${misc:Depends},
124- ${shlibs:Depends}
125-Recommends: gimp,
126- gimp-data (>= ${source:Upstream-Version}),
127- gimp-data (<= ${source:Upstream-Version}-z)
128+Depends: ${shlibs:Depends}
129+Recommends: gimp-data (>= ${source:Upstream-Version}), gimp-data (<= ${source:Upstream-Version}-z)
130 Description: Libraries for the GNU Image Manipulation Program
131 This package includes the libgimp libraries, which are
132 necessary to run GIMP and third-party GIMP plugins.
133@@ -64,38 +37,10 @@
134 Architecture: any
135 Section: graphics
136 Provides: gimp-helpbrowser, gimp-python
137-Depends: ${misc:Depends},
138- ${shlibs:Depends},
139- ${python:Depends},
140- libgimp2.0 (>= ${source:Upstream-Version}),
141- libgimp2.0 (<= ${source:Upstream-Version}-z),
142- gimp-data (>= ${source:Upstream-Version}),
143- gimp-data (<= ${source:Upstream-Version}-z),
144- python-gtk2 (>= 2.8.0)
145-Conflicts: gimp-data (<< 2.3.17-2),
146- gimp-wget (<< 2.3.12-1),
147- libgimp-perl (<= 2.0.dfsg+2.2pre1.dfsg-2),
148- gimp-svg,
149- gimp-print (<= 5.0.1-3),
150- gimp-help (<< 2+0.13-1),
151- gimp-helpbrowser,
152- gimp-python (<< 2.6.0),
153- gimp-gnomevfs (<< 2.6.0),
154- gimp-libcurl (<< 2.6.0)
155-Replaces: gimp-data (<< 2.3.17-2),
156- gimp-wget (<< 2.3.12-1),
157- libgimp-perl (<= 2.0.dfsg+2.2pre1.dfsg-2),
158- gimp-svg,
159- gimp-print (<= 5.0.1-3),
160- gimp-helpbrowser,
161- gimp-python (<< 2.6.0),
162- gimp-gnomevfs (<< 2.6.0),
163- gimp-libcurl (<< 2.6.0)
164-Suggests: gimp-help-en | gimp-help,
165- gimp-data-extras,
166- gvfs-backends,
167- libasound2,
168- ghostscript
169+Depends: libgimp2.0 (>= ${source:Upstream-Version}), libgimp2.0 (<= ${source:Upstream-Version}-z), gimp-data (>= ${source:Upstream-Version}), gimp-data (<= ${source:Upstream-Version}-z), python-gtk2 (>= 2.8.0), ${shlibs:Depends}, ${python:Depends}
170+Conflicts: gimp-data (<< 2.3.17-2), gimp-wget (<< 2.3.12-1), libgimp-perl (<= 2.0.dfsg+2.2pre1.dfsg-2), gimp-svg, gimp-print (<= 5.0.1-3), gimp-help (<< 2+0.13-1), gimp-helpbrowser, gimp-python (<< 2.6.0), gimp-gnomevfs (<< 2.6.0), gimp-libcurl (<< 2.6.0)
171+Replaces: gimp-data (<< 2.3.17-2), gimp-wget (<< 2.3.12-1), libgimp-perl (<= 2.0.dfsg+2.2pre1.dfsg-2), gimp-svg, gimp-print (<= 5.0.1-3), gimp-helpbrowser, gimp-python (<< 2.6.0), gimp-gnomevfs (<< 2.6.0), gimp-libcurl (<< 2.6.0)
172+Suggests: gimp-help-en | gimp-help, gimp-data-extras, gvfs-backends, libasound2, ghostscript
173 Description: The GNU Image Manipulation Program
174 GIMP is an advanced picture editor. You can use it to edit, enhance,
175 and retouch photos and scans, create drawings, and make your own
176@@ -114,12 +59,9 @@
177 Package: gimp-data
178 Architecture: all
179 Section: graphics
180-Depends: ${misc:Depends}
181 Recommends: gimp
182-Conflicts: gimp (<< 2.4.0~rc2-2),
183- gimp-python (<< 2.6.0)
184-Replaces: gimp (<< 2.4.0~rc2-2),
185- gimp-python (<< 2.6.0)
186+Conflicts: gimp (<< 2.4.0~rc2-2), gimp-python (<< 2.6.0)
187+Replaces: gimp (<< 2.4.0~rc2-2), gimp-python (<< 2.6.0)
188 Description: Data files for GIMP
189 This package contains architecture-independent supporting data files
190 for use with GIMP.
191@@ -127,11 +69,7 @@
192 Package: libgimp2.0-dev
193 Architecture: any
194 Section: libdevel
195-Depends: ${misc:Depends},
196- ${shlibs:Depends},
197- libgimp2.0 (= ${binary:Version}),
198- libgtk2.0-dev (>= 2.12.5),
199- pkg-config
200+Depends: ${shlibs:Depends}, libgimp2.0 (= ${binary:Version}), libgtk2.0-dev (>= 2.12.5), pkg-config
201 Suggests: libgimp2.0-doc
202 Description: Headers and other files for compiling plugins for GIMP
203 This package contains the header files for the GNU Image Manipulation
204@@ -144,8 +82,7 @@
205 Package: libgimp2.0-doc
206 Architecture: all
207 Section: doc
208-Depends: ${misc:Depends},
209- lynx | www-browser
210+Depends: lynx | www-browser
211 Description: Developers' Documentation for the GIMP library
212 This package contains the HTML documentation for the GIMP library in
213 /usr/share/gtk-doc/html/ .
214@@ -154,9 +91,7 @@
215 Priority: extra
216 Architecture: any
217 Section: debug
218-Depends: ${misc:Depends},
219- ${shlibs:Depends},
220- gimp (= ${binary:Version}) | libgimp2.0 (= ${binary:Version})
221+Depends: gimp (= ${binary:Version}) | libgimp2.0 (= ${binary:Version}), ${shlibs:Depends}
222 Description: Debugging symbols for GIMP
223 This package includes the debugging symbols useful for debugging
224 GIMP and its libraries, contained in the gimp and libgimp2.0 packages.
225
226=== removed file 'debian/patches/04_gold_linker.patch'
227--- debian/patches/04_gold_linker.patch 2010-12-06 05:41:27 +0000
228+++ debian/patches/04_gold_linker.patch 1970-01-01 00:00:00 +0000
229@@ -1,100 +0,0 @@
230-From 582cb0f14eb9f145bd2a2f5c9fda12309ae0229f Mon Sep 17 00:00:00 2001
231-From: Manish Singh <yosh@gimp.org>
232-Date: Sun, 24 May 2009 17:42:39 +0000
233-Subject: Explicitly specify library dependencies at link time, so we can use gold.
234-
235----
236-diff --git a/libgimpthumb/Makefile.am b/libgimpthumb/Makefile.am
237-index a78a83a..98acd24 100644
238---- a/libgimpthumb/Makefile.am
239-+++ b/libgimpthumb/Makefile.am
240-@@ -86,7 +86,10 @@ noinst_PROGRAMS = gimp-thumbnail-list
241-
242- gimp_thumbnail_list_SOURCES = gimp-thumbnail-list.c
243-
244--gimp_thumbnail_list_LDADD = libgimpthumb-$(GIMP_API_VERSION).la
245-+gimp_thumbnail_list_LDADD = \
246-+ libgimpthumb-$(GIMP_API_VERSION).la \
247-+ $(GDK_PIXBUF_LIBS) \
248-+ $(GLIB_LIBS)
249-
250-
251- install-data-local: install-ms-lib install-libtool-import-lib
252-diff --git a/plug-ins/common/Makefile.am b/plug-ins/common/Makefile.am
253-index 66dc6dd..d58ecee 100644
254---- a/plug-ins/common/Makefile.am
255-+++ b/plug-ins/common/Makefile.am
256-@@ -7,21 +7,22 @@
257- ## Modify those two files instead of this one; for most
258- ## plug-ins you should only need to modify plugin-defs.pl.
259-
260-+if OS_WIN32
261-+mwindows = -mwindows
262-+else
263-+libm = -lm
264-+endif
265-
266- libgimp = $(top_builddir)/libgimp/libgimp-$(GIMP_API_VERSION).la
267- libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la
268- libgimpcolor = $(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la
269- libgimpconfig = $(top_builddir)/libgimpconfig/libgimpconfig-$(GIMP_API_VERSION).la
270--libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la
271-+libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la $(libm)
272- libgimpmodule = $(top_builddir)/libgimpmodule/libgimpmodule-$(GIMP_API_VERSION).la
273- libgimpui = $(top_builddir)/libgimp/libgimpui-$(GIMP_API_VERSION).la
274- libgimpwidgets = $(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSION).la
275-
276-
277--if OS_WIN32
278--mwindows = -mwindows
279--endif
280--
281- AM_LDFLAGS = $(mwindows)
282-
283- libexecdir = $(gimpplugindir)/plug-ins
284-diff --git a/plug-ins/common/mkgen.pl b/plug-ins/common/mkgen.pl
285-index 40b4b74..b0cd786 100755
286---- a/plug-ins/common/mkgen.pl
287-+++ b/plug-ins/common/mkgen.pl
288-@@ -51,21 +51,22 @@ print MK <<EOT;
289- ## Modify those two files instead of this one; for most
290- ## plug-ins you should only need to modify plugin-defs.pl.
291-
292-+if OS_WIN32
293-+mwindows = -mwindows
294-+else
295-+libm = -lm
296-+endif
297-
298- libgimp = \$(top_builddir)/libgimp/libgimp-\$(GIMP_API_VERSION).la
299- libgimpbase = \$(top_builddir)/libgimpbase/libgimpbase-\$(GIMP_API_VERSION).la
300- libgimpcolor = \$(top_builddir)/libgimpcolor/libgimpcolor-\$(GIMP_API_VERSION).la
301- libgimpconfig = \$(top_builddir)/libgimpconfig/libgimpconfig-\$(GIMP_API_VERSION).la
302--libgimpmath = \$(top_builddir)/libgimpmath/libgimpmath-\$(GIMP_API_VERSION).la
303-+libgimpmath = \$(top_builddir)/libgimpmath/libgimpmath-\$(GIMP_API_VERSION).la \$(libm)
304- libgimpmodule = \$(top_builddir)/libgimpmodule/libgimpmodule-\$(GIMP_API_VERSION).la
305- libgimpui = \$(top_builddir)/libgimp/libgimpui-\$(GIMP_API_VERSION).la
306- libgimpwidgets = \$(top_builddir)/libgimpwidgets/libgimpwidgets-\$(GIMP_API_VERSION).la
307-
308-
309--if OS_WIN32
310--mwindows = -mwindows
311--endif
312--
313- AM_LDFLAGS = \$(mwindows)
314-
315- libexecdir = \$(gimpplugindir)/plug-ins
316-diff --git a/plug-ins/help-browser/Makefile.am b/plug-ins/help-browser/Makefile.am
317-index 14fbe02..7360433 100644
318---- a/plug-ins/help-browser/Makefile.am
319-+++ b/plug-ins/help-browser/Makefile.am
320-@@ -36,6 +36,7 @@ LDADD = \
321- $(libgimpbase) \
322- $(WEBKIT_LIBS) \
323- $(GIO_LIBS) \
324-+ $(GLIB_LIBS) \
325- $(RT_LIBS) \
326- $(INTLLIBS)
327-
328---
329-cgit v0.8.3.1
330
331=== added file 'debian/patches/07_binutils-gold.patch'
332--- debian/patches/07_binutils-gold.patch 1970-01-01 00:00:00 +0000
333+++ debian/patches/07_binutils-gold.patch 2011-05-17 16:24:30 +0000
334@@ -0,0 +1,42 @@
335+Description: Allows package to build with binutils-gold.
336+ Already fixed upstream in Makefile.ams, but changes Makefile.ins so we don't
337+ have to autoreconf.
338+Index: gimp/libgimpthumb/Makefile.in
339+===================================================================
340+--- gimp.orig/libgimpthumb/Makefile.in
341++++ gimp/libgimpthumb/Makefile.in
342+@@ -462,7 +462,8 @@ libgimpthumb_2_0_la_LDFLAGS = \
343+
344+ libgimpthumb_2_0_la_LIBADD = $(GDK_PIXBUF_LIBS) $(GLIB_LIBS)
345+ gimp_thumbnail_list_SOURCES = gimp-thumbnail-list.c
346+-gimp_thumbnail_list_LDADD = libgimpthumb-$(GIMP_API_VERSION).la
347++gimp_thumbnail_list_LDADD = libgimpthumb-$(GIMP_API_VERSION).la \
348++ $(GDK_PIXBUF_LIBS) $(GLIB_LIBS)
349+
350+ #
351+ # rules to generate built sources
352+Index: gimp/plug-ins/common/Makefile.in
353+===================================================================
354+--- gimp.orig/plug-ins/common/Makefile.in
355++++ gimp/plug-ins/common/Makefile.in
356+@@ -1440,7 +1440,7 @@ libgimp = $(top_builddir)/libgimp/libgim
357+ libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la
358+ libgimpcolor = $(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la
359+ libgimpconfig = $(top_builddir)/libgimpconfig/libgimpconfig-$(GIMP_API_VERSION).la
360+-libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la
361++libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la -lm
362+ libgimpmodule = $(top_builddir)/libgimpmodule/libgimpmodule-$(GIMP_API_VERSION).la
363+ libgimpui = $(top_builddir)/libgimp/libgimpui-$(GIMP_API_VERSION).la
364+ libgimpwidgets = $(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSION).la
365+Index: gimp/plug-ins/help-browser/Makefile.in
366+===================================================================
367+--- gimp.orig/plug-ins/help-browser/Makefile.in
368++++ gimp/plug-ins/help-browser/Makefile.in
369+@@ -409,6 +409,7 @@ LDADD = \
370+ $(libgimpbase) \
371+ $(WEBKIT_LIBS) \
372+ $(GIO_LIBS) \
373++ $(GLIB_LIBS) \
374+ $(RT_LIBS) \
375+ $(INTLLIBS)
376+
377
378=== modified file 'debian/patches/series'
379--- debian/patches/series 2011-04-07 20:17:48 +0000
380+++ debian/patches/series 2011-05-17 16:24:30 +0000
381@@ -1,6 +1,6 @@
382 01_debian-gimprc.patch
383 02_help-message.patch
384 03_gimp.desktop.in.in.patch
385-04_gold_linker.patch
386+06_CVE-2010-4543.patch
387 05_CVE-2010-454x.patch
388-06_CVE-2010-4543.patch
389+07_binutils-gold.patch
390
391=== modified file 'debian/rules'
392--- debian/rules 2010-12-06 05:41:27 +0000
393+++ debian/rules 2011-05-17 16:24:30 +0000
394@@ -11,13 +11,12 @@
395 ## undesired effects, especially when scaling JPEG images
396
397 include /usr/share/cdbs/1/rules/debhelper.mk
398-include /usr/share/cdbs/1/rules/autoreconf.mk
399 include /usr/share/cdbs/1/class/autotools.mk
400 include /usr/share/cdbs/1/class/gnome.mk
401
402
403 LDFLAGS = -Wl,--as-needed
404-DEB_CONFIGURE_EXTRA_FLAGS := --enable-python --enable-default-binary
405+DEB_CONFIGURE_EXTRA_FLAGS := --enable-python --enable-default-binary --without-hal
406 DEB_BUILDDIR := $(DEB_SRCDIR)/build
407
408 DEB_DH_SHLIBDEPS_ARGS_ALL := -Llibgimp2.0 -l$(CURDIR)/debian/libgimp2.0/usr/lib
409@@ -27,6 +26,9 @@
410 rm -rf build
411
412 common-install-impl::
413+ # Remove compiled python files from the distribution, they're compiled
414+ # in postrm by dh_python
415+ find $(CURDIR)/debian/tmp -name "*.py[co]" -delete
416 # Add translation domain to .desktop and .server files
417 DOMAIN=$$(grep --max-count 1 '^GETTEXT_PACKAGE[[:space:]]*=' $(DEB_BUILDDIR)/po/Makefile | sed 's/^.*=[[:space:]]\([^[:space:]]\)/\1/'); \
418 for d in $$(find debian/tmp -type f -name "*.desktop" ); do \
419@@ -43,7 +45,8 @@
420 # postrm by dh_python
421 find $(CURDIR)/debian/tmp -name "*.py[co]" -exec rm '{}' ';'
422
423- rm debian/tmp/usr/lib/*.la
424+ # Remove all libtool .la files
425+ find $(CURDIR)/debian/tmp/usr/lib -name "*.la" -delete
426
427 dh_movefiles
428

Subscribers

People subscribed via source and target branches

to all changes: