r10591 - in packages/trunk/xbill/debian: . patches source

Vincent Legout vlegout-guest at alioth.debian.org
Tue Dec 8 02:08:11 UTC 2009 

Author: vlegout-guest
Date: 2009-12-08 02:08:11 +0000 (Tue, 08 Dec 2009)
New Revision: 10591

Added:
   packages/trunk/xbill/debian/patches/03_fix_ftbfs_binutils_gold.diff
   packages/trunk/xbill/debian/source/
   packages/trunk/xbill/debian/source/format
Modified:
   packages/trunk/xbill/debian/changelog
   packages/trunk/xbill/debian/copyright
   packages/trunk/xbill/debian/patches/01_makefile_in.diff
   packages/trunk/xbill/debian/patches/02_hurd_logos.diff
   packages/trunk/xbill/debian/patches/series
   packages/trunk/xbill/debian/postrm
   packages/trunk/xbill/debian/rules
Log:
debian/copyright:
- Use 'Copyright (C)' instead of '(C)'
- Refer to GPL-2, not GPL
debian/postrm: Use true instead of /bin/true
Switch to the new source package formats 3.0:
- Remove patching/unpatching code in debian/rules
03_fix_ftbfs_binutils_gold.diff: Fix FTBFS with binutils-gold


Modified: packages/trunk/xbill/debian/changelog
===================================================================
--- packages/trunk/xbill/debian/changelog	2009-12-08 02:01:16 UTC (rev 10590)
+++ packages/trunk/xbill/debian/changelog	2009-12-08 02:08:11 UTC (rev 10591)
@@ -1,8 +1,15 @@
 xbill (2.1-8) UNRELEASED; urgency=low
 
-  * 
+  * debian/copyright:
+    - Use 'Copyright (C)' instead of '(C)'
+    - Refer to GPL-2, not GPL
+  * debian/postrm: Use true instead of /bin/true
+  * Switch to the new source package formats 3.0:
+    - Remove patching/unpatching code in debian/rules
+  * 03_fix_ftbfs_binutils_gold.diff: Fix FTBFS with binutils-gold
+    (Closes: #556690)
 
- -- Barry deFreese <bddebian at comcast.net>  Wed, 02 Apr 2008 16:12:58 -0400
+ -- Vincent Legout <vincent at legout.info>  Tue, 08 Dec 2009 10:03:17 +0800
 
 xbill (2.1-7) unstable; urgency=low
 

Modified: packages/trunk/xbill/debian/copyright
===================================================================
--- packages/trunk/xbill/debian/copyright	2009-12-08 02:01:16 UTC (rev 10590)
+++ packages/trunk/xbill/debian/copyright	2009-12-08 02:08:11 UTC (rev 10591)
@@ -40,8 +40,9 @@
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
   On Debian GNU/Linux systems, the complete text of the GNU General
-  Public License can be found in `/usr/share/common-licenses/GPL'.
+  Public License can be found in `/usr/share/common-licenses/GPL-2'.
 
-The Debian packaging is (C) 1996, Christoph Lameter <clameter at debian.org> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+The Debian packaging is Copyright (C) 1996, Christoph Lameter
+<clameter at debian.org> and is licensed under the GPL, see
+`/usr/share/common-licenses/GPL-2'.
 

Modified: packages/trunk/xbill/debian/patches/01_makefile_in.diff
===================================================================
--- packages/trunk/xbill/debian/patches/01_makefile_in.diff	2009-12-08 02:01:16 UTC (rev 10590)
+++ packages/trunk/xbill/debian/patches/01_makefile_in.diff	2009-12-08 02:08:11 UTC (rev 10591)
@@ -1,3 +1,6 @@
+# Description: Fix up paths
+# Author: Barry deFreese <bddebian at comcast.net>
+
 --- xbill-2.1.orig/Makefile.in
 +++ xbill-2.1/Makefile.in
 @@ -13,9 +13,9 @@

Modified: packages/trunk/xbill/debian/patches/02_hurd_logos.diff
===================================================================
--- packages/trunk/xbill/debian/patches/02_hurd_logos.diff	2009-12-08 02:01:16 UTC (rev 10590)
+++ packages/trunk/xbill/debian/patches/02_hurd_logos.diff	2009-12-08 02:08:11 UTC (rev 10591)
@@ -1,3 +1,6 @@
+# Description: Hurd logos for the game
+# Author: Barry deFreese <bddebian at comcast.net>
+
 --- xbill-2.1.orig/bitmaps/hurd.xbm
 +++ xbill-2.1/bitmaps/hurd.xbm
 @@ -1,10 +1,11 @@

Added: packages/trunk/xbill/debian/patches/03_fix_ftbfs_binutils_gold.diff
===================================================================
--- packages/trunk/xbill/debian/patches/03_fix_ftbfs_binutils_gold.diff	                        (rev 0)
+++ packages/trunk/xbill/debian/patches/03_fix_ftbfs_binutils_gold.diff	2009-12-08 02:08:11 UTC (rev 10591)
@@ -0,0 +1,18 @@
+# Description: Fix FTBFS with binutils-gold
+# Author: Vincent Legout <vincent at legout.info>
+# Bug: http://bugs.debian.org/556690
+# Last-Update: 2009-12-08
+
+Index: xbill-2.1/Makefile.in
+===================================================================
+--- xbill-2.1.orig/Makefile.in	2009-11-24 15:40:49.000000000 +0800
++++ xbill-2.1/Makefile.in	2009-11-24 15:41:21.000000000 +0800
+@@ -21,7 +21,7 @@
+ VPATH = @srcdir@
+ 
+ ALL_CFLAGS =	$(CFLAGS) $(CPPFLAGS) -I$(srcdir)
+-ALL_LDFLAGS =	$(CFLAGS) $(LDFLAGS)
++ALL_LDFLAGS =	$(CFLAGS) $(LDFLAGS) -lXpm
+ IMAGE_DEFINES=-DIMAGES=\"${datadir}/xbill\"
+ SCORE_DEFINES=-DSCOREFILE=\"${localstatedir}/xbill.scores\"
+ 

Modified: packages/trunk/xbill/debian/patches/series
===================================================================
--- packages/trunk/xbill/debian/patches/series	2009-12-08 02:01:16 UTC (rev 10590)
+++ packages/trunk/xbill/debian/patches/series	2009-12-08 02:08:11 UTC (rev 10591)
@@ -1,3 +1,3 @@
 01_makefile_in.diff
 02_hurd_logos.diff
-
+03_fix_ftbfs_binutils_gold.diff

Modified: packages/trunk/xbill/debian/postrm
===================================================================
--- packages/trunk/xbill/debian/postrm	2009-12-08 02:01:16 UTC (rev 10590)
+++ packages/trunk/xbill/debian/postrm	2009-12-08 02:08:11 UTC (rev 10591)
@@ -4,7 +4,7 @@
 
 if [ "$1" = "purge" ]; then
   rm -f /var/games/xbill.scores
-  rmdir /var/lib/games/xbill /var/games/xbill 2>/dev/null || /bin/true 
+  rmdir /var/lib/games/xbill /var/games/xbill 2>/dev/null || true
 fi
 
 #DEBHELPER#

Modified: packages/trunk/xbill/debian/rules
===================================================================
--- packages/trunk/xbill/debian/rules	2009-12-08 02:01:16 UTC (rev 10590)
+++ packages/trunk/xbill/debian/rules	2009-12-08 02:08:11 UTC (rev 10591)
@@ -5,13 +5,11 @@
 # then edit /usr/lib/X11/config/Imake.rules and add the ; to line 2329:
 #     set +x; else (set -x; $(MKDIRHIER) $(DESTDIR)$$i); fi; \@@\
 
-include /usr/share/quilt/quilt.make
-
 export DH_VERBOSE=1
 DEB=debian/tmp
 SCORES=$(DEB)/var/games/xbill.scores.default
 
-build:	patch build-stamp
+build:	build-stamp
 
 build-stamp:
 	dh_testdir
@@ -22,7 +20,7 @@
 	$(MAKE) LOCAL_LDFLAGS=-s
 	touch build-stamp
 
-clean: unpatch
+clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp

Added: packages/trunk/xbill/debian/source/format
===================================================================
--- packages/trunk/xbill/debian/source/format	                        (rev 0)
+++ packages/trunk/xbill/debian/source/format	2009-12-08 02:08:11 UTC (rev 10591)
@@ -0,0 +1 @@
+3.0 (quilt)

More information about the Pkg-games-commits mailing list