[trigger-rally] 88/103: Fix 727989. Fix *-arch, update to 3.9.5

[Bertrand Marc]

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

bbk-guest pushed a commit to branch master
in repository trigger-rally.

commit 7237cb6db7608df99497e30a834264f01f1f8eb3
Author: Stefan Potyra <sistpoty at ubuntu.com>
Date:   Thu Jan 23 21:22:55 2014 +0000

    Fix 727989. Fix *-arch, update to 3.9.5
---
 debian/changelog                  | 11 ++++++++++-
 debian/control                    |  4 +---
 debian/patches/30_autotools.patch | 31 +++++++++++++++++++++++++++++++
 debian/patches/series             |  1 +
 debian/rules                      |  6 ++++--
 5 files changed, 47 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f2ed256..4b4daba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,15 @@
 trigger-rally (0.6.0-2) UNRELEASED; urgency=low
 
   [ Stefan Potyra ]
-  * Document changes here...
+  * debian/rules:
+    + Fix the binary-indep/build-indep rules: No package to build.
+  * debian/control:
+    + drop DM-Upload-Allowed field (obsolete).
+    + drop Conflicts against trigger (upgrades from oldstable not supported).
+    + Bump Standards-Version to 3.9.5, since all required changes
+      have been done.
+  * debian/patches/30_autotools.patch:
+    Refresh config.sub/config.guess if present (Closes: #727989).
 
   [ Evgeni Golov ]
   * Correct Vcs-* URLs to point to anonscm.debian.org
@@ -9,6 +17,7 @@ trigger-rally (0.6.0-2) UNRELEASED; urgency=low
   [ Alexander Reichle-Schmehl ]
   * Removed myself from uploaders.
 
+
  -- Stefan Potyra <sistpoty at ubuntu.com>  Fri, 25 Nov 2011 22:38:47 +0100
 
 trigger-rally (0.6.0-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 9f87b66..d2c514c 100644
--- a/debian/control
+++ b/debian/control
@@ -12,10 +12,9 @@ Build-Depends: debhelper (>= 5.0.0),
  automake (>= 1.9),
  libglew1.5-dev,
  libtinyxml-dev
-Standards-Version: 3.9.2
+Standards-Version: 3.9.5
 Uploaders: Stefan Potyra <sistpoty at ubuntu.com>, 
  Barry deFreese <bdefreese at debian.org>
-DM-Upload-Allowed: yes
 Homepage: http://sourceforge.net/projects/trigger-rally
 Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/trigger/
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/trigger/
@@ -23,7 +22,6 @@ Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/trigger/
 Package: trigger-rally
 Architecture: any
 Depends: ${shlibs:Depends}, trigger-rally-data (>= 0.6.0-1), ${misc:Depends}
-Conflicts: trigger (<< 0.5.2.1)
 Description: free 3D rally racing car game
  Trigger is a free 3D rally car racing game. Fun for all the family!
  .
diff --git a/debian/patches/30_autotools.patch b/debian/patches/30_autotools.patch
new file mode 100644
index 0000000..47f792b
--- /dev/null
+++ b/debian/patches/30_autotools.patch
@@ -0,0 +1,31 @@
+Description: Update autotools files not update by autogen.sh
+ This patch updates the autotools files (config.sub/config.guess)
+ shipped in mk/autoconf.
+ .
+ Author: Stefan Potyra <sistpoty at ubuntu.com>
+
+Index: trigger-rally-0.6.0/autogen.sh
+===================================================================
+--- trigger-rally-0.6.0.orig/autogen.sh	2014-01-23 21:48:28.000000000 +0100
++++ trigger-rally-0.6.0/autogen.sh	2014-01-23 21:52:30.675851846 +0100
+@@ -24,3 +24,20 @@
+ autoheader
+ 
+ autoconf
++
++# copy file $1 to directory $2
++copy_file() {
++  if [ ! -r "$1" ]; then
++    echo "$1 not readable/presenkt."
++  else
++    if [ ! -d "$2" ]; then
++      echo "$2: no directory."
++    else
++      echo "$1 --> $2"
++      cp "$1" "$2"
++    fi
++  fi
++}
++
++copy_file /usr/share/misc/config.sub mk/autoconf
++copy_file /usr/share/misc/config.guess mk/autoconf
diff --git a/debian/patches/series b/debian/patches/series
index b1fbcc5..f89ea7d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 10_system_glew.patch
 20_system_tinyxml.patch
+30_autotools.patch
diff --git a/debian/rules b/debian/rules
index 74aed24..05693f3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -79,7 +79,8 @@ install: build $(MANPAGES)
 	cp debian/trigger-rally_32.xpm debian/$(PACKAGE)/usr/share/icons/hicolor/32x32/apps/trigger-rally.xpm
 	cp debian/trigger-rally_64.xpm debian/$(PACKAGE)/usr/share/icons/hicolor/64x64/apps/trigger-rally.xpm
 
-binary-indep: build install
+# no indep package
+binary-indep:
 
 binary-arch: build install
 	dh_testdir
@@ -101,7 +102,8 @@ binary-arch: build install
 	dh_builddeb
 
 build-arch: build-stamp
-build-indep: build-stamp
+# no indep package
+build-indep:
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install build-arch \

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