[simutrans] 01/02: commit local changes before merge

[Jörg Frings-Fürst]

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

jff-guest pushed a commit to branch master
in repository simutrans.

commit 3158e85eac1469dac3058e56a02a5bbfea5cf5ec
Author: Jörg Frings-Fürst <debian at jff-webhosting.net>
Date:   Mon Nov 9 14:58:36 2015 +0100

    commit local changes before merge
---
 .pc/.quilt_patches | 1 -
 .pc/.quilt_series  | 1 -
 .pc/.version       | 1 -
 debian/control     | 1 +
 debian/watch       | 3 ++-
 5 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.pc/.quilt_patches b/.pc/.quilt_patches
deleted file mode 100644
index 6857a8d..0000000
--- a/.pc/.quilt_patches
+++ /dev/null
@@ -1 +0,0 @@
-debian/patches
diff --git a/.pc/.quilt_series b/.pc/.quilt_series
deleted file mode 100644
index c206706..0000000
--- a/.pc/.quilt_series
+++ /dev/null
@@ -1 +0,0 @@
-series
diff --git a/.pc/.version b/.pc/.version
deleted file mode 100644
index 0cfbf08..0000000
--- a/.pc/.version
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/debian/control b/debian/control
index fc30f82..da829de 100644
--- a/debian/control
+++ b/debian/control
@@ -15,6 +15,7 @@ Build-Depends:
  libsdl1.2-dev,
  libsdl-mixer1.2-dev,
  libssl-dev,
+ quilt,
  zlib1g-dev
 Standards-Version: 3.9.6
 Homepage: http://www.simutrans.com/
diff --git a/debian/watch b/debian/watch
index 0158740..1c11871 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,5 @@
 version=3
-opts="uversionmangle=s/-/./g,dversionmangle=s/[~+]ds\d+$//" \
+#opts=dversionmangle=s/\+repack(.*)// \
+opts="uversionmangle=s/-/./g,dversionmangle=s/[~+]ds\d+$//,dversionmangle=s/\+repack(.*)//" \
     http://sf.net/simutrans/simutrans-src-(.*)\.zip debian debian/repack.sh
 

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