r12557 - in packages/trunk/excellent-bifurcation/debian: . patches

[Vincent Cheng]

Author: vincentc-guest
Date: 2011-07-25 20:33:53 +0000 (Mon, 25 Jul 2011)
New Revision: 12557

Added:
   packages/trunk/excellent-bifurcation/debian/manpages
Modified:
   packages/trunk/excellent-bifurcation/debian/changelog
   packages/trunk/excellent-bifurcation/debian/compat
   packages/trunk/excellent-bifurcation/debian/control
   packages/trunk/excellent-bifurcation/debian/menu
   packages/trunk/excellent-bifurcation/debian/patches/link-with-libm.patch
   packages/trunk/excellent-bifurcation/debian/rules
Log:
excellent-bifurcation: Fix #631687, and several other tweaks.


Modified: packages/trunk/excellent-bifurcation/debian/changelog
===================================================================
--- packages/trunk/excellent-bifurcation/debian/changelog	2011-07-25 14:23:41 UTC (rev 12556)
+++ packages/trunk/excellent-bifurcation/debian/changelog	2011-07-25 20:33:53 UTC (rev 12557)
@@ -1,3 +1,14 @@
+excellent-bifurcation (0.0.20071015-4) unstable; urgency=low
+
+  * Team upload.
+  * Modify debian/patches/link-with-libm.patch to fix FTBFS with ld
+    --as-needed. Thanks to Ilya Barygin for the bug report! (Closes: #631687)
+  * Bump Standards-Version to 3.9.2 (no changes required).
+  * Update debhelper compatiblity level from 5 to 8.
+  * Update debian/rules to dh 7 "rules.tiny" style.
+
+ -- Vincent Cheng <Vincentc1208 at gmail.com>  Mon, 25 Jul 2011 12:43:21 -0700
+
 excellent-bifurcation (0.0.20071015-3) unstable; urgency=low
 
   * Team upload.

Modified: packages/trunk/excellent-bifurcation/debian/compat
===================================================================
--- packages/trunk/excellent-bifurcation/debian/compat	2011-07-25 14:23:41 UTC (rev 12556)
+++ packages/trunk/excellent-bifurcation/debian/compat	2011-07-25 20:33:53 UTC (rev 12557)
@@ -1 +1 @@
-5
+8

Modified: packages/trunk/excellent-bifurcation/debian/control
===================================================================
--- packages/trunk/excellent-bifurcation/debian/control	2011-07-25 14:23:41 UTC (rev 12556)
+++ packages/trunk/excellent-bifurcation/debian/control	2011-07-25 20:33:53 UTC (rev 12557)
@@ -3,9 +3,9 @@
 Priority: extra
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Miriam Ruiz <little_miry at yahoo.es>, Barry deFreese <bdefreese at debian.org>
-Build-Depends: debhelper (>= 5), dh-buildinfo, pkg-config,
+Build-Depends: debhelper (>= 8), dh-buildinfo, pkg-config,
  liballegro4.2-dev, libxdg-basedir-dev (>= 1.0.0)
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/excellent-bifurcation/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/excellent-bifurcation/?op=log
 

Added: packages/trunk/excellent-bifurcation/debian/manpages
===================================================================
--- packages/trunk/excellent-bifurcation/debian/manpages	                        (rev 0)
+++ packages/trunk/excellent-bifurcation/debian/manpages	2011-07-25 20:33:53 UTC (rev 12557)
@@ -0,0 +1 @@
+debian/excellent-bifurcation.6

Modified: packages/trunk/excellent-bifurcation/debian/menu
===================================================================
--- packages/trunk/excellent-bifurcation/debian/menu	2011-07-25 14:23:41 UTC (rev 12556)
+++ packages/trunk/excellent-bifurcation/debian/menu	2011-07-25 20:33:53 UTC (rev 12557)
@@ -1,2 +1,2 @@
-?package(excellent-bifurcation):needs="X11" section="Games\Action" \
-  title="excellent-bifurcation" command="/usr/bin/excellent-bifurcation"
+?package(excellent-bifurcation):needs="X11" section="Games/Action" \
+  title="excellent-bifurcation" command="/usr/games/excellent-bifurcation"

Modified: packages/trunk/excellent-bifurcation/debian/patches/link-with-libm.patch
===================================================================
--- packages/trunk/excellent-bifurcation/debian/patches/link-with-libm.patch	2011-07-25 14:23:41 UTC (rev 12556)
+++ packages/trunk/excellent-bifurcation/debian/patches/link-with-libm.patch	2011-07-25 20:33:53 UTC (rev 12557)
@@ -9,7 +9,7 @@
  
  $(EXECUTABLE): $(OBJECTS) 
 -	$(CC) $(LDFLAGS) $(PKGCONFIG_LDFLAGS) $(OBJECTS) -o $@
-+	$(CC) $(LDFLAGS) $(PKGCONFIG_LDFLAGS) -lm $(OBJECTS) -o $@
++	$(CC) $(OBJECTS) -o $@ $(LDFLAGS) $(PKGCONFIG_LDFLAGS) -lm
  
  .c.o:
  	$(CC) $(CFLAGS) $(PKGCONFIG_CFLAGS) `pkg-config libxdg-basedir --libs` -c $< -o $@

Modified: packages/trunk/excellent-bifurcation/debian/rules
===================================================================
--- packages/trunk/excellent-bifurcation/debian/rules	2011-07-25 14:23:41 UTC (rev 12556)
+++ packages/trunk/excellent-bifurcation/debian/rules	2011-07-25 20:33:53 UTC (rev 12557)
@@ -1,64 +1,12 @@
 #!/usr/bin/make -f
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+%:
+	dh $@ 
 
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-        CFLAGS += -O0
-else
-        CFLAGS += -O2
-endif
-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	touch $@
-
-build: build-stamp
-build-stamp: configure-stamp 
-	dh_testdir
-	$(MAKE) -C src CFLAGS="$(CFLAGS) -DDATA_DIR=\\\"/usr/share/games/excellent-bifurcation\\\""
-	touch $@
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
+override_dh_clean:
 	$(MAKE) -C src clean
-	dh_clean 
+	dh_clean
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-	#$(MAKE) DESTDIR=$(CURDIR)/debian/excellent-bifurcation install
-
-# Build architecture-independent files here.
-binary-indep: build install
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs 
-	dh_installdocs
-	dh_installexamples
-	dh_install
-#	dh_installmenu
-	dh_installman debian/excellent-bifurcation.6
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	test -e /usr/bin/dh_buildinfo && dh_buildinfo
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+override_dh_auto_build:
+	$(MAKE) -C src \
+	CFLAGS="-DDATA_DIR=\\\"/usr/share/games/excellent-bifurcation\\\""