Author: ansgar-guest
Date: 2008-06-21 13:20:00 +0000 (Sat, 21 Jun 2008)
New Revision: 7449
Added:
packages/trunk/gmult/debian/patches/fix_gtkmm_detection
Modified:
packages/trunk/gmult/debian/changelog
packages/trunk/gmult/debian/patches/series
packages/trunk/gmult/debian/rules
Log:
* Make configure fail if GTKMM is not found
* Avoid running configure twice
Modified: packages/trunk/gmult/debian/changelog
===================================================================
--- packages/trunk/gmult/debian/changelog 2008-06-21 10:32:18 UTC (rev
7448)
+++ packages/trunk/gmult/debian/changelog 2008-06-21 13:20:00 UTC (rev
7449)
@@ -1,3 +1,10 @@
+gmult (5.4-2) UNRELEASED; urgency=low
+
+ * Make configure fail if GTKMM is not found
+ * Avoid running configure twice
+
+ -- Ansgar Burchardt <[EMAIL PROTECTED]> Sat, 21 Jun 2008 14:35:24 +0200
+
gmult (5.4-1) unstable; urgency=low
* New Upstream release
Added: packages/trunk/gmult/debian/patches/fix_gtkmm_detection
===================================================================
--- packages/trunk/gmult/debian/patches/fix_gtkmm_detection
(rev 0)
+++ packages/trunk/gmult/debian/patches/fix_gtkmm_detection 2008-06-21
13:20:00 UTC (rev 7449)
@@ -0,0 +1,17 @@
+configure returns with 0 exit status even if GTKMM is not found. This causes
+an almost empty package to be build (see #487231). This patch makes configure
+fail properly.
+
+Index: gmult-5.4/configure.ac
+===================================================================
+--- gmult-5.4.orig/configure.ac
++++ gmult-5.4/configure.ac
+@@ -16,7 +16,7 @@
+ AC_PROG_INTLTOOL
+
+ # Checks for libraries.
+-PKG_CHECK_MODULES(GTKMM, gtkmm-2.4 >= 2.6.0,,exit)
++PKG_CHECK_MODULES(GTKMM, gtkmm-2.4 >= 2.6.0)
+ AC_SUBST(GTKMM_CFLAGS)
+ AC_SUBST(GTKMM_LIBS)
+
Modified: packages/trunk/gmult/debian/patches/series
===================================================================
--- packages/trunk/gmult/debian/patches/series 2008-06-21 10:32:18 UTC (rev
7448)
+++ packages/trunk/gmult/debian/patches/series 2008-06-21 13:20:00 UTC (rev
7449)
@@ -1,2 +1,3 @@
10_desktop_file_warns.diff
ftbfs_gcc-4.3.diff
+fix_gtkmm_detection
Modified: packages/trunk/gmult/debian/rules
===================================================================
--- packages/trunk/gmult/debian/rules 2008-06-21 10:32:18 UTC (rev 7448)
+++ packages/trunk/gmult/debian/rules 2008-06-21 13:20:00 UTC (rev 7449)
@@ -5,9 +5,12 @@
export LDFLAGS += -Wl,--as-needed -Wl,-z,defs
-build: patch build-gmult debian/gmult.6
+build: build-stamp
+build-stamp: $(QUILT_STAMPFN) debian/gmult.6
+ # we patch configure.ac, so regenerate configure
+ [ -d m4 ] || mkdir m4
+ autoreconf
-build-gmult:
dh build --before configure
dh_auto_configure -- --bindir='$${prefix}/games'
dh_auto_build
@@ -16,6 +19,7 @@
# due to intltool-update looking in .pc/*...
dh build --after test
+ touch $@
debian/gmult.6: debian/gmult.dbk
xsltproc --nonet -o $@ \
@@ -26,6 +30,7 @@
dh clean
rm -f debian/gmult.6
rm -f po/stamp-po po/*.gmo
+ rm -rf configure m4
install: build
# upstream ships an empty changelog, installing it would be useless.
@@ -40,3 +45,5 @@
binary: binary-arch
+.PHONY: build clean clean-patched install binary-arch binary
+
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
