r12547 - in packages/trunk/lmemory/debian: . patches

[Bas Wijnen]

Author: wijnen
Date: 2011-07-21 19:13:58 +0000 (Thu, 21 Jul 2011)
New Revision: 12547

Added:
   packages/trunk/lmemory/debian/patches/as-needed.patch
Modified:
   packages/trunk/lmemory/debian/changelog
   packages/trunk/lmemory/debian/patches/series
   packages/trunk/lmemory/debian/rules
Log:
fix FTBFS

Modified: packages/trunk/lmemory/debian/changelog
===================================================================
--- packages/trunk/lmemory/debian/changelog	2011-07-20 11:55:25 UTC (rev 12546)
+++ packages/trunk/lmemory/debian/changelog	2011-07-21 19:13:58 UTC (rev 12547)
@@ -1,6 +1,9 @@
-lmemory (0.6c-6) UNRELEASED; urgency=low
+lmemory (0.6c-6) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * Team upload.
+  * Add --as-needed to linker flags to avoid useless linking.
+  * In clean, first generate all build files, because the original source
+  has a Makefile, but cannot run make maintainer-clean.
 
  -- Bas Wijnen <wijnen at debian.org>  Tue, 19 Jul 2011 13:41:07 +0200
 

Added: packages/trunk/lmemory/debian/patches/as-needed.patch
===================================================================
--- packages/trunk/lmemory/debian/patches/as-needed.patch	                        (rev 0)
+++ packages/trunk/lmemory/debian/patches/as-needed.patch	2011-07-21 19:13:58 UTC (rev 12547)
@@ -0,0 +1,12 @@
+Index: lmemory/Makefile.am
+===================================================================
+--- lmemory.orig/Makefile.am	2011-07-21 21:01:40.025414093 +0200
++++ lmemory/Makefile.am	2011-07-21 21:02:08.049585767 +0200
+@@ -13,6 +13,7 @@
+  
+ SUBDIRS =
+ 
++LDFLAGS = -Wl,--as-needed
+ LDADD =	@GTK_LIBS@
+ 
+ INCLUDES = @GTK_CFLAGS@ -I. -DLIBDIR=\"@libdir@\" -DDATADIR=\"@datadir@\"

Modified: packages/trunk/lmemory/debian/patches/series
===================================================================
--- packages/trunk/lmemory/debian/patches/series	2011-07-20 11:55:25 UTC (rev 12546)
+++ packages/trunk/lmemory/debian/patches/series	2011-07-21 19:13:58 UTC (rev 12547)
@@ -1,3 +1,4 @@
 fixes.patch
 gtk2.patch
 ac_local_program.diff
+as-needed.patch

Modified: packages/trunk/lmemory/debian/rules
===================================================================
--- packages/trunk/lmemory/debian/rules	2011-07-20 11:55:25 UTC (rev 12546)
+++ packages/trunk/lmemory/debian/rules	2011-07-21 19:13:58 UTC (rev 12547)
@@ -10,8 +10,7 @@
 JUNK = configure config.h.in ltmain.sh mkinstalldirs config.guess config.sub aclocal.m4 depcomp install-sh Makefile.in missing INSTALL COPYING
 
 override_dh_auto_clean:
+	test ! -e Makefile || test -e config.status || (autoreconf -fis && ./configure)
 	test ! -e Makefile || make maintainer-clean
-ifneq ($(wildcard $(JUNK)),)
-	rm -r $(wildcard $(JUNK))
-endif
+	rm -rf $(JUNK)
 	dh_auto_clean