[simutrans] 03/03: build system work

[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 b27b469cc6d23ce46466d16437eacf2a54c19608
Author: Jörg Frings-Fürst <debian at jff-webhosting.net>
Date:   Tue Oct 6 15:14:14 2015 +0200

    build system work
---
 debian/changelog |  4 +++-
 debian/control   |  2 +-
 debian/rules     | 11 +++--------
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 30fd8f8..74bb60b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ 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 
+      ready for sbuild.
   * debian/copyright:
     - Add myself to debian/*
     - Remove obsolete utils/dr_rdgif.c.
@@ -25,7 +27,7 @@ simutrans (120.0.1+repack-1) unstable; urgency=medium
     - debian/watch: add parameter "debian debian/repack.sh".
     - debian/rules: remove get-orig-source.
     - Rewrite debian/README.souce.
-  * Refresh debian/patches/*.
+  * New d/p/0510-missing_uncommon_mk.patch to include missing uncommon.mk.
 
  -- Jörg Frings-Fürst <debian at jff-webhosting.net>  Sat, 16 May 2015 21:49:56 +0200
 
diff --git a/debian/control b/debian/control
index a8afef5..fc30f82 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends:
  dpkg (>= 1.15.7),
  imagemagick,
  libbz2-dev,
- libpng-dev,
+ libpng12-dev,
  libsdl1.2-dev,
  libsdl-mixer1.2-dev,
  libssl-dev,
diff --git a/debian/rules b/debian/rules
index c9044fd..2a67f13 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
-export VERBOSE  = 1
+#export VERBOSE  = 1
 
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
@@ -13,25 +13,20 @@ export CCFLAGS  = $(CFLAGS)
 export CXXFLAGS = $(shell dpkg-buildflags --get CXXFLAGS)
 export CXXFLAGS += -D_FORTIFY_SOURCE=2
 export CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS)
-export CPPFLAGS += " -D_FORTIFY_SOURCE=2 "
 export LDFLAGS  = $(shell dpkg-buildflags --get LDFLAGS)
 
 %:
 	dh $@ --parallel
 
-override_dh_auto_configure:
-	chmod a+x configure.sh
-#	./configure.sh
-	dh_auto_configure
-
 override_dh_auto_build:
 	dh_auto_build
 	$(MAKE) -C makeobj
 	convert simutrans.ico -alpha on debian/simutrans.xpm
 
 override_dh_auto_clean:
+	dh_quilt_patch
 	dh_auto_clean
-#	$(MAKE) -C makeobj clean
+	$(MAKE) -C makeobj clean
 	$(RM) -r skin
 	$(RM) -r build
 

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