r7779 - in packages/trunk/game-data-packager: ! dirs' list truncated !

[Jon Dowland]

Author: jmtd-guest
Date: 2008-07-18 13:50:43 +0000 (Fri, 18 Jul 2008)
New Revision: 7779

Modified:
   packages/trunk/game-data-packager/debian/control
   packages/trunk/game-data-packager/doom-common/DEBIAN/control.in
   packages/trunk/game-data-packager/doom-common/usr/share/applications/doom-common.desktop.in
   packages/trunk/game-data-packager/game-data-packager
   packages/trunk/game-data-packager/game-data-packager.6
   packages/trunk/game-data-packager/lib/game-data-packager-shared
Log:
merge branch 'tryexec'

Modified: packages/trunk/game-data-packager/debian/control
===================================================================
--- packages/trunk/game-data-packager/debian/control	2008-07-18 13:48:25 UTC (rev 7778)
+++ packages/trunk/game-data-packager/debian/control	2008-07-18 13:50:43 UTC (rev 7779)
@@ -9,7 +9,7 @@
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/game-data-packager/?op=log
 
 Package: game-data-packager
-Depends: fakeroot, sudo, gdebi
+Depends: fakeroot, sudo
 Conflicts: doom-package
 Replaces: doom-package
 Architecture: all

Modified: packages/trunk/game-data-packager/doom-common/DEBIAN/control.in
===================================================================
--- packages/trunk/game-data-packager/doom-common/DEBIAN/control.in	2008-07-18 13:48:25 UTC (rev 7778)
+++ packages/trunk/game-data-packager/doom-common/DEBIAN/control.in	2008-07-18 13:50:43 UTC (rev 7779)
@@ -4,7 +4,6 @@
 Architecture: all
 Recommends: doom-engine
 Provides: doom-wad
-Depends: doom-engine
 Installed-Size: 56
 Version: VERSION
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>

Modified: packages/trunk/game-data-packager/doom-common/usr/share/applications/doom-common.desktop.in
===================================================================
--- packages/trunk/game-data-packager/doom-common/usr/share/applications/doom-common.desktop.in	2008-07-18 13:48:25 UTC (rev 7778)
+++ packages/trunk/game-data-packager/doom-common/usr/share/applications/doom-common.desktop.in	2008-07-18 13:50:43 UTC (rev 7779)
@@ -2,6 +2,7 @@
 Name=GAME
 GenericName=LONG
 Comment=First Person Shooter Game
+TryExec=doom
 Exec=doom -iwad /usr/share/games/game-data-packager/GAME.wad
 Icon=GAME.xpm
 Terminal=false

Modified: packages/trunk/game-data-packager/game-data-packager
===================================================================
--- packages/trunk/game-data-packager/game-data-packager	2008-07-18 13:48:25 UTC (rev 7778)
+++ packages/trunk/game-data-packager/game-data-packager	2008-07-18 13:50:43 UTC (rev 7779)
@@ -100,7 +100,7 @@
 fi
 
 if [ "$INSTALL" = "yes" ]; then
-	debug "invoking gdebi to install the package"
+	debug "invoking dpkg to install the package"
 	install_deb "$OUTFILE"
 fi
 

Modified: packages/trunk/game-data-packager/game-data-packager.6
===================================================================
--- packages/trunk/game-data-packager/game-data-packager.6	2008-07-18 13:48:25 UTC (rev 7778)
+++ packages/trunk/game-data-packager/game-data-packager.6	2008-07-18 13:50:43 UTC (rev 7779)
@@ -43,7 +43,7 @@
 such game data from CD-ROMs, the Internet or elsewhere.
 .B game\-data\-packager
 uses 
-.B gdebi
+.B dpkg
 via
 .B sudo
 to install the generated Debian package(s) (unless you tell it not to).
@@ -65,7 +65,7 @@
 with just the game and no further arguments will display a list
 of valid options for that game.
 .SH SEE ALSO
-\fIgdebi\fP(1)
+\fIdpkg\fP(1)
 .SH AUTHOR
 Copyright \(co 2008 Jon Dowland \fI<jon at alcopop.org>\fP.
 .br

Modified: packages/trunk/game-data-packager/lib/game-data-packager-shared
===================================================================
--- packages/trunk/game-data-packager/lib/game-data-packager-shared	2008-07-18 13:48:25 UTC (rev 7778)
+++ packages/trunk/game-data-packager/lib/game-data-packager-shared	2008-07-18 13:50:43 UTC (rev 7779)
@@ -164,7 +164,7 @@
 
 install_deb() {
 	DEB="$1"
-	sudo gdebi "$DEB"
+	sudo dpkg -i "$DEB"
 }
 
 unravel() {