[SCM] Packaging Xwelltris branch, master, updated. debian/1.0.1-13-6-gbe4200f
Christoph Egger
Christoph.Egger at gmx.de
Wed Aug 5 15:01:40 UTC 2009
The following commit has been merged in the master branch:
commit be4200f07e80877308fac2070a458452103dbe6e
Author: Christoph Egger <Christoph.Egger at gmx.de>
Date: Wed Aug 5 11:28:08 2009 +0200
Merge changelogs of -14 and -15, -14 has never hit the archive
Clean up
diff --git a/debian/changelog b/debian/changelog
index 4b7a21e..38efe73 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,13 @@
xwelltris (1.0.1-14) unstable; urgency=low
+ * Bump standarts version to 3.8.2 (no changes)
* Set Maintainer to Debian Games Team, myself to Uploaders
* Change my mailaddress
* Add VCS-* Fields
* Switch to TopGit for patch management
- * Bump standards Version to 3.8.1
* rules cleanup using dh7
- -- Christoph Egger <debian at christoph-egger.org> Tue, 20 Jan 2009 18:03:40 +0100
+ -- Christoph Egger <debian at christoph-egger.org> Wed, 05 Aug 2009 11:15:14 +0200
xwelltris (1.0.1-13) unstable; urgency=low
diff --git a/debian/clean b/debian/clean
index 4d7e16a..bd63291 100644
--- a/debian/clean
+++ b/debian/clean
@@ -5,4 +5,8 @@ Makefile
src/image/makefile
src/Make.common
src/make.conf
-src/makefile
\ No newline at end of file
+src/makefile
+config.guess
+src/include/globals.h
+config.status
+config.sub
diff --git a/debian/control b/debian/control
index 38f1924..fffeef9 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
Uploaders: Christoph Egger <debian at christoph-egger.org>
Build-Depends: debhelper (>= 7), quilt (>= 0.40), autotools-dev, libsdl-image1.2-dev
-Standards-Version: 3.8.1
+Standards-Version: 3.8.2
Vcs-Git: git://git.debian.org/git/pkg-games/xwelltris.git/
Vcs-Browser: http://git.debian.org/?p=pkg-games/xwelltris.git
Homepage: http://xnc.jinr.ru/xwelltris/
diff --git a/debian/rules b/debian/rules
index 61ead61..dec9b82 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,31 +7,21 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
%:
- dh $@
+ dh --with quilt $@
-SAVERESTORE := config.guess config.sub config.status src/include/globals.h
-
-clean: unpatch
- for f in $(SAVERESTORE) ; do [ -f $$f.d-r-orig ] || [ ! -f $$f ] || cp -p $$f $$f.d-r-orig ; done
-
- dh clean
-
- for f in $(SAVERESTORE) ; do [ ! -f $$f.d-r-orig ] || mv $$f.d-r-orig $$f ; done
-
-override_dh_auto_configure: $(QUILT_STAMPFN)
- for f in $(SAVERESTORE) ; do [ -f $$f.d-r-orig ] || cp -p $$f $$f.d-r-orig ; done
- ln -sf /usr/share/misc/config.sub .
- ln -sf /usr/share/misc/config.guess .
+override_dh_auto_configure:
+ cp -f /usr/share/misc/config.sub .
+ cp -f /usr/share/misc/config.guess .
CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --bindir=/usr/games --datadir=/usr/share/games --with-sdl
override_dh_auto_install:
# Installing package
$(MAKE) INSTDIR=$(CURDIR)/debian/xwelltris/usr/games INSTLIB=$(CURDIR)/debian/xwelltris/usr/share/games/xwelltris install
- dh_install debian/xwelltris.desktop /usr/share/applications
- dh_install debian/xwelltris.xpm /usr/share/pixmaps
# Move scores file to /var/games
mv debian/xwelltris/usr/share/games/xwelltris/welltris.scores debian/xwelltris/usr/share/games/xwelltris/welltris.scores.blank
- ln -s ../../../../var/games/xwelltris/welltris.scores debian/xwelltris/usr/share/games/xwelltris/welltris.scores
+
+checkout-from-git:
+ git checkout config.sub config.status config.guess src/include/globals.h
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
index af87b5d..28afbb4 100644
--- a/debian/source.lintian-overrides
+++ b/debian/source.lintian-overrides
@@ -1 +1,3 @@
+# cleaned up in clean target. Chance that this will ever be done upstream
+# is marginal <- upstream dead
xwelltris source: configure-generated-file-in-source config.status
--
Packaging Xwelltris
More information about the Pkg-games-commits
mailing list