13 files changed, 93 insertions, 150 deletions
diff --git a/debian/changelog b/debian/changelog
deleted file mode 100644
index aca5ca59c1..0000000000
--- a/debian/changelog
+++ /dev/null
@@ -1,26 +0,0 @@
-scummvm (0.2.0-1) unstable; urgency=low
-  * 0.2.0 major release.
-        - core engine rewrite
-        - enhanced ingame GUI, including options/volume settings.
-        - auto-save feature
-        - added more command-line options, and configuration file
-        - new ports and platforms (MorphOS, Mac, Dreamcast, Solaris, IRIX..)
-        - graphics filtering added (2xSAI, Super2xSAI, SuperEagle, AdvMame2x)
-        - support for MAD MP3 compressed audio
-        - support for first non-SCUMM games (Simon the Sorcerer)
-        - support for V4 games (Loom CD)
-        - enhanced V6 game support (Sam and Max is now completable)
-        - experimental support for V7 games (Full Throttle/The Dig)
-        - experimental support for V3 games (Zak256/Indy3)
-
- -- James Brown <ender@enderboi.com>  Wed, 01 May 2002 12:53:12 +0000
-
-scummvm (0.0.3-1) unstable; urgency=low
-
-  * Initial Release.
-
- -- David Given <dg@cowlark.com>  Sun, 18 Nov 2001 16:22:12 +0000
-
-Local variables:
-mode: debian-changelog
-End:
diff --git a/debian/changelog.cvs b/debian/changelog.cvs
new file mode 100644
index 0000000000..b9c1ea47e3
--- /dev/null
+++ b/debian/changelog.cvs
@@ -0,0 +1,7 @@
+scummvm (@VERSION@-1) unstable; urgency=low
+
+  * This is a CVS snapshot, don't file bugs on the Debian BTS if you use
+    this package. Instead mail me directly.
+
+ -- Bastien Nocera <hadess@hadess.net>  Fri,  5 Apr 2002 16:37:09 +0100
+
diff --git a/debian/changelog.debian b/debian/changelog.debian
new file mode 100644
index 0000000000..3bcecfd04f
--- /dev/null
+++ b/debian/changelog.debian
@@ -0,0 +1,16 @@
+scummvm (0.1.0b-2) unstable; urgency=low
+
+  * Moved the scummvm main bin under /usr/lib, the wrapper script under
+    /usr/games
+  * Fixed bug in the script that made it not work if the path was relative
+
+ -- Bastien Nocera <hadess@hadess.net>  Wed, 10 Apr 2002 19:27:05 +0100
+
+scummvm (0.1.0b-1) unstable; urgency=low
+
+  * Initial Release.
+  * Packaged made under the influence of beer at GUAD3C in Sevilla ! Arriba !
+    Ole !
+
+ -- Bastien Nocera <hadess@hadess.net>  Fri,  5 Apr 2002 16:37:09 +0100
+
diff --git a/debian/control b/debian/control
deleted file mode 100644
index e9cb038fa5..0000000000
--- a/debian/control
+++ /dev/null
@@ -1,14 +0,0 @@
-Source: scummvm
-Section: interpreters
-Priority: optional
-Maintainer: James Brown <ender@enderboi.com>
-Build-Depends: debhelper (>> 3.0.0), libsdl1.2-dev
-Standards-Version: 3.5.2
-
-Package: scummvm
-Architecture: any
-Depends: ${shlibs:Depends}
-Description: SCUMM graphic adventure game interpreter
- ScummVM is an interpreter that will play graphic adventure games written for
- LucasArts' SCUMM virtual machine. It uses the SDL library for outputting
- graphics.
diff --git a/debian/copyright b/debian/copyright
deleted file mode 100644
index 7a5a35e3f2..0000000000
--- a/debian/copyright
+++ /dev/null
@@ -1,34 +0,0 @@
-This package was debianized by James Brown <ender@enderboi.com> on
-Sat, May 04 2002 01:08:00 +08:00, based on the original control files by
-David Given <dg@cowlark.com> on Sun, 18 Nov 2001 16:22:12 +0000.
-
-ScummVM was downloaded from http://sourceforge.net/projects/scummvm/
-
-Upstream Author(s): 
- James Brown     <ender@users.sourceforge.net>
- Vincent Hamm	 <yazoo@users.sourceforge.net>
- Ludvig Strigeus <strigeus@users.sourceforge.net>
-
-Copyright:
-
-This program is licensed under the GNU General Public License, version 2.  The
-full text of the license may be found in /usr/share/apps/LICENSES/GPL_V2. The
-brief version follows:
-
-Copyright (C) 2001  Ludvig Strigeus
-Copyright (C) 2002  The ScummVM Team
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index d6ed87bb35..0000000000
--- a/debian/dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin
-usr/share/man/man6
diff --git a/debian/prepare b/debian/prepare
new file mode 100755
index 0000000000..63384fe647
--- /dev/null
+++ b/debian/prepare
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+if [ ! -e debian/rules ] ; then
+	echo "Run from the top-level source directory as debian/prepare"
+	exit 1
+fi
+
+if [ -d CVS/ ] ; then
+	TODATE=`date +%Y%m%d`
+	NEXT_VERSION=`grep SCUMMVM_VERSION scumm.h | sed 's,\#define\ SCUMMVM_VERSION\ \",,gi' | sed 's,\ devel\",,gi'`
+	cat debian/changelog.cvs | sed s/@VERSION@/$NEXT_VERSION.cvs$TODATE/g \
+	> debian/changelog.tmp && mv debian/changelog.tmp debian/changelog
+	exit 0
+else
+	cp debian/changelog.debian debian/changelog
+fi
diff --git a/debian/rules b/debian/rules
deleted file mode 100755
index 3cce726d34..0000000000
--- a/debian/rules
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# This is the debhelper compatability version to use.
-export DH_COMPAT=3
-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	touch configure-stamp
-
-build: configure-stamp build-stamp
-build-stamp:
-	dh_testdir
-	$(MAKE)
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-	-$(MAKE) clean
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	cp scummvm		debian/scummvm/usr/bin
-	cp scummvm.6		debian/scummvm/usr/share/man/man6
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-#	dh_installdebconf	
-	dh_installdocs
-	dh_installmenu
-	dh_installman
-#	dh_undocumented
-	dh_installchangelogs 
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-#	dh_makeshlibs
-	dh_installdeb
-#	dh_perl
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
diff --git a/debian/scummvm.dirs b/debian/scummvm.dirs
new file mode 100644
index 0000000000..818b207667
--- /dev/null
+++ b/debian/scummvm.dirs
@@ -0,0 +1,3 @@
+usr/games
+usr/lib/scummvm
+usr/share/man/man6
diff --git a/debian/scummvm.docs b/debian/scummvm.docs
deleted file mode 100644
index 6e88c596f4..0000000000
--- a/debian/scummvm.docs
+++ /dev/null
@@ -1,2 +0,0 @@
-readme.txt
-whatsnew.txt
diff --git a/debian/scummvm.files b/debian/scummvm.files
deleted file mode 100644
index 6d25c78c2a..0000000000
--- a/debian/scummvm.files
+++ /dev/null
@@ -1,2 +0,0 @@
-/usr/bin
-/usr/man/man6
diff --git a/debian/scummvm.sh b/debian/scummvm.sh
new file mode 100755
index 0000000000..110773eb7d
--- /dev/null
+++ b/debian/scummvm.sh
@@ -0,0 +1,51 @@
+#!/bin/sh
+
+# Uncomment this to debug the script
+# set -x
+
+DIR=$1
+
+help()
+{
+	echo "Scummvm wrapper by Bastien Nocera <hadess@hadess.net>"
+	echo "Usage:"
+	echo "         `basename $0` [dir|file]"
+	echo "Options:"
+	echo "         dir   path to a directory containing a supported game"
+	echo "         file  one of the file in a directory containing a supported game"
+	echo
+	exit
+}
+
+if [ $# -ne 1 ] ; then help ; fi
+if [ $1 == "-h" ] ; then help ; fi
+if [ ! -d $1 ] ; then\
+	if [ -e $1 ] ; then
+		DIR=`dirname $1`
+	else
+		help
+	fi
+fi
+
+# Here we check for which game we're gonna be running
+if [ -e $DIR/*.000 ] ; then
+	GAME=`basename $DIR/*.000 | sed 's,.000$,,g' | grep -v '*'`
+	if [ x$GAME = 'x' ] ; then
+		echo "*** Game not found ***"
+		help
+	fi
+fi
+
+
+# Check for the game, see if it's supported
+if [ -z $GAME ] ; then
+	echo "*** Unsupported game ***"
+	help
+fi
+
+# Go to the game's dir
+cd $DIR
+
+# Launch scummvm with the game name
+/usr/lib/scummvm/scummvm $GAME
+
diff --git a/debian/watch.ex b/debian/watch.ex
deleted file mode 100644
index 921bf203ac..0000000000
--- a/debian/watch.ex
+++ /dev/null
@@ -1,5 +0,0 @@
-# Example watch control file for uscan
-# Rename this file to "watch" and then you can run the "uscan" command
-# to check for upstream updates and more.
-# Site		Directory		Pattern			Version	Script
-sunsite.unc.edu	/pub/Linux/Incoming	scummvm-(.*)\.tar\.gz	debian	uupdate