This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository simutrans.
commit 1bff4892e00bcfcaf97460eaed1092680989b492 Author: Markus Koschany <[email protected]> Date: Sun Nov 8 17:35:53 2015 +0100 Commit changes from mentors --- debian/changelog | 4 ++-- debian/control | 3 +-- debian/rules | 4 +++- debian/source/local-options | 2 -- debian/watch | 5 +++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index 74bb60b..af9f93d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,7 +13,7 @@ simutrans (120.0.1+repack-1) unstable; urgency=medium * debian/rules: - Remove override_dh_builddeb because compression xz is now standard. - Remove obsolete nettools and skin. - - Add dh_quilt_patch to d/rules override_dh_auto_clean to make it + - Add dh_quilt_patch to d/rules override_dh_auto_clean to make it ready for sbuild. * debian/copyright: - Add myself to debian/* @@ -26,7 +26,7 @@ simutrans (120.0.1+repack-1) unstable; urgency=medium - New debian/repack.sh. - debian/watch: add parameter "debian debian/repack.sh". - debian/rules: remove get-orig-source. - - Rewrite debian/README.souce. + - Rewrite debian/README.source. * New d/p/0510-missing_uncommon_mk.patch to include missing uncommon.mk. -- Jörg Frings-Fürst <[email protected]> Sat, 16 May 2015 21:49:56 +0200 diff --git a/debian/control b/debian/control index fc30f82..a48166a 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,6 @@ Section: games Priority: extra Maintainer: Debian Games Team <[email protected]> Uploaders: - Ansgar Burchardt <[email protected]>, Clint Adams <[email protected]>, Jörg Frings-Fürst <[email protected]> Build-Depends: @@ -50,7 +49,7 @@ Description: transportation simulator (base data) Package: simutrans-makeobj Architecture: any Multi-Arch: foreign -Depends: +Depends: ${shlibs:Depends}, ${misc:Depends} Pre-Depends: dpkg (>= 1.15.6) diff --git a/debian/rules b/debian/rules index 2a67f13..0ef598c 100755 --- a/debian/rules +++ b/debian/rules @@ -24,7 +24,6 @@ override_dh_auto_build: convert simutrans.ico -alpha on debian/simutrans.xpm override_dh_auto_clean: - dh_quilt_patch dh_auto_clean $(MAKE) -C makeobj clean $(RM) -r skin @@ -49,3 +48,6 @@ update-translations: wget -N http://simutrans-germany.com/translator/data/tab/language_pack-Base+texts.zip unzip -o -d debian/translations language_pack-Base+texts.zip "*.tab" $(RM) language_pack-Base+texts.zip + +get-orig-source: + uscan --verbose --download-current-version --force-download diff --git a/debian/source/local-options b/debian/source/local-options deleted file mode 100644 index c4cf480..0000000 --- a/debian/source/local-options +++ /dev/null @@ -1,2 +0,0 @@ -abort-on-upstream-changes -unapply-patches diff --git a/debian/watch b/debian/watch index 0158740..e3b00db 100644 --- a/debian/watch +++ b/debian/watch @@ -1,4 +1,5 @@ version=3 -opts="uversionmangle=s/-/./g,dversionmangle=s/[~+]ds\d+$//" \ - http://sf.net/simutrans/simutrans-src-(.*)\.zip debian debian/repack.sh +opts=uversionmangle=s/-/./g,\ +dversionmangle=s/(\da?)[\+\.\-~](?:dfsg|debian|ds|repack|repacked)\.?\d*$/$1/ \ +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 _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
