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

[Gonéri Le Bouder]

Author: goneri
Date: 2009-02-16 23:29:56 +0000 (Mon, 16 Feb 2009)
New Revision: 8865

Added:
   packages/trunk/lmemory/debian/patches/gtk2.patch
Modified:
   packages/trunk/lmemory/debian/changelog
   packages/trunk/lmemory/debian/control
   packages/trunk/lmemory/debian/patches/fixes.patch
   packages/trunk/lmemory/debian/patches/series
   packages/trunk/lmemory/debian/rules
Log:
* Build with gtk+-2.0, Closes: #509961                                              
* Fix the build system, Closes: #509962


Modified: packages/trunk/lmemory/debian/changelog
===================================================================
--- packages/trunk/lmemory/debian/changelog	2009-02-16 23:17:37 UTC (rev 8864)
+++ packages/trunk/lmemory/debian/changelog	2009-02-16 23:29:56 UTC (rev 8865)
@@ -1,9 +1,14 @@
 lmemory (0.6c-4) UNRELEASED; urgency=low
 
+  [ Peter De Wachter ]
   * Added watch file.
 
- -- Peter De Wachter <pdewacht at gmail.com>  Sun, 07 Sep 2008 17:25:16 +0200
+  [ Gonéri Le Bouder ]
+  * Build with gtk+-2.0, Closes: #509961
+  * Fix the build system, Closes: #509962
 
+ -- Gonéri Le Bouder <goneri at rulezlan.org>  Tue, 17 Feb 2009 00:26:15 +0100
+
 lmemory (0.6c-3) unstable; urgency=low
 
   [ Miriam Ruiz ]

Modified: packages/trunk/lmemory/debian/control
===================================================================
--- packages/trunk/lmemory/debian/control	2009-02-16 23:17:37 UTC (rev 8864)
+++ packages/trunk/lmemory/debian/control	2009-02-16 23:29:56 UTC (rev 8865)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Miriam Ruiz <little_miry at yahoo.es>
-Build-Depends: debhelper (>= 5.0.0), autotools-dev, quilt, libgtk1.2-dev
+Build-Depends: debhelper (>= 5.0.0), autotools-dev, quilt, libgtk2.0-dev
 Standards-Version: 3.8.0
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/lmemory/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/lmemory/?op=log

Modified: packages/trunk/lmemory/debian/patches/fixes.patch
===================================================================
--- packages/trunk/lmemory/debian/patches/fixes.patch	2009-02-16 23:17:37 UTC (rev 8864)
+++ packages/trunk/lmemory/debian/patches/fixes.patch	2009-02-16 23:29:56 UTC (rev 8865)
@@ -1,3 +1,28 @@
+--- lmemory-0.6c.orig/help.c
++++ lmemory-0.6c/help.c
+@@ -39,7 +39,7 @@
+     
+     /* Set the about box labels */
+     label = lookup_widget (window_about, "label_about_version");
+-    gtk_label_set_text(GTK_LABEL(label), VERSION);
++    gtk_label_set_text(GTK_LABEL(label), "0.6c");
+     label = lookup_widget (window_about, "label_about_date");
+     gtk_label_set_text(GTK_LABEL(label), __DATE__);
+     
+--- lmemory-0.6c.orig/Makefile.am
++++ lmemory-0.6c/Makefile.am
+@@ -5,8 +5,10 @@
+ 			mmain.c	\
+ 			lmem_window.c \
+ 			lmem_menu.c \
+-			callbacks.c \
++			lmem_level.c \
+ 			xpm_widget.c \
++			help.c \
++			support.c \
+ 			lmemory.h
+  
+ SUBDIRS =
 diff -ruN lmemory-0.6c.orig/help.h lmemory-0.6c/help.h
 --- lmemory-0.6c.orig/help.h	2003-07-29 16:40:00.000000000 +0200
 +++ lmemory-0.6c/help.h	2008-09-05 18:40:40.000000000 +0200

Added: packages/trunk/lmemory/debian/patches/gtk2.patch
===================================================================
--- packages/trunk/lmemory/debian/patches/gtk2.patch	                        (rev 0)
+++ packages/trunk/lmemory/debian/patches/gtk2.patch	2009-02-16 23:29:56 UTC (rev 8865)
@@ -0,0 +1,13 @@
+--- lmemory-0.6c.orig/configure.in
++++ lmemory-0.6c/configure.in
+@@ -25,8 +25,8 @@
+ AC_STDC_HEADERS
+ AC_ARG_PROGRAM
+ 
+-AM_PATH_GTK(1.2.0,,
+-   AC_MSG_ERROR(Cannot find correct version of GTK - is gtk-config in path?))
++AM_PATH_GTK_2_0(,,
++  AC_MSG_ERROR(Cannot find correct version of GTK))
+ 
+ dnl Checks for header files.
+ AC_HEADER_STDC

Modified: packages/trunk/lmemory/debian/patches/series
===================================================================
--- packages/trunk/lmemory/debian/patches/series	2009-02-16 23:17:37 UTC (rev 8864)
+++ packages/trunk/lmemory/debian/patches/series	2009-02-16 23:29:56 UTC (rev 8865)
@@ -1 +1,2 @@
 fixes.patch
+gtk2.patch

Modified: packages/trunk/lmemory/debian/rules
===================================================================
--- packages/trunk/lmemory/debian/rules	2009-02-16 23:17:37 UTC (rev 8864)
+++ packages/trunk/lmemory/debian/rules	2009-02-16 23:29:56 UTC (rev 8865)
@@ -46,6 +46,7 @@
 ifneq "$(wildcard /usr/share/misc/config.guess)" ""
 	cp -f /usr/share/misc/config.guess config.guess
 endif
+	autoreconf --force --install
 	CFLAGS="$(CFLAGS)" \
 	LDFLAGS="-Wl,-z,defs -Wl,--as-needed -Wl,--no-undefined" \
 	./configure --prefix=/usr --mandir=\$${prefix}/share/man \
@@ -63,6 +64,8 @@
 	dh_testdir
 	dh_testroot
 	rm -f config-stamp build-stamp 
+	# Clean up the files generated by the autoreconf
+	rm -f ltconfig depcomp
 	[ ! -f config.status ] || $(MAKE) distclean
 	rm -f config.sub config.guess config.log config.cache
 	$(MAKE) -f /usr/share/quilt/quilt.make unpatch