r12283 - in packages/trunk/xbill/debian: . patches

[Paul Wise]

Author: pabs
Date: 2011-05-09 07:14:42 +0000 (Mon, 09 May 2011)
New Revision: 12283

Modified:
   packages/trunk/xbill/debian/changelog
   packages/trunk/xbill/debian/menu
   packages/trunk/xbill/debian/patches/01_makefile_in.diff
   packages/trunk/xbill/debian/patches/02_hurd_logos.diff
   packages/trunk/xbill/debian/patches/03_fix_ftbfs_binutils_gold.diff
   packages/trunk/xbill/debian/postinst
   packages/trunk/xbill/debian/postrm
   packages/trunk/xbill/debian/watch
Log:
Clean up extra whitespace, patch headers and other cruft

Modified: packages/trunk/xbill/debian/changelog
===================================================================
--- packages/trunk/xbill/debian/changelog	2011-05-09 07:10:36 UTC (rev 12282)
+++ packages/trunk/xbill/debian/changelog	2011-05-09 07:14:42 UTC (rev 12283)
@@ -14,6 +14,7 @@
 
   [ Paul Wise ]
   * Fix the homepage URLs
+  * Clean up extra whitespace, patch headers and other cruft
 
  -- Vincent Legout <vincent at legout.info>  Tue, 08 Dec 2009 10:03:17 +0800
 

Modified: packages/trunk/xbill/debian/menu
===================================================================
--- packages/trunk/xbill/debian/menu	2011-05-09 07:10:36 UTC (rev 12282)
+++ packages/trunk/xbill/debian/menu	2011-05-09 07:14:42 UTC (rev 12283)
@@ -1,2 +1,5 @@
-?package(xbill):command="/usr/games/xbill" icon="/usr/share/pixmaps/xbill.xpm" \
- needs="X11" section="Games/Action" title="XBill"
+?package(xbill):command="/usr/games/xbill" \
+ icon="/usr/share/pixmaps/xbill.xpm" \
+ needs="X11" \
+ section="Games/Action" \
+ title="XBill"

Modified: packages/trunk/xbill/debian/patches/01_makefile_in.diff
===================================================================
--- packages/trunk/xbill/debian/patches/01_makefile_in.diff	2011-05-09 07:10:36 UTC (rev 12282)
+++ packages/trunk/xbill/debian/patches/01_makefile_in.diff	2011-05-09 07:14:42 UTC (rev 12283)
@@ -1,8 +1,7 @@
-# Description: Fix up paths
-# Author: Barry deFreese <bddebian at comcast.net>
-
---- xbill-2.1.orig/Makefile.in
-+++ xbill-2.1/Makefile.in
+Description: Fix up paths
+Author: Barry deFreese <bddebian at comcast.net>
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -13,9 +13,9 @@
  prefix=@prefix@
  exec_prefix=@exec_prefix@

Modified: packages/trunk/xbill/debian/patches/02_hurd_logos.diff
===================================================================
--- packages/trunk/xbill/debian/patches/02_hurd_logos.diff	2011-05-09 07:10:36 UTC (rev 12282)
+++ packages/trunk/xbill/debian/patches/02_hurd_logos.diff	2011-05-09 07:14:42 UTC (rev 12283)
@@ -1,8 +1,7 @@
-# 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
+Description: Hurd logos for the game
+Author: Barry deFreese <bddebian at comcast.net>
+--- a/bitmaps/hurd.xbm
++++ b/bitmaps/hurd.xbm
 @@ -1,10 +1,11 @@
  #define hurd_width 28
  #define hurd_height 24
@@ -23,8 +22,8 @@
 +   0x30, 0xfe, 0xf8, 0x00, 0x30, 0xfe, 0x78, 0x00, 0x30, 0xc6, 0x3f, 0x00,
 +   0x60, 0xc6, 0x0f, 0x00, 0x60, 0xc6, 0x06, 0x00, 0xc0, 0xfe, 0x06, 0x00,
 +   0xc0, 0xff, 0x03, 0x00, 0x80, 0xff, 0x01, 0x00, 0x00, 0xfe, 0x00, 0x00 };
---- xbill-2.1.orig/pixmaps/hurd.xpm
-+++ xbill-2.1/pixmaps/hurd.xpm
+--- a/pixmaps/hurd.xpm
++++ b/pixmaps/hurd.xpm
 @@ -1,44 +1,176 @@
  /* XPM */
  static char * hurd_xpm[] = {

Modified: packages/trunk/xbill/debian/patches/03_fix_ftbfs_binutils_gold.diff
===================================================================
--- packages/trunk/xbill/debian/patches/03_fix_ftbfs_binutils_gold.diff	2011-05-09 07:10:36 UTC (rev 12282)
+++ packages/trunk/xbill/debian/patches/03_fix_ftbfs_binutils_gold.diff	2011-05-09 07:14:42 UTC (rev 12283)
@@ -1,12 +1,9 @@
-# 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
+Description: Fix FTBFS with binutils-gold
+Author: Vincent Legout <vincent at legout.info>
+Bug-Debian: http://bugs.debian.org/556690
+Last-Update: 2009-12-08
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -21,7 +21,7 @@
  VPATH = @srcdir@
  

Modified: packages/trunk/xbill/debian/postinst
===================================================================
--- packages/trunk/xbill/debian/postinst	2011-05-09 07:10:36 UTC (rev 12282)
+++ packages/trunk/xbill/debian/postinst	2011-05-09 07:14:42 UTC (rev 12283)
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-set -e 
+set -e
 
 OLD=/var/lib/games/xbill/scores
 OLD2=/var/lib/games/xbill.scores

Modified: packages/trunk/xbill/debian/postrm
===================================================================
--- packages/trunk/xbill/debian/postrm	2011-05-09 07:10:36 UTC (rev 12282)
+++ packages/trunk/xbill/debian/postrm	2011-05-09 07:14:42 UTC (rev 12283)
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-set -e 
+set -e
 
 if [ "$1" = "purge" ]; then
   rm -f /var/games/xbill.scores

Modified: packages/trunk/xbill/debian/watch
===================================================================
--- packages/trunk/xbill/debian/watch	2011-05-09 07:10:36 UTC (rev 12282)
+++ packages/trunk/xbill/debian/watch	2011-05-09 07:14:42 UTC (rev 12283)
@@ -1,3 +1,2 @@
 version=3
-
 http://www.xbill.org/download/xbill-([\d.]+)\.tar\.gz