r11663 - packages/trunk/rott/debian

Sun Jan 16 23:38:36 UTC 2011

Author: jmtd
Date: 2011-01-16 23:38:36 +0000 (Sun, 16 Jan 2011)
New Revision: 11663

Removed:
   packages/trunk/rott/debian/po/
   packages/trunk/rott/debian/rott.postinst
   packages/trunk/rott/debian/rott.prerm
Modified:
   packages/trunk/rott/debian/changelog
   packages/trunk/rott/debian/control
   packages/trunk/rott/debian/copyright
   packages/trunk/rott/debian/rott.lintian-overrides
Log:
merge brange gdp

Modified: packages/trunk/rott/debian/changelog
===================================================================

--- packages/trunk/rott/debian/changelog	2011-01-16 21:19:20 UTC (rev 11662)
+++ packages/trunk/rott/debian/changelog	2011-01-16 23:38:36 UTC (rev 11663)
@@ -1,5 +1,6 @@
 rott (1.1.1-4) unstable; urgency=low
 
+  [ Fabian Greffrath ]
   * Add Japanese po-debconf template translation,
     thanks Hideki Yamane <henrich at debian.org> (Closes: #599886).
   * Build all four variants of the game: Shareware Version, Commercial Version,
@@ -13,8 +14,12 @@
   * Update Standards-Version and debhelper compat.
   * Make sure object files get rebuilt whenever develop.h is changed.
 
- -- Fabian Greffrath <fabian+debian at greffrath.com>  Mon, 03 Jan 2011 16:36:05 +0100
+  [ Jon Dowland ]
+  * add Recommends: rott-data (to be provided by packages generated
+    by game-data-packager)
 
+ -- Jon Dowland <jmtd at debian.org>  Sun, 16 Jan 2011 23:36:20 +0000
+
 rott (1.1.1-3.1) unstable; urgency=low
 
   * Non-maintainer upload.

Modified: packages/trunk/rott/debian/control
===================================================================
--- packages/trunk/rott/debian/control	2011-01-16 21:19:20 UTC (rev 11662)
+++ packages/trunk/rott/debian/control	2011-01-16 23:38:36 UTC (rev 11663)
@@ -12,8 +12,8 @@
 
 Package: rott
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, wget, unzip | p7zip-full
-Recommends: freepats, timidity
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: freepats, timidity, rott-data
 Description: SDL-Port of Rise of the Triad
  Rise of the Triad is a high quality, fast scrolling first-person perspective
  3D action game. It includes a lot of destructive enemies, an arsenal of
@@ -22,5 +22,5 @@
  .
  WARNING: Rise of the Triad features wanton and gratuitous violence.
  .
- This package contains no data files but can install the shareware data files
- from the Internet.
+ This package contains no data files: use `game-data-packager' to generate
+ a suitable data package before installing rott.

Modified: packages/trunk/rott/debian/copyright
===================================================================
--- packages/trunk/rott/debian/copyright	2011-01-16 21:19:20 UTC (rev 11662)
+++ packages/trunk/rott/debian/copyright	2011-01-16 23:38:36 UTC (rev 11663)
@@ -36,21 +36,3 @@
 	.
 	On Debian systems, the complete text of the GNU General
 	Public License can be found in `/usr/share/common-licenses/GPL-2'.
-
-Files: debian/po/de.po
-Copyright:
-	© 2006-2008, Fabian Greffrath <fabian at debian-unofficial.org>
-	© 2007, Helge Kreutzmann <debian at helgefjell.de>
-License: GPL-2+
-	The Debian packaging is licensed under the GPL.
-	.
-	On Debian systems, the complete text of the GNU General
-	Public License can be found in `/usr/share/common-licenses/GPL-2'.
-
-Files: debian/po/pt_BR.po
-Copyright: © 2007, Eder L. Marques <frolic at debian-ce.org>
-License: GPL-2+
-	The Debian packaging is licensed under the GPL.
-	.
-	On Debian systems, the complete text of the GNU General
-	Public License can be found in `/usr/share/common-licenses/GPL-2'.

Modified: packages/trunk/rott/debian/rott.lintian-overrides
===================================================================
--- packages/trunk/rott/debian/rott.lintian-overrides	2011-01-16 21:19:20 UTC (rev 11662)
+++ packages/trunk/rott/debian/rott.lintian-overrides	2011-01-16 23:38:36 UTC (rev 11663)
@@ -1,5 +1,3 @@
-# Directory created intentionally for data files.
-rott: package-contains-empty-directory usr/share/games/rott/
 # The /usr/games/rott binary is handled via update-alternatives.
 rott: desktop-command-not-in-package
 rott: menu-command-not-in-package

Deleted: packages/trunk/rott/debian/rott.postinst
===================================================================
--- packages/trunk/rott/debian/rott.postinst	2011-01-16 21:19:20 UTC (rev 11662)
+++ packages/trunk/rott/debian/rott.postinst	2011-01-16 23:38:36 UTC (rev 11663)
@@ -1,94 +0,0 @@
-#!/bin/sh
-
-set -e
-
-
-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
-
-. /usr/share/debconf/confmodule
-
-SHAREDIR="/usr/share/games/rott"
-SHAREZIP="1rott13.zip"
-SHAREURL1="ftp://ftp.3drealms.com/share"
-SHAREURL2="ftp://ftp.3drealms.com/pub/share"
-SHAREMD5="0fafd6b629eab80278fc726e31f9cf41"
-DOCDIR="/usr/share/doc/rott"
-
-if [ -x "$(which unzip)" ]; then
-	UNZIP="unzip -o"
-elif [ -x "$(which 7za)" ]; then
-	UNZIP="7za e -y"
-elif [ -x "$(which 7z)" ]; then
-	UNZIP="7z e -y"
-fi
-
-SUCCESS=0
-COUNTER=0
-MAXCOUNT=3
-
-case "$1" in
-	configure)
-		# Have we read the question already?
-		db_fget rott/shareware seen
-		if [ "$RET" = "false" ]; then
-			exit
-		fi
-
-		# Do we want to download the shareware zip file?
-		db_get rott/shareware
-		if [ "$RET" = "true" ]; then
-
-			# Repeat until we succeed (or reach MAXCOUNT)
-			while [ $SUCCESS -eq 0 -a $COUNTER -lt $MAXCOUNT ]; do
-
-				# Increase counter
-				COUNTER=$(($COUNTER+1))
-
-				# Download the shareware zip file in case it's not already there
-				if [ ! -e ${SHAREDIR}/${SHAREZIP} ]; then
-					wget --progress=dot --directory-prefix ${SHAREDIR} -c ${SHAREURL1}/${SHAREZIP} || \
-					wget --progress=dot --directory-prefix ${SHAREDIR} -c ${SHAREURL2}/${SHAREZIP} || \
-					echo "rott: Download of shareware data files failed!" >&2
-				fi
-
-				# Check zip file integrity, then install
-				if [ "$(md5sum $SHAREDIR/$SHAREZIP | cut -f1 -d' ')" = "$SHAREMD5" ]; then
-					cd ${SHAREDIR} && eval ${UNZIP} ${SHAREZIP} > /dev/null && \
-					cd ${SHAREDIR} && eval ${UNZIP} ROTTSW13.SHR > /dev/null && \
-					chmod -f 0644 ${SHAREDIR}/* && \
-					rm -f ${SHAREDIR}/ROTTSW13.SHR ${SHAREDIR}/INSTALL.EXE ${SHAREDIR}/FILE_ID.DIZ && \
-					ln -sf ${SHAREDIR}/VENDOR.DOC ${DOCDIR}/vendor.doc && \
-					SUCCESS=1
-				else
-					# File integrity check failed, delete the crap
-					echo "rott: File integrity check failed!" >&2
-					rm -rf ${SHAREDIR}/*
-				fi
-			done
-
-			# Unsuccessful?
-			if [ $SUCCESS -eq 0 ]; then
-				echo "rott: Installation of shareware data files failed!" >&2
-				exit 1
-			fi
-		fi
-	;;
-
-	abort-upgrade|abort-remove|abort-deconfigure)
-	;;
-
-	*)
-		echo "postinst called with unknown argument \`$1'" >&2
-		exit 1
-	;;
-esac
-
-#DEBHELPER#
-
-exit 0

Deleted: packages/trunk/rott/debian/rott.prerm
===================================================================
--- packages/trunk/rott/debian/rott.prerm	2011-01-16 21:19:20 UTC (rev 11662)
+++ packages/trunk/rott/debian/rott.prerm	2011-01-16 23:38:36 UTC (rev 11663)
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-set -e
-
-SHAREDIR="/usr/share/games/rott"
-DOCDIR="/usr/share/doc/rott"
-
-case "$1" in
-	remove|deconfigure)
-		update-alternatives --quiet --remove-all rott
-		rm -rf ${SHAREDIR}/* ${DOCDIR}/vendor.doc
-	;;
-
-	upgrade|failed-upgrade)
-	;;
-
-	*)
-		echo "prerm called with unknown argument \`$1'" >&2
-		exit 1
-	;;
-esac
-
-#DEBHELPER#
-
-exit 0


