(svn r14279) -Revert (r14237): Undo changes for renaming Debian packages, this is not the right way to do this.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/os/debian/control Tue Sep 09 11:26:17 2008 +0000
@@ -0,0 +1,21 @@
+Source: openttd
+Section: contrib/games
+Priority: optional
+Maintainer: Matthijs Kooijman <matthijs@stdin.nl>
+Uploaders: Jordi Mallach <jordi@debian.org>
+Build-Depends: debhelper (>= 4.0.0), libsdl-dev, zlib1g-dev, libpng-dev, libfreetype6-dev, libfontconfig-dev
+Standards-Version: 3.7.3
+Vcs-Browser: http://svn.debian.org/wsvn/collab-maint/deb-maint/openttd/trunk/
+Vcs-Svn: svn://svn.debian.org/svn/collab-maint/deb-maint/openttd/trunk
+Homepage: http://www.openttd.org/
+
+Package: openttd
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: timidity, freepats
+Description: reimplementation of Transport Tycoon Deluxe with enhancements
+ OpenTTD is a reimplementation of the Microprose game "Transport
+ Tycoon Deluxe" with lots of new features and enhancements. The data
+ files of the original Transport Tycoon Deluxe for Windows are
+ mandatory to play the game. They must be manually copied to the game
+ data directory (see README.Debian for details).
--- a/os/debian/control.in Tue Sep 09 10:58:23 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-Source: PACKAGE
-Section: contrib/games
-Priority: optional
-Maintainer: Matthijs Kooijman <matthijs@stdin.nl>
-Uploaders: Jordi Mallach <jordi@debian.org>
-Build-Depends: debhelper (>= 4.0.0), libsdl-dev, zlib1g-dev, libpng-dev, libfreetype6-dev, libfontconfig-dev
-Standards-Version: 3.7.3
-Vcs-Browser: http://svn.debian.org/wsvn/collab-maint/deb-maint/openttd/trunk/
-Vcs-Svn: svn://svn.debian.org/svn/collab-maint/deb-maint/openttd/trunk
-Homepage: http://www.openttd.org/
-
-Package: PACKAGE
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: timidity, freepats
-Description: reimplementation of Transport Tycoon Deluxe with enhancements
- OpenTTD is a reimplementation of the Microprose game "Transport
- Tycoon Deluxe" with lots of new features and enhancements. The data
- files of the original Transport Tycoon Deluxe for Windows are
- mandatory to play the game. They must be manually copied to the game
- data directory (see README.Debian for details).
--- a/os/debian/rules Tue Sep 09 10:58:23 2008 +0000
+++ b/os/debian/rules Tue Sep 09 11:26:17 2008 +0000
@@ -6,22 +6,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-DEFAULT_PACKAGE := openttd
-# Find the package name from the topmost changelog entry.
-# Is this the best way to do this?
-PACKAGE = $(shell cat debian/changelog | head -1 | cut -f1 -d' ')
-
-debian/control:
- # Generate control file
- sed 's/PACKAGE/$(PACKAGE)/' debian/control.in > debian/control
-
- # TODO: How to do this using makefile conditionals?
- if [ "$(PACKAGE)" != "$(DEFAULT_PACKAGE)" ]; then \
- echo "Provides: $(DEFAULT_PACKAGE)" >> debian/control ; \
- echo "Conflicts: $(DEFAULT_PACKAGE)" >> debian/control ; \
- fi;
-
-configure: debian/control configure-stamp
+configure: configure-stamp
configure-stamp:
dh_testdir
# Add here commands to configure the package.
@@ -29,20 +14,20 @@
touch configure-stamp
-build: debian/control configure build-stamp
+build: configure build-stamp
build-stamp:
dh_testdir
# Add here commands to compile the package.
- ./configure --prefix-dir=/usr --binary-dir=games --data-dir=share/games/openttd --icon-dir=share/pixmaps --personal-dir=.openttd --install-dir=debian/$(PACKAGE)
+ ./configure --prefix-dir=/usr --binary-dir=games --data-dir=share/games/openttd --icon-dir=share/pixmaps --personal-dir=.openttd --install-dir=debian/openttd
$(MAKE)
#/usr/bin/docbook-to-man debian/openttd.sgml > openttd.1
touch build-stamp
-clean: debian/control
+clean:
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
@@ -54,10 +39,8 @@
[ ! -f Makefile ] || $(MAKE) distclean
dh_clean
- # Clean up generated control file
- -rm debian/control
-install: debian/control build
+install: build
dh_testdir
dh_testroot
dh_clean -k
@@ -71,7 +54,7 @@
# We have nothing to do by default.
# Build architecture-dependent files here.
-binary-arch: debian/control build install
+binary-arch: build install
dh_testdir
dh_testroot
dh_installchangelogs changelog.txt