cpp/openttd-patchpack/source Changeset - r10098:49c4f44dcd42

Changeset - r10098:49c4f44dcd42

Parent rev.

Child rev.

[Not reviewed]

master

1 1 1

matthijs - 16 years ago 2008-09-09 11:26:17
matthijs@openttd.org

(svn r14279) -Revert (r14237): Undo changes for renaming Debian packages, this is not the right way to do this.

3 files changed with 27 insertions and 44 deletions:

os/debian/control

os/debian/control.in

os/debian/rules

0 comments (0 inline, 0 general)

os/debian/control

➞

Show inline comments

@@ new file 100644 @@
 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).

os/debian/control.in

➞

Show inline comments

deleted file

os/debian/rules

➞

Show inline comments

@@ @@ -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 @@ configure-stamp: @@
 	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 @@ clean: debian/control @@
 	[ ! -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 @@ binary-indep: build install @@
 # 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

0 comments (0 inline, 0 general)