r7161 - in packages/trunk/vacuum/debian: . patches

[Gonéri Le Bouder]

Author: goneri
Date: 2008-05-22 21:15:21 +0000 (Thu, 22 May 2008)
New Revision: 7161

Added:
   packages/trunk/vacuum/debian/patches/
   packages/trunk/vacuum/debian/patches/disable_music.diff
   packages/trunk/vacuum/debian/patches/series
Modified:
   packages/trunk/vacuum/debian/changelog
   packages/trunk/vacuum/debian/control
   packages/trunk/vacuum/debian/rules
Log:
* Remove the music files since they don't have a proper license
* add disable_music.diff and quilt as builddep


Modified: packages/trunk/vacuum/debian/changelog
===================================================================
--- packages/trunk/vacuum/debian/changelog	2008-05-22 21:02:19 UTC (rev 7160)
+++ packages/trunk/vacuum/debian/changelog	2008-05-22 21:15:21 UTC (rev 7161)
@@ -5,6 +5,7 @@
 
   [ Gonéri Le Bouder ]
   * Remove the music files since they don't have a proper license
+  * add disable_music.diff and quilt as builddep
 
  -- Barry deFreese <bddebian at comcast.net>  Mon, 19 May 2008 14:55:51 -0400
 

Modified: packages/trunk/vacuum/debian/control
===================================================================
--- packages/trunk/vacuum/debian/control	2008-05-22 21:02:19 UTC (rev 7160)
+++ packages/trunk/vacuum/debian/control	2008-05-22 21:15:21 UTC (rev 7161)
@@ -4,7 +4,7 @@
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Barry deFreese <bddebian at comcast.net>
 Build-Depends: debhelper (>= 5)
-Build-Depends-Indep: autotools-dev, libsdl-perl
+Build-Depends-Indep: autotools-dev, libsdl-perl, quilt
 Standards-Version: 3.7.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/vacuum/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/vacuum/?op=log

Added: packages/trunk/vacuum/debian/patches/disable_music.diff
===================================================================
--- packages/trunk/vacuum/debian/patches/disable_music.diff	                        (rev 0)
+++ packages/trunk/vacuum/debian/patches/disable_music.diff	2008-05-22 21:15:21 UTC (rev 7161)
@@ -0,0 +1,21 @@
+Index: configure
+===================================================================
+--- configure.orig
++++ configure
+@@ -2134,7 +2134,7 @@
+   { echo "$as_me:$LINENO: result: " >&5
+ echo "${ECHO_T}" >&6; }
+ 
+-ac_config_files="$ac_config_files VERSION Makefile bin/Makefile data/Makefile data/music/Makefile"
++ac_config_files="$ac_config_files VERSION Makefile bin/Makefile data/Makefile"
+ 
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+@@ -2709,7 +2709,6 @@
+     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+     "bin/Makefile") CONFIG_FILES="$CONFIG_FILES bin/Makefile" ;;
+     "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
+-    "data/music/Makefile") CONFIG_FILES="$CONFIG_FILES data/music/Makefile" ;;
+ 
+   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}

Added: packages/trunk/vacuum/debian/patches/series
===================================================================
--- packages/trunk/vacuum/debian/patches/series	                        (rev 0)
+++ packages/trunk/vacuum/debian/patches/series	2008-05-22 21:15:21 UTC (rev 7161)
@@ -0,0 +1 @@
+disable_music.diff -p0

Modified: packages/trunk/vacuum/debian/rules
===================================================================
--- packages/trunk/vacuum/debian/rules	2008-05-22 21:02:19 UTC (rev 7160)
+++ packages/trunk/vacuum/debian/rules	2008-05-22 21:15:21 UTC (rev 7161)
@@ -16,6 +16,7 @@
 
 config.status: configure
 	dh_testdir
+	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
 	# Add here commands to configure the package.
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
 	cp -f /usr/share/misc/config.sub config.sub
@@ -44,6 +45,7 @@
 	dh_testroot
 	rm -f build-stamp 
 
+	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
 	[ ! -f Makefile ] || $(MAKE) distclean
 	rm -f config.sub config.guess