[simutrans] 02/03: some work on buildsystem

[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 054bbc82740e72802c65a1cfaa44150314402d83
Author: Jörg Frings-Fürst <debian at jff-webhosting.net>
Date:   Tue Oct 6 05:31:34 2015 +0200

    some work on buildsystem
---
 debian/changelog      |  6 ++++--
 debian/patches/series |  1 +
 debian/rules          | 12 ++++++++++--
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 94db1e0..30fd8f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
 simutrans (120.0.1+repack-1) unstable; urgency=medium
 
-  [Jörg Frings-Fürst]
+  [ Jörg Frings-Fürst ]
   * New upstream release (Closes: #708837).
+  * Upload to unstable.
   * debian/control:
     - Add myself as new uploader (Closes: #783887).
     - Bump Standards-Version to 3.9.6 (No changes required).
@@ -21,9 +22,10 @@ simutrans (120.0.1+repack-1) unstable; urgency=medium
   * Refresh debian/patches/*.
   * Rewrite source handling:
     - New debian/repack.sh.
-    - debian/watch: add parmeter "debian debian/repack.sh".
+    - debian/watch: add parameter "debian debian/repack.sh".
     - debian/rules: remove get-orig-source.
     - Rewrite debian/README.souce.
+  * Refresh debian/patches/*.
 
  -- Jörg Frings-Fürst <debian at jff-webhosting.net>  Sat, 16 May 2015 21:49:56 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index c3d4641..2ff1211 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 0500-config.diff
 0505-link-less-libraries.diff
 0110-sha1-replacement.diff
+0510-missing_uncommon_mk.patch
diff --git a/debian/rules b/debian/rules
index b1bd58e..c9044fd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,18 +4,26 @@
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
-#export VERBOSE  = 1
+export VERBOSE  = 1
 
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+
 export CFLAGS   = $(shell dpkg-buildflags --get CFLAGS)
 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
@@ -23,7 +31,7 @@ override_dh_auto_build:
 
 override_dh_auto_clean:
 	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