[SCM] xboard PKG branch, experimental, updated. debian/4.6.git20110507-1-12-gcbfcaae

Sat Jun 18 21:37:27 UTC 2011

The following commit has been merged in the experimental branch:
commit 111f10816347d026c63f8ae9f03a5a37acb86661
Author: Vincent Legout <vincent at legout.info>
Date:   Sat Jun 18 22:33:19 2011 +0200

    New upstream development release

diff --git a/debian/changelog b/debian/changelog
index c978d41..3d99e5f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xboard (4.6~git20110618-1) UNRELEASED; urgency=low
+
+  * New upstream development release:
+    - Update patches
+
+ -- Vincent Legout <vincent at legout.info>  Sat, 18 Jun 2011 22:03:44 +0200
+
 xboard (4.6~git20110507-1) experimental; urgency=low
 
   * New upstream development release (Closes: #507314)
diff --git a/debian/patches/01_note_about_missing_fonts.patch b/debian/patches/01_note_about_missing_fonts.patch
index 2451a57..aeed4e2 100644
--- a/debian/patches/01_note_about_missing_fonts.patch
+++ b/debian/patches/01_note_about_missing_fonts.patch
@@ -5,9 +5,9 @@ Bug-Debian: http://bugs.debian.org/562726
 
 Index: xboard/xboard.c
 ===================================================================
---- xboard.orig/xboard.c	2011-05-14 08:17:56.719876865 +0200
-+++ xboard/xboard.c	2011-05-14 08:18:09.340393942 +0200
-@@ -3115,6 +3115,8 @@
+--- xboard.orig/xboard.c	2011-06-18 22:04:04.325278621 +0200
++++ xboard/xboard.c	2011-06-18 22:04:23.693279105 +0200
+@@ -3232,6 +3232,8 @@
      if (nfonts < 1) {
  	fprintf(stderr, _("%s: no fonts match pattern %s\n"),
  		programName, pattern);
@@ -15,4 +15,4 @@ Index: xboard/xboard.c
 +    fprintf(stderr, "See http://bugs.debian.org/504077 and http://bugs.debian.org/562726 for more information.\n");
  	exit(2);
      }
- #endif
+ 
diff --git a/debian/patches/07_call_x-terminal-emulator_instead_of_xterm.dpatch b/debian/patches/07_call_x-terminal-emulator_instead_of_xterm.dpatch
index 95deb23..bab5ae9 100644
--- a/debian/patches/07_call_x-terminal-emulator_instead_of_xterm.dpatch
+++ b/debian/patches/07_call_x-terminal-emulator_instead_of_xterm.dpatch
@@ -4,9 +4,9 @@ Author: Florian Ernst <florian at debian.org>
 @DPATCH@
 Index: xboard/xboard.c
 ===================================================================
---- xboard.orig/xboard.c	2011-05-14 08:15:55.230890987 +0200
-+++ xboard/xboard.c	2011-05-14 08:17:56.719876865 +0200
-@@ -6642,7 +6642,7 @@
+--- xboard.orig/xboard.c	2011-06-18 22:03:30.761277679 +0200
++++ xboard/xboard.c	2011-06-18 22:04:04.325278621 +0200
+@@ -6753,7 +6753,7 @@
       Cardinal *nprms;
  {
      char buf[MSG_SIZ];
@@ -15,7 +15,7 @@ Index: xboard/xboard.c
  	    INFODIR, INFOFILE);
      system(buf);
  }
-@@ -6659,7 +6659,7 @@
+@@ -6770,7 +6770,7 @@
        name = prms[0];
      else
        name = "xboard";
diff --git a/debian/patches/11_fix_manpages_warnings.dpatch b/debian/patches/11_fix_manpages_warnings.dpatch
index 0fd76ac..6cb4728 100644
--- a/debian/patches/11_fix_manpages_warnings.dpatch
+++ b/debian/patches/11_fix_manpages_warnings.dpatch
@@ -4,8 +4,8 @@ Author: Alexander L. Belikoff <alexander at belikoff.net>
 @DPATCH@
 Index: xboard/xboard.man
 ===================================================================
---- xboard.orig/xboard.man	2011-05-14 08:15:55.230890987 +0200
-+++ xboard/xboard.man	2011-05-14 08:18:01.476071752 +0200
+--- xboard.orig/xboard.man	2011-06-18 22:29:17.121320245 +0200
++++ xboard/xboard.man	2011-06-18 22:31:08.189323303 +0200
 @@ -147,7 +147,7 @@
  in chess variants which use randomized opening positions (e.g. Chess960).
  The selected opening position will persistently be chosen on any following
@@ -221,7 +221,7 @@ Index: xboard/xboard.man
  Time delay between moves during `Load Game' or `Analyze File'. 
 -Fractional seconds are allowed; try `-td 0.4'. 
 -A time delay value of -1 tells
-+Fractional seconds are allowed; try `\-td 0.4'. 
++Fractional seconds are allowed; try `\-td 0.4'.
 +A time delay value of \-1 tells
  XBoard not to step through game files automatically. Default: 1 second.
  .TP
@@ -278,30 +278,7 @@ Index: xboard/xboard.man
  accepted as abbreviations for this option.
  .TP
  .B -exit/-xexit or -popupExitMessage true/false
-@@ -2456,27 +2456,27 @@
- The font used for the clocks. If the option value is a pattern
- that does not specify the font size, XBoard tries to choose an
- appropriate font for the board size being used.
--Default: -*-helvetica-bold-r-normal--*-*-*-*-*-*-*-*.
-+Default: \-*-helvetica-bold-r-normal--*-*-*-*-*-*-*-*.
- .TP
- .B -coordFont font
- The font used for rank and file coordinate labels if `showCoords'
- is true. If the option value is a pattern that does not specify
- the font size, XBoard tries to choose an appropriate font for
- the board size being used.
--Default: -*-helvetica-bold-r-normal--*-*-*-*-*-*-*-*.
-+Default: \-*-helvetica-bold-r-normal--*-*-*-*-*-*-*-*.
- .TP
- .B -font font
- The font used for popup dialogs, menus, comments, etc.
- If the option value is a pattern that does not specify
- the font size, XBoard tries to choose an appropriate font for
- the board size being used.
--Default: -*-helvetica-medium-r-normal--*-*-*-*-*-*-*-*.
-+Default: \-*-helvetica-medium-r-normal--*-*-*-*-*-*-*-*.
- .TP
- .B -fontSizeTolerance tol
+@@ -2476,7 +2476,7 @@
  In the font selection algorithm, a nonscalable font will be preferred
  over a scalable font if the nonscalable font's size differs
  by `tol' pixels
diff --git a/debian/rules b/debian/rules
index 9628c44..6b6cda0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,7 @@ override_dh_auto_install:
 	dh_auto_install
 	$(RM) debian/xboard/usr/share/info/dir
 
-version=20110507
+version=20110618
 
 get-orig-source:
 	wget ftp://alpha.gnu.org/gnu/xboard/xboard-master-$(version).tar.gz

-- 
xboard PKG

