r9800 - in packages/trunk/asc/debian: . patches

[Barry deFreese]

Author: bdefreese
Date: 2009-05-28 19:10:23 +0000 (Thu, 28 May 2009)
New Revision: 9800

Added:
   packages/trunk/asc/debian/patches/010_boost_libs.diff
Modified:
   packages/trunk/asc/debian/changelog
   packages/trunk/asc/debian/control
   packages/trunk/asc/debian/patches/series
   packages/trunk/asc/debian/rules
Log:
  * 010_boost_libs.diff - Look for boost_regex-mt for newer boost libs.
  * Bump Standards Version to 3.8.1. (No changes needed).
Update changelog entries to match what I just uploaded to unstable.


Modified: packages/trunk/asc/debian/changelog
===================================================================
--- packages/trunk/asc/debian/changelog	2009-05-28 12:13:28 UTC (rev 9799)
+++ packages/trunk/asc/debian/changelog	2009-05-28 19:10:23 UTC (rev 9800)
@@ -2,15 +2,24 @@
 
   [ Barry deFreese ]
   * New upstream release.
-  * Update my e-mail address.
-  * Remove unnecessary build-dep on libartsc0-dev.
-  * Build-depend on libparagui1.1-dev instead of 1.0.
+CURRENTLY TRYING TO REMOVE EMBEDDED SDLmm and libparagui sources.
 
   [ Alexander Reichle-Schmehl ]
   * Adopt debian/control to my new name.
 
- -- Barry deFreese <bdefreese at debian.org>  Sun, 01 Mar 2009 16:11:04 -0500
+ -- Barry deFreese <bdefreese at debian.org>  Thu, 28 May 2009 13:49:52 -0400
 
+asc (2.1.0.0-2) unstable; urgency=low
+
+  [ Barry deFreese ]
+  * Update my e-mail address.
+  * Remove unnecessary build-dep on libartsc0-dev.
+  * 010_boost_libs.diff - Look for boost_regex-mt for newer boost libs.
+  * Build-depend on libparagui1.1-dev instead of 1.0. (Closes: #529562).
+  * Bump Standards Version to 3.8.1. (No changes needed).
+
+ -- Barry deFreese <bdefreese at debian.org>  Thu, 28 May 2009 13:49:52 -0400
+
 asc (2.1.0.0-1) unstable; urgency=low
 
   [ Barry deFreese ]

Modified: packages/trunk/asc/debian/control
===================================================================
--- packages/trunk/asc/debian/control	2009-05-28 12:13:28 UTC (rev 9799)
+++ packages/trunk/asc/debian/control	2009-05-28 19:10:23 UTC (rev 9800)
@@ -4,7 +4,7 @@
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Sam Hocevar (Debian packages) <sam+deb at zoy.org>, Bartosz Fenski <fenio at debian.org>, Alexander Reichle-Schmehl <tolimar at debian.org>, Barry deFreese <bdefreese at debian.org>
 Build-Depends: debhelper (>= 5.0.0), quilt, libsdl1.2-dev (>=1.2.7+1.2.8cvs20041007-5.2), libsdl-mixer1.2-dev, libsdl-image1.2-dev (>= 1.2.3-5), libsdl-sound1.2-dev, libsigc++-1.2-dev, libparagui1.1-dev, libphysfs-dev, libxt-dev, libesd0-dev, libboost-dev, libboost-regex-dev, libbz2-dev, zip
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/asc/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/asc/?op=log
 Homepage: http://www.asc-hq.org

Added: packages/trunk/asc/debian/patches/010_boost_libs.diff
===================================================================
--- packages/trunk/asc/debian/patches/010_boost_libs.diff	                        (rev 0)
+++ packages/trunk/asc/debian/patches/010_boost_libs.diff	2009-05-28 19:10:23 UTC (rev 9800)
@@ -0,0 +1,30 @@
+Index: asc-2.1.0.0/configure
+===================================================================
+--- asc-2.1.0.0.orig/configure	2009-05-28 14:04:15.000000000 -0400
++++ asc-2.1.0.0/configure	2009-05-28 14:05:21.000000000 -0400
+@@ -22721,13 +22721,13 @@
+ #AC_MSG_RESULT("yes")
+ 
+ 
+-{ echo "$as_me:$LINENO: checking for main in -lboost_regex" >&5
+-echo $ECHO_N "checking for main in -lboost_regex... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: checking for main in -lboost_regex-mt" >&5
++echo $ECHO_N "checking for main in -lboost_regex-mt... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_boost_regex_main+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lboost_regex  $LIBS"
++LIBS="-lboost_regex-mt  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -22777,7 +22777,7 @@
+ { echo "$as_me:$LINENO: result: $ac_cv_lib_boost_regex_main" >&5
+ echo "${ECHO_T}$ac_cv_lib_boost_regex_main" >&6; }
+ if test $ac_cv_lib_boost_regex_main = yes; then
+-  BOOST_LIBS="-lboost_regex"
++  BOOST_LIBS="-lboost_regex-mt"
+ else
+   BOOSTERR=yes
+ fi

Modified: packages/trunk/asc/debian/patches/series
===================================================================
--- packages/trunk/asc/debian/patches/series	2009-05-28 12:13:28 UTC (rev 9799)
+++ packages/trunk/asc/debian/patches/series	2009-05-28 19:10:23 UTC (rev 9800)
@@ -0,0 +1 @@
+010_boost_libs.diff

Modified: packages/trunk/asc/debian/rules
===================================================================
--- packages/trunk/asc/debian/rules	2009-05-28 12:13:28 UTC (rev 9799)
+++ packages/trunk/asc/debian/rules	2009-05-28 19:10:23 UTC (rev 9800)
@@ -1,7 +1,6 @@
 #!/usr/bin/make -f
 # rules file for asc (May 2004)
 
-include /usr/share/quilt/quilt.make
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
@@ -21,7 +20,7 @@
 	CFLAGS += -O2
 endif
 
-config.status: configure patch
+config.status: configure
 
 	dh_testdir
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
@@ -30,6 +29,9 @@
 ifneq "$(wildcard /usr/share/misc/config.guess)" ""
 	cp -f /usr/share/misc/config.guess config.guess
 endif
+
+	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
+
 	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --disable-paraguitest  
 
 build: build-stamp
@@ -41,13 +43,20 @@
 
 	touch build-stamp
 
-clean: clean-patched unpatch
-clean-patched: 
+clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp 
 
+	#Make sure patches are applied before cleaning:
+	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
+
 	[ ! -f Makefile ] || $(MAKE) clean
+
+	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
+	rm -rf .pc
+	rm -f config.status config.log
+
 	dh_clean 
 
 install: build