- 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

svn-id: r4336

1 files changed, 6 insertions, 2 deletions

diff --git a/debian/prepare b/debian/prepare
index 63384fe647..0698be1184 100755
--- a/debian/prepare
+++ b/debian/prepare
@@ -5,12 +5,16 @@ if [ ! -e debian/rules ] ; then
 	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