[freecol] 80/125: Run existing patches through gbp pq import

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository freecol.

commit 1e75ff52db1c1896c2e61a58ffb0c0c124e137e3
Author: Markus Koschany <apo at debian.org>
Date:   Sat Dec 19 21:54:09 2015 +0100

    Run existing patches through gbp pq import
---
 debian/patches/10-fix-jar-path.diff | 20 ++++++++++++++------
 debian/patches/40-manpage.diff      | 18 +++++++++++++-----
 2 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/debian/patches/10-fix-jar-path.diff b/debian/patches/10-fix-jar-path.diff
old mode 100755
new mode 100644
index 501fe1f..fc0ac73
--- a/debian/patches/10-fix-jar-path.diff
+++ b/debian/patches/10-fix-jar-path.diff
@@ -1,3 +1,7 @@
+From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Date: Sat, 19 Dec 2015 21:53:50 +0100
+Subject: fix-jar-path
+
 #! /bin/sh /usr/share/dpatch/dpatch-run
 ## 10-fix-jar-path.dpatch by  <fourmond at debian.org>
 ##
@@ -6,11 +10,15 @@
 ## DP: packages 
 
 @DPATCH@
-Index: freecol-0.10.0+dfsg/build.xml
-===================================================================
---- freecol-0.10.0+dfsg.orig/build.xml	2011-06-25 17:12:29.000000000 +0200
-+++ freecol-0.10.0+dfsg/build.xml	2011-06-25 17:17:57.346240904 +0200
-@@ -105,9 +105,10 @@
+---
+ build.xml | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/build.xml b/build.xml
+index 9faad0b..8d11582 100644
+--- a/build.xml
++++ b/build.xml
+@@ -101,9 +101,10 @@
      <!-- Compiles the java source files. -->
      <target name="compile" depends="init">
          <mkdir dir="${freecol.build.dir}"/>
@@ -22,7 +30,7 @@ Index: freecol-0.10.0+dfsg/build.xml
              debug="on"
              optimize="on"
              deprecation="off"
-@@ -158,7 +159,7 @@
+@@ -173,7 +174,7 @@
  
      <!-- Compiles the source files and creates a JAR-file. -->
      <target name="package" depends="init,build,manifest" description="Compiles the source files and creates a JAR-file.">
diff --git a/debian/patches/40-manpage.diff b/debian/patches/40-manpage.diff
old mode 100755
new mode 100644
index 12b1c48..f20409e
--- a/debian/patches/40-manpage.diff
+++ b/debian/patches/40-manpage.diff
@@ -1,14 +1,22 @@
+From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Date: Sat, 19 Dec 2015 21:53:50 +0100
+Subject: manpage
+
 #! /bin/sh /usr/share/dpatch/dpatch-run
 ## 40-manpage.dpatch by  <fourmond at debian.org>
 ##
 ## DP: Small java-wrappers addition in the manual page
 
 @DPATCH@
-Index: freecol-0.10.5+dfsg/packaging/debian/freecol.6
-===================================================================
---- freecol-0.10.5+dfsg.orig/packaging/debian/freecol.6	2012-03-05 22:10:30.000000000 +0100
-+++ freecol-0.10.5+dfsg/packaging/debian/freecol.6	2012-03-05 23:36:51.633239995 +0100
-@@ -59,8 +59,25 @@
+---
+ packaging/debian/freecol.6 | 19 ++++++++++++++++++-
+ 1 file changed, 18 insertions(+), 1 deletion(-)
+
+diff --git a/packaging/debian/freecol.6 b/packaging/debian/freecol.6
+index 78075eb..3843923 100644
+--- a/packaging/debian/freecol.6
++++ b/packaging/debian/freecol.6
+@@ -59,8 +59,25 @@ Shows version of program.
  Starts a stand-alone server on the specified port.
  .SH LICENSE
  FreeCol is available under GPL license terms.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/freecol.git