[rott] 05/05: Upstream switched build system to Autotools

Fabian Greffrath fabian-guest at moszumanska.debian.org
Thu Apr 30 15:03:00 UTC 2015


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

fabian-guest pushed a commit to branch master
in repository rott.

commit df58924037c9e5424c02e5e2abf62e1b3780a929
Author: Fabian Greffrath <fabian+debian at greffrath.com>
Date:   Thu Apr 30 16:58:59 2015 +0200

    Upstream switched build system to Autotools
---
 debian/changelog    | 11 +++++++++++
 debian/control      |  1 +
 debian/rott.install |  3 ++-
 debian/rules        | 25 +++++++++++++++++++------
 4 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3bfd400..a5bf061 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+rott (1.1.2+svn287-1) UNRELEASED; urgency=medium
+
+  * New upstream SVN snapshot.
+  * Add debian/README.source file to document how the Debian source
+    tarball was created.
+  * Remove all patches that were applied upstream.
+  * Upstream switched build system to Autotools.
+    + Add Build-Depends: dh-autoreconf and adapt debian/rules accordingly.
+
+ -- Fabian Greffrath <fabian+debian at greffrath.com>  Thu, 30 Apr 2015 16:26:04 +0200
+
 rott (1.1.2-3) unstable; urgency=medium
 
   * Make the "commercial" variant recognize all supported
diff --git a/debian/control b/debian/control
index 8c9bac2..247b124 100644
--- a/debian/control
+++ b/debian/control
@@ -8,6 +8,7 @@ Uploaders:
  Jon Dowland <jmtd at debian.org>
 Build-Depends:
  debhelper (>= 9),
+ dh-autoreconf,
  libsdl-mixer1.2-dev,
  libsdl1.2-dev
 Standards-Version: 3.9.5
diff --git a/debian/rott.install b/debian/rott.install
index 9d59fcd..3953ae8 100644
--- a/debian/rott.install
+++ b/debian/rott.install
@@ -2,4 +2,5 @@
 ../debian/rott.svg	/usr/share/icons/hicolor/scalable/apps/
 ../debian/rott.xpm	/usr/share/pixmaps/
 ../misc/rott.desktop	/usr/share/applications/
-rott-*	/usr/games/
+rott-shareware	/usr/games/
+rott-commercial	/usr/games/
diff --git a/debian/rules b/debian/rules
index eeb4df1..4239fd6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,5 @@
 #!/usr/bin/make -f
 
-DEB_CFLAGS_MAINT_APPEND += -DDATADIR=\"/usr/share/games/rott/\"
 DEB_CFLAGS_MAINT_APPEND += -Wno-pointer-sign -Wno-unused
 export DEB_CFLAGS_MAINT_APPEND
 
@@ -11,12 +10,26 @@ debian/rott.png: debian/rott.svg
 	inkscape --export-png=$@ $^
 
 %:
-	dh $@ --sourcedir=rott
+	dh $@ --with autoreconf
+
+override_dh_auto_configure:
+	# Both flavors are configured and built in the dh_auto_build target.
 
 override_dh_auto_build:
 	# Shareware Version
-	$(MAKE) -C rott tidy
-	dh_auto_build -O--parallel -- ROTT=rott-shareware  SHAREWARE=1
+	dh_auto_configure -- \
+		--enable-datadir="/usr/share/games/rott/" \
+		--enable-suffix="shareware" \
+		--enable-shareware
+	dh_auto_build -O--parallel
+
 	# Commercial Version
-	$(MAKE) -C rott tidy
-	dh_auto_build -O--parallel -- ROTT=rott-commercial SHAREWARE=0
+	dh_auto_configure -- \
+		--enable-datadir="/usr/share/games/rott/" \
+		--enable-suffix="commercial"
+	dh_auto_build -O--parallel
+
+override_dh_auto_install:
+
+override_dh_install:
+	dh_install --sourcedir=rott

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



More information about the Pkg-games-commits mailing list