[SCM] Packaging for DFArc branch, master, updated. debian/3.8.1-1-4-gd584653

Fri Apr 27 18:02:11 UTC 2012

The following commit has been merged in the master branch:
commit d584653216b19183817ff0bb44058d922d34f139
Author: Sylvain Beucler <beuc at beuc.net>
Date:   Fri Apr 27 20:00:44 2012 +0200

    New upstream release - v3.10

diff --git a/debian/changelog b/debian/changelog
index be09ff5..86260a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+freedink-dfarc (3.10-1) unstable; urgency=low
+
+  * New Upstream Version
+  * Upgrade packaging to debhelper 7 and source format 3.0 (quilt)
+  * Update copyright file
+  * Bump Standards-Version to 3.9.3
+  * Update official webpage
+  * Remove lintian override for dh_desktop (not supporting pre-Squeeze
+    anymore)
+
+ -- Sylvain Beucler <beuc at debian.org>  Fri, 27 Apr 2012 19:00:00 +0200
+
 freedink-dfarc (3.8.1-1) experimental; urgency=low
 
   * New upstream release
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/control b/debian/control
index 888a811..21de6c8 100644
--- a/debian/control
+++ b/debian/control
@@ -3,9 +3,9 @@ Section: games
 Priority: extra
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Sylvain Beucler <beuc at debian.org>
-Build-Depends: debhelper (>= 6.0.7~), autotools-dev, libbz2-dev, libwxgtk2.8-dev, intltool (>= 0.31)
-Standards-Version: 3.9.1
-Homepage: http://www.freedink.org/
+Build-Depends: debhelper (>= 7.0.50~), autotools-dev, libbz2-dev, libwxgtk2.8-dev, intltool (>= 0.31)
+Standards-Version: 3.9.3
+Homepage: http://www.gnu.org/software/freedink/
 Vcs-Git: git://git.debian.org/git/pkg-games/freedink-dfarc.git
 Vcs-Browser: http://git.debian.org/?p=pkg-games/freedink-dfarc.git
 
diff --git a/debian/copyright b/debian/copyright
index d2d8202..11cf90e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -21,6 +21,7 @@ nl - Copyright (C) 2010  Free Software Foundation
 pl - Copyright (C) 2008  GOKUSSJ6
      Copyright (C) 2009, 2010  Michał Trzebiatowski
 vi - Copyright (C) 2009, 2010  Free Software Foundation
+hr - Copyright (C) 2012  Tomislav Krznar
 
 License:
 
diff --git a/debian/rules b/debian/rules
index 18b4c5b..7f23453 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,104 +1,47 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
+#
+# 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
-# default dh_make target
-TARGET  := $(CURDIR)/debian/freedink-dfarc
-
-# Cf. /usr/share/doc/autotools-dev/README.Debian.gz
-export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
-  confflags += --build $(DEB_HOST_GNU_TYPE)
-else
-  confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
-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-desktopfiles' to avoid installing FreeDesktop files
-	# on the builder (rather than on the end-user computer)
-	cd $(BUILD) && $(SRC)/configure $(confflags) \
-	  --prefix=/usr --bindir=/usr/games --datadir=/usr/share/games \
-	  --disable-desktopfiles \
-	  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 $@
+	#   on the builder (rather than on the end-user computer)
+	dh_auto_configure -- --bindir=/usr/games --datadir=/usr/share/games --disable-desktopfiles
 
-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
-
-	# Add here commands to install the package into $(TARGET).
-	$(MAKE) -C $(BUILD) DESTDIR=$(TARGET) install
+override_dh_strip:
+	# Create -dbg package with debug symbols for gdb
+	dh_strip --dbg-package=freedink-dfarc-dbg
 
+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-dfarc
 
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
+override_dh_installdocs:
+	# --link-doc requires debhelper 7.4.2
+	dh_installdocs --link-doc=freedink-dfarc
 
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
+override_dh_installchangelogs:
 	dh_installchangelogs ChangeLog
-	dh_installdocs
-	dh_install
-	dh_installmenu
-	dh_icons
-	# This one is a no-op under Squeeze, but is needed under
-	# earlier versions, so let's keep it to ease backports:
-	dh_desktop
-	dh_lintian
-	dh_installmime
-	dh_installman
-	dh_link
-	dh_strip --dbg-package=freedink-dfarc-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 
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
deleted file mode 100644
index a28d228..0000000
--- a/debian/source.lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-# dh_desktop one is a no-op under Squeeze, but is needed under earlier
-# versions, so let's keep it to ease backports:
-dh_desktop-is-deprecated
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

-- 
Packaging for DFArc

