[SCM] Packaging for freedink branch, master, updated. debian/1.08.20100420-1-9-g4f30ce4

Sat Mar 26 09:03:35 UTC 2011

The following commit has been merged in the master branch:
commit 4f30ce4d0a8c8ef900cbee132f544bf2d64aea82
Author: Sylvain Beucler <beuc at beuc.net>
Date:   Sat Mar 26 10:02:51 2011 +0100

    Upgrade packaging to debhelper 7 and source format 3.0 (quilt)

diff --git a/debian/changelog b/debian/changelog
index ac801c0..60ba74f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+freedink (1.08.20110229-1) UNRELEASED; urgency=low
+
+  * New Upstream Version
+  * Upgrade packaging to debhelper 7 and source format 3.0 (quilt)
+
+ -- Sylvain Beucler <beuc at debian.org>  Sat, 26 Mar 2011 08:11:34 +0100
+
 freedink (1.08.20101114-1) experimental; urgency=low
 
   * Precise licenses versions in debian/copyright, fixes
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/copyright b/debian/copyright
index 8f175d4..e006288 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,7 @@ The original source can always be found at:
 	http://ftp.gnu.org/gnu/freedink/
 
 Copyright (C) 1997, 1998, 1999, 2002, 2003  Seth A. Robinson
-Copyright (C) 2003, 2004, 2005, 2007, 2008, 2009, 2010  Sylvain Beucler
+Copyright (C) 2003, 2004, 2005, 2007, 2008, 2009, 2010, 2011  Sylvain Beucler
 Copyright (C) 2005, 2006  Dan Walma
 Copyright (C) 2003  Shawn Betts
 Copyright (C) 2001  Guido Draheim
@@ -22,6 +22,7 @@ de - public domain
 el - Copyright (C) 2010  Michael Kotsarinis
 it - Copyright (C) 2010  Vincenzo Campanella
 cs - Copyright (C) 2010  Marek Černocký
+eo - Copyright (C) 2011  Felipe Castro
 
 License:
 
@@ -182,7 +183,7 @@ in ./src and ./test/sdl are covered by the ZLIB license:
   3. This notice may not be removed or altered from any source distribution.
 
 
-The Debian packaging is Copyright (C) 2008, 2009, 2010, Sylvain
+The Debian packaging is Copyright (C) 2008, 2009, 2010, 2011, Sylvain
 Beucler <beuc at beuc.net> and is licensed under the GPL, either version
 3, or (at your option) any later version, see
 `/usr/share/common-licenses/GPL-3'.
diff --git a/debian/rules b/debian/rules
index f8f8423..180cd43 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,108 +1,50 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-
-# It was built from:
-#   dh_make --single --native --email beuc at beuc.net --copyright gpl \
-#     --packagename freedink
-# then modified.
+#
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+#
+# Modified to make a template file for a multi-binary package with separated
+# build-arch and build-indep targets  by Bill Allombert 2001
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
 
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-SRC     := $(CURDIR)
-BUILD   := $(CURDIR)/debian/build.tmp
-# default dh_make target
-TARGET  := $(CURDIR)/debian/freedink-engine
-
-#CFLAGS = -Wall -g
-CFLAGS = -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
-$(BUILD)/config.status: configure
-	dh_testdir
-	[ -d $(BUILD) ] || mkdir $(BUILD)
 
+%:
+	dh $@ --parallel --with autotools_dev
 	#Install autotools-dev's config.sub and config.guess, if newer:
-	chmod 755 debian/update-autotools-config.sh
-	debian/update-autotools-config.sh autotools/
+	#chmod 755 debian/update-autotools-config.sh
+	#debian/update-autotools-config.sh autotools/
 
+override_dh_auto_configure:
 	# Using '--bindir=/usr/games' by Debian policy
 	#   (e.g. not the case for Fedora)
 	# Using '--disable-embedded-resources' because 'dh_strip' will remove
 	#   them anyway, and we need it for the -dbg package -- too bad :/
-	cd $(BUILD) && $(SRC)/configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --bindir=/usr/games --datadir=/usr/share/games --disable-embedded-resources CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
-
-
-build: debian/build-stamp
-
-debian/build-stamp:  $(BUILD)/config.status
-	dh_testdir
-
-	# Add here commands to compile the package.
-	$(MAKE) -C $(BUILD)
-
-	touch $@
+	dh_auto_configure -- --bindir=/usr/games --datadir=/usr/share/games --disable-embedded-resources 
 
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f debian/build-stamp 
-
-	# Add here commands to clean up after the build process.
-	[ ! -e $(BUILD) ] || $(MAKE) -C $(BUILD) distclean
-
-	rm -rf $(BUILD)
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
+override_dh_strip:
+	# Create -dbg package with debug symbols for gdb
+	dh_strip --dbg-package=freedink-engine-dbg
 
-	# Add here commands to install the package into $(TARGET).
-	$(MAKE) -C $(BUILD) DESTDIR=$(TARGET) install
+override_dh_auto_install:
+	# There's only one real package, let's not bother with
+	# debian/tmp + move files in dh_install - install straight in
+	# the appropriate directory
+	dh_auto_install --destdir=debian/freedink-engine
 	# Lintian complains with 'duplicate-font-file', let's have
 	# FreeDink rely on libfontconfig + depend on ttf-liberation
-	rm $(TARGET)/usr/share/games/freedink/LiberationSans-Regular.ttf
-
+	rm debian/freedink-engine/usr/share/games/freedink/LiberationSans-Regular.ttf
 
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
+override_dh_installdocs:
 	# --link-doc requires debhelper 7.4.2
 	dh_installdocs --link-doc=freedink-engine
-	dh_installchangelogs ChangeLog
-#	dh_installexamples
-	dh_install
-	dh_installmenu
-#	dh_installinfo
-	dh_installman
-	dh_link
-	dh_strip --dbg-package=freedink-engine-dbg
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+override_dh_installchangelogs:
+	dh_installchangelogs ChangeLog
diff --git a/debian/source/format b/debian/source/format
index d3827e7..163aaf8 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-1.0
+3.0 (quilt)

-- 
Packaging for freedink

