Slightly modified version of patch #1728192: Fix for Debian packaging scripts

svn-id: r27015

9 files changed, 28 insertions, 10 deletions

diff --git a/Makefile b/Makefile
index 81c84ed5e5..1c0a65ac88 100644
--- a/Makefile
+++ b/Makefile
@@ -57,12 +57,15 @@ install: all
 	$(INSTALL) -c -m 644 "$(srcdir)/icons/scummvm.xpm" "$(DESTDIR)$(PREFIX)/share/pixmaps/scummvm.xpm"
 	$(INSTALL) -d "$(DESTDIR)$(PREFIX)/share/doc/scummvm/"
 	$(INSTALL) -c -m 644 "$(srcdir)/AUTHORS" "$(srcdir)/COPYING" "$(srcdir)/NEWS" "$(srcdir)/README" "$(DESTDIR)$(PREFIX)/share/doc/scummvm/"
+	$(INSTALL) -d "$(DESTDIR)$(DATADIR)/scummvm/"
+	$(INSTALL) -c -m 644 "$(srcdir)/gui/themes/modern.ini" "$(srcdir)/gui/themes/modern.zip" "$(srcdir)/gui/themes/classic080.ini" "$(DESTDIR)$(DATADIR)/scummvm/"
 
 uninstall:
 	rm -f "$(DESTDIR)$(BINDIR)/scummvm$(EXEEXT)"
 	rm -f "$(DESTDIR)$(MANDIR)/man6/scummvm.6"
 	rm -f "$(DESTDIR)$(PREFIX)/share/pixmaps/scummvm.xpm"
 	rm -rf "$(DESTDIR)$(PREFIX)/share/doc/scummvm/"
+	rm -rf "$(DESTDIR)$(DATADIR)/scummvm/"
 
 scummvmico.o: icons/scummvm.ico
 	$(WINDRES) dists/scummvm.rc scummvmico.o
diff --git a/configure b/configure
index b2005860b8..fccc95aa7d 100755
--- a/configure
+++ b/configure
@@ -1496,6 +1496,7 @@ NASMFLAGS := $NASMFLAGS
 PREFIX := $_prefix
 BINDIR := $_bindir
 MANDIR := $_mandir
+DATADIR := $_datadir
 
 $_mak_plugins
 
diff --git a/dists/debian/changelog b/dists/debian/changelog
index 76deaf3dda..2e653c8e33 100644
--- a/dists/debian/changelog
+++ b/dists/debian/changelog
@@ -1,3 +1,16 @@
+scummvm (0.10.0-0svn20070530) experimental; urgency=low
+
+  * SVN snapshot.
+
+    Builder:    Timo Röhling <timo@glueckspilz.farm.lokal>
+    Build-date: Wed, 30 May 2007 11:54:05 +0200
+
+    Please don't file bugs you find in this package in the Debian Bug Tracking
+    system, use the ScummVM team's own bug tracker instead.  You can find this
+    tracker at <http://sourceforge.net/tracker/?group_id=37116>.
+
+ -- Tore Anderson <tore@debian.org>  Wed, 30 May 2007 11:54:05 +0200 
+
 scummvm (0.7.1-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/dists/debian/control b/dists/debian/control
index 26ddbacf55..02f53ca4d1 100644
--- a/dists/debian/control
+++ b/dists/debian/control
@@ -2,7 +2,7 @@ Source: scummvm
 Section: games
 Priority: optional
 Maintainer: Tore Anderson <tore@debian.org>
-Build-Depends: debhelper (>> 4.0.0), nasm [i386], tetex-bin, tetex-extra, gs-gpl, libsdl1.2-dev, libmad0-dev, libasound2-dev, libvorbis-dev (>= 1.0.0-2), libmpeg2-4-dev, libflac-dev (>= 1.1.1-2), libz-dev, libfluidsynth-dev
+Build-Depends: debhelper (>> 4.0.0), nasm [i386], tetex-bin, tetex-extra, libsdl1.2-dev, libmad0-dev, libasound2-dev, libvorbis-dev (>= 1.0.0-2), libmpeg2-4-dev, libflac-dev (>= 1.1.1-2), libz-dev, libfluidsynth-dev
 Standards-Version: 3.6.1.1
 
 Package: scummvm
diff --git a/dists/debian/prepare b/dists/debian/prepare
index 8b684898e7..0f86ca742b 100755
--- a/dists/debian/prepare
+++ b/dists/debian/prepare
@@ -19,7 +19,7 @@ cat debian/changelog > $TMP
 cat << __eof > debian/changelog
 scummvm ($VERSION) experimental; urgency=low
 
-  * CVS snapshot.
+  * SVN snapshot.
 
     Builder:    $GECOS <$USERNAME@$DOMAIN>
     Build-date: $DATE
diff --git a/dists/debian/rules b/dists/debian/rules
index 42c2068239..f8f64aea07 100755
--- a/dists/debian/rules
+++ b/dists/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-build: doc/README.pdf scummvm
+build: scummvm
 
 doc/README.pdf:
 	(cd doc; latex readme.tex)
@@ -11,15 +11,15 @@ doc/README.pdf:
 
 scummvm:
 	dh_testdir
-	./configure
+	./configure --prefix=/usr --bindir=/usr/games --datadir=/usr/share/games --mandir=/usr/share/man
 	$(MAKE)
 
 clean:
 	dh_testdir
 	dh_testroot
 	-$(MAKE) distclean
-	-rm doc/readme.aux doc/readme.dvi doc/readme.log doc/readme.out \
-	    doc/readme.toc doc/README.pdf
+	#-rm doc/readme.aux doc/readme.dvi doc/readme.log doc/readme.out \
+	#    doc/readme.toc doc/README.pdf
 	dh_clean
 
 install: build
@@ -27,8 +27,9 @@ install: build
 	dh_testroot
 	dh_clean
 	dh_installdirs
-	install -m0755 scummvm debian/scummvm/usr/games/scummvm
-	install -m0644 icons/scummvm.xpm debian/scummvm/usr/share/icons
+	$(MAKE) install DESTDIR=debian/scummvm
+	install -m 644 dists/scummvm.desktop debian/scummvm/usr/share/applications
+	install -m 644 icons/scummvm.svg debian/scummvm/usr/share/pixmaps
 
 binary: binary-arch
 
diff --git a/dists/debian/scummvm.dirs b/dists/debian/scummvm.dirs
index db81009bfb..82ae8dd1b1 100644
--- a/dists/debian/scummvm.dirs
+++ b/dists/debian/scummvm.dirs
@@ -1,3 +1,4 @@
 usr/games
 usr/share/man/man6
 usr/share/icons
+usr/share/applications
diff --git a/dists/debian/scummvm.docs b/dists/debian/scummvm.docs
index 92723f9744..ca0272abfc 100644
--- a/dists/debian/scummvm.docs
+++ b/dists/debian/scummvm.docs
@@ -1,4 +1,3 @@
 AUTHORS
 README
 TODO
-doc/README.pdf
diff --git a/dists/debian/scummvm.manpages b/dists/debian/scummvm.manpages
index 9e5cb61ef9..7b3eb23799 100644
--- a/dists/debian/scummvm.manpages
+++ b/dists/debian/scummvm.manpages
@@ -1 +1 @@
-scummvm.6
+dists/scummvm.6