This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository asc.
commit dd660a1f598d630744d84887cd3ca8821bfa2b8a Author: Barry deFreese <[email protected]> Date: Thu May 28 19:10:23 2009 +0000 * 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. --- debian/changelog | 17 +++++++++++++---- debian/control | 2 +- debian/patches/010_boost_libs.diff | 30 ++++++++++++++++++++++++++++++ debian/patches/series | 1 + debian/rules | 17 +++++++++++++---- 5 files changed, 58 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index 307248a..c89ae7a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,14 +2,23 @@ asc (2.2.0.0-1) UNRELEASED; urgency=low [ 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 <[email protected]> Sun, 01 Mar 2009 16:11:04 -0500 + -- Barry deFreese <[email protected]> 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 <[email protected]> Thu, 28 May 2009 13:49:52 -0400 asc (2.1.0.0-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 4113b54..20e4fd8 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Debian Games Team <[email protected]> Uploaders: Sam Hocevar (Debian packages) <[email protected]>, Bartosz Fenski <[email protected]>, Alexander Reichle-Schmehl <[email protected]>, Barry deFreese <[email protected]> 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 diff --git a/debian/patches/010_boost_libs.diff b/debian/patches/010_boost_libs.diff new file mode 100644 index 0000000..4805ab9 --- /dev/null +++ b/debian/patches/010_boost_libs.diff @@ -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 diff --git a/debian/patches/series b/debian/patches/series index e69de29..4148f87 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -0,0 +1 @@ +010_boost_libs.diff diff --git a/debian/rules b/debian/rules index 585dd34..4d4e49d 100755 --- a/debian/rules +++ b/debian/rules @@ -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 @@ else CFLAGS += -O2 endif -config.status: configure patch +config.status: configure dh_testdir ifneq "$(wildcard /usr/share/misc/config.sub)" "" @@ -30,6 +29,9 @@ endif 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 @@ build-stamp: config.status 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 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/asc.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
