r11609 - packages/trunk/rott/debian

[Fabian Greffrath]

Author: fabian-guest
Date: 2011-01-04 09:51:09 +0000 (Tue, 04 Jan 2011)
New Revision: 11609

Modified:
   packages/trunk/rott/debian/README.Debian
   packages/trunk/rott/debian/changelog
   packages/trunk/rott/debian/rott.links
   packages/trunk/rott/debian/rott.lintian-overrides
   packages/trunk/rott/debian/rott.postinst
   packages/trunk/rott/debian/rules
Log:
Forgot plain Commercial Version of the game.

Modified: packages/trunk/rott/debian/README.Debian
===================================================================
--- packages/trunk/rott/debian/README.Debian	2011-01-03 21:28:35 UTC (rev 11608)
+++ packages/trunk/rott/debian/README.Debian	2011-01-04 09:51:09 UTC (rev 11609)
@@ -1,12 +1,12 @@
 Rise of the Triad for Debian
 ----------------------------
 
- * The rott package in Debian supports all three variants of the game:
-   Shareware Version, CD Version and Site License CD Version. The corresponding
-   binaries are named 'rott-shareware', 'rott-superrott' and 'rott-sitelicense',
-   respectively. In order to select which variant is started by the 'rott'
-   command and the desktop and menu files, Debian's 'update-alternatives'
-   mechanism is used:
+ * The rott package in Debian supports all four variants of the game:
+   Shareware Version, Commercial Version, CD Version and Site License CD
+   Version. The corresponding binaries are named 'rott-shareware',
+   'rott-commercial', 'rott-superrott' and 'rott-sitelicense', respectively.
+   In order to select which variant is started by the 'rott' command and the
+   desktop and menu files, Debian's 'update-alternatives' mechanism is used:
    .
    $ update-alternatives --config rott
    .

Modified: packages/trunk/rott/debian/changelog
===================================================================
--- packages/trunk/rott/debian/changelog	2011-01-03 21:28:35 UTC (rev 11608)
+++ packages/trunk/rott/debian/changelog	2011-01-04 09:51:09 UTC (rev 11609)
@@ -2,8 +2,8 @@
 
   * Add Japanese po-debconf template translation,
     thanks Hideki Yamane <henrich at debian.org> (Closes: #599886).
-  * Build all three variants of the game: Shareware Version, CD Version and
-    Site License CD Version (LP: #511810).
+  * Build all four variants of the game: Shareware Version, Commercial Version,
+    CD Version and Site License CD Version (LP: #511810).
   * Handle variants via update-alternatives, document this in the manual page
     and in README-Debian, add symlinks for the manual pages.
   * Add lintian overrides for desktop-command-not-in-package

Modified: packages/trunk/rott/debian/rott.links
===================================================================
--- packages/trunk/rott/debian/rott.links	2011-01-03 21:28:35 UTC (rev 11608)
+++ packages/trunk/rott/debian/rott.links	2011-01-04 09:51:09 UTC (rev 11609)
@@ -1,3 +1,4 @@
 usr/share/man/man6/rott.6.gz usr/share/man/man6/rott-shareware.6.gz
+usr/share/man/man6/rott.6.gz usr/share/man/man6/rott-commercial.6.gz
 usr/share/man/man6/rott.6.gz usr/share/man/man6/rott-superrott.6.gz
 usr/share/man/man6/rott.6.gz usr/share/man/man6/rott-sitelicense.6.gz

Modified: packages/trunk/rott/debian/rott.lintian-overrides
===================================================================
--- packages/trunk/rott/debian/rott.lintian-overrides	2011-01-03 21:28:35 UTC (rev 11608)
+++ packages/trunk/rott/debian/rott.lintian-overrides	2011-01-04 09:51:09 UTC (rev 11609)
@@ -4,4 +4,4 @@
 rott: desktop-command-not-in-package
 rott: menu-command-not-in-package
 # False positive: This is not a license file
-W: rott: extra-license-file usr/games/rott-sitelicense
+rott: extra-license-file usr/games/rott-sitelicense

Modified: packages/trunk/rott/debian/rott.postinst
===================================================================
--- packages/trunk/rott/debian/rott.postinst	2011-01-03 21:28:35 UTC (rev 11608)
+++ packages/trunk/rott/debian/rott.postinst	2011-01-04 09:51:09 UTC (rev 11609)
@@ -6,6 +6,7 @@
 if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ]
 then
   update-alternatives --quiet --install /usr/games/rott rott /usr/games/rott-shareware   30
+  update-alternatives --quiet --install /usr/games/rott rott /usr/games/rott-commercial  20
   update-alternatives --quiet --install /usr/games/rott rott /usr/games/rott-superrott   20
   update-alternatives --quiet --install /usr/games/rott rott /usr/games/rott-sitelicense 20
 fi

Modified: packages/trunk/rott/debian/rules
===================================================================
--- packages/trunk/rott/debian/rules	2011-01-03 21:28:35 UTC (rev 11608)
+++ packages/trunk/rott/debian/rules	2011-01-04 09:51:09 UTC (rev 11609)
@@ -15,6 +15,14 @@
 	dh_auto_build
 	mv -fv rott/rott rott/rott-shareware
 	dh_auto_clean
+	# Commercial Version
+	sed -e "s/^\(#define SHAREWARE\).*/\1   0/" \
+	    -e "s/^\(#define SUPERROTT\).*/\1   0/" \
+	    -e "s/^\(#define SITELICENSE\).*/\1 0/" \
+	    -i rott/develop.h
+	dh_auto_build
+	mv -fv rott/rott rott/rott-commercial
+	dh_auto_clean
 	# CD Version
 	sed -e "s/^\(#define SHAREWARE\).*/\1   0/" \
 	    -e "s/^\(#define SUPERROTT\).*/\1   1/" \