(svn r14238) -Change [Debian]: Update Debian packaging files to the latest official Debian version.

  - Packaging files are now identical to those of the official 0.6.2-1 (or,
	r11138 in the collab-maint subversion repository), with the following
	exceptions:
  - Desktop files are removed, since openttd trunk installs them already.
  - Changes regarding package names from r14237 are preserved.
  - Topmost changelog entry with version 0.7~svn-1 is added.

1 files changed, 7 insertions, 6 deletions

diff --git a/os/debian/rules b/os/debian/rules
index af070f62a..d6fa65dbf 100755
--- a/os/debian/rules
+++ b/os/debian/rules
@@ -11,8 +11,6 @@ DEFAULT_PACKAGE := openttd
 # Is this the best way to do this?
 PACKAGE = $(shell cat debian/changelog | head -1 | cut -f1 -d' ')
 
-include /usr/share/dpatch/dpatch.make
-
 debian/control:
 	# Generate control file
 	sed 's/PACKAGE/$(PACKAGE)/' debian/control.in > debian/control
@@ -23,7 +21,7 @@ debian/control:
 		echo "Conflicts: $(DEFAULT_PACKAGE)" >> debian/control ; \
 	fi;
 
-configure: debian/control patch configure-stamp
+configure: debian/control configure-stamp
 configure-stamp:
 	dh_testdir
 	# Add here commands to configure the package.
@@ -44,13 +42,16 @@ build-stamp:
 
 	touch build-stamp
 
-clean: debian/control unpatch
+clean: debian/control
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
 
 	# Add here commands to clean up after the build process.
-	-$(MAKE) clean
+	# We check for Makefile presence, because clean is called at the
+	# start of the build process (before configure) where we don't
+	# have a Makefile yet.
+	[ ! -f Makefile ] || $(MAKE) distclean
 
 	dh_clean
 	# Clean up generated control file
@@ -101,4 +102,4 @@ binary-arch: debian/control build install
 	dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure patch
+.PHONY: build clean binary-indep binary-arch binary install configure