[hedgewars] 01/01: Some tweak, preparing for new release

[Gianfranco Costamagna]

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

locutusofborg-guest pushed a commit to branch master
in repository hedgewars.

commit a250475fefa09ba3d5da7d2610358a373f90a1bb
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Sat Jan 4 18:32:50 2014 +0100

    Some tweak, preparing for new release
---
 debian/changelog                              |  8 ++++++++
 debian/patches/removed-fPIC-fpc-support.patch | 14 --------------
 debian/patches/series                         |  1 -
 debian/rules                                  | 13 +++++--------
 4 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 69b66c9..a3d4b6c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+hedgewars (0.9.20.3-3) UNRELEASED; urgency=low
+
+  * Disabled again fPIC patch, waiting for a new
+    upstream tarball
+  * Simplified debian/rules, by removing override_dh_install
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Sat, 04 Jan 2014 17:53:27 +0100
+
 hedgewars (0.9.20.3-2) experimental; urgency=low
 
   * Removed fPIC support on fpc, fixing build failures
diff --git a/debian/patches/removed-fPIC-fpc-support.patch b/debian/patches/removed-fPIC-fpc-support.patch
deleted file mode 100644
index e17a217..0000000
--- a/debian/patches/removed-fPIC-fpc-support.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
-
----
-Last-Update: <2014-01-03>
-
---- hedgewars-0.9.20.3.orig/cmake_modules/platform.cmake
-+++ hedgewars-0.9.20.3/cmake_modules/platform.cmake
-@@ -106,5 +106,5 @@ endif(WIN32)
- if(UNIX)
-     add_flag_append(CMAKE_C_FLAGS "-fPIC")
-     add_flag_append(CMAKE_CXX_FLAGS "-fPIC")
--    add_flag_append(CMAKE_Pascal_FLAGS "-fPIC")
-+#    add_flag_append(CMAKE_Pascal_FLAGS "-fPIC")
- endif(UNIX)
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 9aed95c..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-removed-fPIC-fpc-support.patch
diff --git a/debian/rules b/debian/rules
index 3d15293..51bb176 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,13 +4,6 @@
 	dh $@
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DCMAKE_INSTALL_PREFIX=/usr/lib/hedgewars -DDATA_INSTALL_DIR=/usr/share/games/hedgewars
-
-override_dh_clean:
-	rm -rf tmp-icon
-	dh_clean
-
-override_dh_install:
 	for icon in `find debian/hicolor-icons -type f`; do \
 		dirname=`dirname $$icon`; \
 		dirname=`basename $$dirname`; \
@@ -18,4 +11,8 @@ override_dh_install:
 		mkdir -p tmp-icon/$$dirname/apps; \
 		convert $$icon tmp-icon/$$dirname/apps/$$basename.png; \
 	done
-	dh_install
+	dh_auto_configure -- -DCMAKE_INSTALL_PREFIX=/usr/lib/hedgewars -DDATA_INSTALL_DIR=/usr/share/games/hedgewars
+
+override_dh_clean:
+	rm -rf tmp-icon
+	dh_clean

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/hedgewars.git