[trigger-rally] 35/103: transition the new upstream naming: trigger-rally instead of trigger

Sun May 22 12:21:22 UTC 2016

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 290954c3c155ed52873ced6ca3ed3a67a9736a8e
Author: Gonéri Le Bouder <goneri at rulezlan.org>
Date:   Fri Jun 22 16:17:46 2007 +0000

    transition the new upstream naming: trigger-rally instead of trigger
---
 debian/changelog                                | 10 +++-------
 debian/control                                  | 16 ++++++++++++----
 debian/menu                                     |  6 +++---
 debian/rules                                    |  8 ++++----
 debian/{trigger.6.sgml => trigger-rally.6.sgml} |  0
 debian/{trigger_32.xpm => trigger-rally_32.xpm} |  0
 debian/{trigger_64.xpm => trigger-rally_64.xpm} |  0
 debian/trigger.desktop                          |  4 ++--
 8 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f6d29ce..b68201a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,8 @@
-trigger (0.5.2.1-1) UNRELEASED; urgency=low
-
-  ATTENTION: needs updated trigger-data (0.5.2-2) with new
-             datadirs uploaded together!
-  (^ delete this before uploading ^)
-
+trigger-rally (0.5.2.1-1) unstable; urgency=low
 
   [ Gonéri Le Bouder ]
   * data file are in /usr/share/games/trigger
+  * rename the package to trigger-data
 
   [ Stefan Potyra ]
   * New upstream version.
@@ -18,7 +14,7 @@ trigger (0.5.2.1-1) UNRELEASED; urgency=low
   * Update homepage in control-file to new sourceforge homepage.
   * Update watch file accordingly.
   * Run automake during building:
-    + Add build-depends on automake1.9 | automaken.
+    + Add build-depends on automake1.9.
     + Add rule to build configure script.
     + Also delete configure, Jamconfig.in during clean (which are not
       deleted by jam distclean).
diff --git a/debian/control b/debian/control
index dfca8dc..c6aba23 100644
--- a/debian/control
+++ b/debian/control
@@ -1,14 +1,15 @@
-Source: trigger
+Source: trigger-rally
 Section: games
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 5.0.0), jam, libopenal-dev, libalut-dev, libphysfs-dev, libsdl-image1.2-dev, docbook-to-man, cdbs, automake1.9 | automaken
+Build-Depends: debhelper (>= 5.0.0), jam, libopenal-dev, libalut-dev, libphysfs-dev, libsdl-image1.2-dev, docbook-to-man, cdbs, automake1.9
 Standards-Version: 3.7.2
 Uploaders: Stefan Potyra <sistpoty at ubuntu.com>, Gonéri Le Bouder <goneri at rulezlan.org>, Alexander Schmehl <tolimar at debian.org>
 
-Package: trigger
+Package: trigger-rally
 Architecture: any
-Depends: ${shlibs:Depends}, trigger-data (>= 0.5.2-2)
+Depends: ${shlibs:Depends}, trigger-rally-data (>= 0.5.2-2)
+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! 
  You race a sequence of 6 courses, with increasing levels of difficulty.
@@ -21,3 +22,10 @@ Description: free 3D rally racing car game
    * good OpenGL hardware accellerated video card (NVidia Geforce or better)
  . 
   Homepage: http://sourceforge.net/projects/trigger-rally
+
+Package: trigger
+Architecture: any
+Depends: trigger-rally
+Description: transitional dummy package for trigger-data
+ This is a transitional dummy package for trigger-rally, it can be safely
+ removed.
diff --git a/debian/menu b/debian/menu
index de7c1b8..4974db2 100644
--- a/debian/menu
+++ b/debian/menu
@@ -1,5 +1,5 @@
 ?package(trigger):needs="X11"\
   section="Games/Arcade"\
-  title="Trigger"\
-  command="/usr/games/trigger"\
-  icon="/usr/share/icons/hicolor/32x32/apps/trigger.xpm"
+  title="Trigger Rally"\
+  command="/usr/games/trigger-rally"\
+  icon="/usr/share/icons/hicolor/32x32/apps/trigger-rally.xpm"
diff --git a/debian/rules b/debian/rules
index 63fdafd..9ca4260 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,9 +12,9 @@ DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 # location of datafiles
-DATADIR=/usr/share/games/trigger
+DATADIR=/usr/share/games/trigger-rally
 # name of package
-PACKAGE=trigger
+PACKAGE=trigger-rally
 # what manpages to build?
 MANPAGES=debian/trigger.6
 
@@ -62,7 +62,7 @@ install: build $(MANPAGES)
 	dh_clean -k 
 	dh_installdirs
 	# yay, we do it by hand :)
-	cp trigger debian/$(PACKAGE)/usr/games
+	cp trigger debian/$(PACKAGE)/usr/games/trigger-rally
 	# icons
 	cp debian/trigger_32.xpm debian/$(PACKAGE)/usr/share/icons/hicolor/32x32/apps/trigger.xpm
 	cp debian/trigger_64.xpm debian/$(PACKAGE)/usr/share/icons/hicolor/64x64/apps/trigger.xpm
@@ -76,7 +76,7 @@ binary-arch: build install
 	dh_installchangelogs 
 	dh_installdocs
 	# manually install desktop file
-	cp debian/trigger.desktop debian/$(PACKAGE)/usr/share/applications/
+	cp debian/trigger.desktop debian/$(PACKAGE)/usr/share/applications/trigger-rally.desktop
 	dh_desktop
 	dh_installmenu
 	dh_installman $(MANPAGES)
diff --git a/debian/trigger.6.sgml b/debian/trigger-rally.6.sgml
similarity index 100%
rename from debian/trigger.6.sgml
rename to debian/trigger-rally.6.sgml
diff --git a/debian/trigger_32.xpm b/debian/trigger-rally_32.xpm
similarity index 100%
rename from debian/trigger_32.xpm
rename to debian/trigger-rally_32.xpm
diff --git a/debian/trigger_64.xpm b/debian/trigger-rally_64.xpm
similarity index 100%
rename from debian/trigger_64.xpm
rename to debian/trigger-rally_64.xpm
diff --git a/debian/trigger.desktop b/debian/trigger.desktop
index f8f10c1..b88c567 100644
--- a/debian/trigger.desktop
+++ b/debian/trigger.desktop
@@ -7,9 +7,9 @@ Comment=3D rally racing car game
 Comment[de_DE]=3D Rally-Autorennen
 Comment[fr_FR]=un jeu de rally en 3D
 Comment[ro_RO]=Un joc în 3D cu curse de raliu
-Exec=/usr/games/trigger
+Exec=/usr/games/trigger-rally
 Terminal=false
 StartupNotify=false
 Type=Application
-TryExec=/usr/games/trigger
+TryExec=/usr/games/trigger-rally
 Categories=3DGraphics;Game;ActionGame;

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

