[Scummvm-cvs-logs] CVS: scummvm/debian changelog.debian_official,NONE,1.1 prepare,1.1,1.2

[Bastien Nocera]

Update of /cvsroot/scummvm/scummvm/debian
In directory usw-pr-cvs1:/tmp/cvs-serv18277

Modified Files:
	prepare 
Added Files:
	changelog.debian_official 
Log Message:
- added the official debian changelog, that nobody apart from me should modify. This should allow Ender to make releases of his own, and me still having the changelog from the official debian package as I want them.
- modified the prepare script to use changelog.debian_official if the username is hadess :)
- added a --nocvs arg to the prepare script to force generating non-snapshot changelogs


--- NEW FILE: changelog.debian_official ---
scummvm (0.2.0) unstable; urgency=low

  * New upstream version (Closes: #143281)
  * Killed the wrapper script, see upstream changelog

 -- Bastien Nocera <hadess at hadess.net>  Wed, 15 May 2002 03:27:11 +0100

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 at 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 at hadess.net>  Fri,  5 Apr 2002 16:37:09 +0100


Index: prepare
===================================================================
RCS file: /cvsroot/scummvm/scummvm/debian/prepare,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- prepare	10 May 2002 17:28:09 -0000	1.1
+++ prepare	15 May 2002 02:49:32 -0000	1.2
@@ -5,12 +5,16 @@
 	exit 1
 fi
 
-if [ -d CVS/ ] ; then
+if [ -d CVS/ ] && [ $1 != "--nocvs" ]; 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
+	if [ x$USER = xhadess ]; then
+		cp debian/changelog.debian_official debian/changelog
+	else
+		cp debian/changelog.debian debian/changelog
+	fi
 fi