r11934 - in packages/trunk/excellent-bifurcation/debian: . patches source

Mon Mar 14 17:52:52 UTC 2011

Author: ansgar
Date: 2011-03-14 17:52:51 +0000 (Mon, 14 Mar 2011)
New Revision: 11934

Added:
   packages/trunk/excellent-bifurcation/debian/patches/link-with-libm.patch
   packages/trunk/excellent-bifurcation/debian/source/
   packages/trunk/excellent-bifurcation/debian/source/format
   packages/trunk/excellent-bifurcation/debian/source/local-options
Modified:
   packages/trunk/excellent-bifurcation/debian/changelog
   packages/trunk/excellent-bifurcation/debian/control
   packages/trunk/excellent-bifurcation/debian/copyright
   packages/trunk/excellent-bifurcation/debian/patches/series
   packages/trunk/excellent-bifurcation/debian/rules
Log:
* Team upload.
* Use source format 3.0 (quilt).
* debian/copyright: Refer to /usr/share/common-licenses/GPL-2.
* Link with -lm to fix FTBFS with binutils-gold. (Closes: #554275)
  + new patch: link-with-libm.patch

Modified: packages/trunk/excellent-bifurcation/debian/changelog
===================================================================

--- packages/trunk/excellent-bifurcation/debian/changelog	2011-03-14 15:08:31 UTC (rev 11933)
+++ packages/trunk/excellent-bifurcation/debian/changelog	2011-03-14 17:52:51 UTC (rev 11934)
@@ -1,3 +1,13 @@
+excellent-bifurcation (0.0.20071015-3) unstable; urgency=low
+
+  * Team upload.
+  * Use source format 3.0 (quilt).
+  * debian/copyright: Refer to /usr/share/common-licenses/GPL-2.
+  * Link with -lm to fix FTBFS with binutils-gold. (Closes: #554275)
+    + new patch: link-with-libm.patch
+
+ -- Ansgar Burchardt <ansgar at debian.org>  Mon, 14 Mar 2011 18:52:30 +0100
+
 excellent-bifurcation (0.0.20071015-2) unstable; urgency=low
 
   * Save init.d according to XDG base directory specifications and not

Modified: packages/trunk/excellent-bifurcation/debian/control
===================================================================
--- packages/trunk/excellent-bifurcation/debian/control	2011-03-14 15:08:31 UTC (rev 11933)
+++ packages/trunk/excellent-bifurcation/debian/control	2011-03-14 17:52:51 UTC (rev 11934)
@@ -3,7 +3,7 @@
 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), quilt, dh-buildinfo, pkg-config,
+Build-Depends: debhelper (>= 5), dh-buildinfo, pkg-config,
  liballegro4.2-dev, libxdg-basedir-dev (>= 1.0.0)
 Standards-Version: 3.8.2
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/excellent-bifurcation/

Modified: packages/trunk/excellent-bifurcation/debian/copyright
===================================================================
--- packages/trunk/excellent-bifurcation/debian/copyright	2011-03-14 15:08:31 UTC (rev 11933)
+++ packages/trunk/excellent-bifurcation/debian/copyright	2011-03-14 17:52:51 UTC (rev 11934)
@@ -25,8 +25,8 @@
     along with this package; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+On Debian systems, the complete text of version 2 of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
 
 The Debian packaging is Copyright (C) 2007, Miriam Ruiz <little_miry at yahoo.es> and
 is licensed under the GPL, see above.

Added: packages/trunk/excellent-bifurcation/debian/patches/link-with-libm.patch
===================================================================
--- packages/trunk/excellent-bifurcation/debian/patches/link-with-libm.patch	                        (rev 0)
+++ packages/trunk/excellent-bifurcation/debian/patches/link-with-libm.patch	2011-03-14 17:52:51 UTC (rev 11934)
@@ -0,0 +1,15 @@
+From: Ansgar Burchardt <ansgar at debian.org>
+Date: Mon, 14 Mar 2011 18:50:51 +0100
+Subject: Link with -lm to fix FTBFS with binutils-gold
+Bug-Debian: http://bugs.debian.org/554275
+--- excellent-bifurcation.orig/src/Makefile
++++ excellent-bifurcation/src/Makefile
+@@ -11,7 +11,7 @@
+ all: $(SOURCES) $(EXECUTABLE)
+ 
+ $(EXECUTABLE): $(OBJECTS) 
+-	$(CC) $(LDFLAGS) $(PKGCONFIG_LDFLAGS) $(OBJECTS) -o $@
++	$(CC) $(LDFLAGS) $(PKGCONFIG_LDFLAGS) -lm $(OBJECTS) -o $@
+ 
+ .c.o:
+ 	$(CC) $(CFLAGS) $(PKGCONFIG_CFLAGS) `pkg-config libxdg-basedir --libs` -c $< -o $@

Modified: packages/trunk/excellent-bifurcation/debian/patches/series
===================================================================
--- packages/trunk/excellent-bifurcation/debian/patches/series	2011-03-14 15:08:31 UTC (rev 11933)
+++ packages/trunk/excellent-bifurcation/debian/patches/series	2011-03-14 17:52:51 UTC (rev 11934)
@@ -1,3 +1,4 @@
 directories.patch
 windowed.patch
 config_file.patch
+link-with-libm.patch

Modified: packages/trunk/excellent-bifurcation/debian/rules
===================================================================
--- packages/trunk/excellent-bifurcation/debian/rules	2011-03-14 15:08:31 UTC (rev 11933)
+++ packages/trunk/excellent-bifurcation/debian/rules	2011-03-14 17:52:51 UTC (rev 11934)
@@ -14,7 +14,6 @@
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
-	$(MAKE) -f /usr/share/quilt/quilt.make patch
 	touch $@
 
 build: build-stamp
@@ -28,7 +27,6 @@
 	dh_testroot
 	rm -f build-stamp configure-stamp
 	$(MAKE) -C src clean
-	$(MAKE) -f /usr/share/quilt/quilt.make unpatch
 	dh_clean 
 
 install: build

Added: packages/trunk/excellent-bifurcation/debian/source/format
===================================================================
--- packages/trunk/excellent-bifurcation/debian/source/format	                        (rev 0)
+++ packages/trunk/excellent-bifurcation/debian/source/format	2011-03-14 17:52:51 UTC (rev 11934)
@@ -0,0 +1 @@
+3.0 (quilt)

Added: packages/trunk/excellent-bifurcation/debian/source/local-options
===================================================================
--- packages/trunk/excellent-bifurcation/debian/source/local-options	                        (rev 0)
+++ packages/trunk/excellent-bifurcation/debian/source/local-options	2011-03-14 17:52:51 UTC (rev 11934)
@@ -0,0 +1 @@
+abort-on-upstream-changes


