[SCM] Packaging for DFArc branch, master, updated. debian/3.2.2-1-1-g2ea9a1d

Tue Jun 23 18:52:11 UTC 2009

The following commit has been merged in the master branch:
commit 2ea9a1d332ee891a5cf59ff0ce0b1b3f829c5e8b
Author: Sylvain Beucler <beuc at beuc.net>
Date:   Tue Jun 23 20:51:44 2009 +0200

    Fix Squeeze's Lintian warnings, clean-up obsolete code from dh-make

diff --git a/debian/changelog b/debian/changelog
index e04e88c..4ad240a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,22 @@ freedink-dfarc (3.2.2-1) unstable; urgency=low
 
   * New Upstream Version
 
- -- Sylvain Beucler <beuc at beuc.net>  Fri, 19 Jun 2009 19:50:47 +0200
+  * Remove obsolete dh_make-generated code (for setting CFLAGS)
+
+  * Fix incomplete copyright notice generated by dh_make (add
+    'Copyright' in front of '(C)')
+
+  * Use good practices from autotools-dev to compute --host and
+    --build parameters to ./configure
+
+  * Move -dbg packages to section 'debug'
+
+  * Add lintian override for dh_desktop obsoletion warning, since
+    we're using it in backports.
+
+  * Depends on debhelper >= 6.0.7 to use dh_lintian
+
+ -- Sylvain Beucler <beuc at beuc.net>  Fri, 23 Jun 2009 20:49:47 +0200
 
 freedink-dfarc (3.2.1-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 321ae6d..b4b395c 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: games
 Priority: extra
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Sylvain Beucler <beuc at beuc.net>
-Build-Depends: debhelper (>= 5.0.51~), autotools-dev, libbz2-dev, libwxgtk2.8-dev | libwxgtk2.6-dev, intltool (>= 0.31)
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 6.0.7~), autotools-dev, libbz2-dev, libwxgtk2.8-dev | libwxgtk2.6-dev, intltool (>= 0.31)
+Standards-Version: 3.8.2
 Homepage: http://www.freedink.org/
 Vcs-Git: git://git.debian.org/git/pkg-games/freedink-dfarc.git
 Vcs-Browser: http://git.debian.org/?p=pkg-games/freedink-dfarc.git
@@ -18,8 +18,8 @@ Description: frontend and .dmod installer for GNU FreeDink
  it's numerous Dink Modules (or D-Mods).
 
 Package: freedink-dfarc-dbg
+Section: debug
 Architecture: any
-Priority: extra
 Depends: freedink-dfarc (= ${binary:Version})
 Description: debugging symbols for dfarc
  DFArc2 makes it easy to play and manage the Dink Smallwood game and
diff --git a/debian/copyright b/debian/copyright
index a620691..b1e6e08 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
 This is DFArc2.
 
 The original source can always be found at:
-        http://www.freedink.org/	
+        ftp://ftp.gnu.org/gnu/freedink/
 
 DFarc was initially released under this license (COPYING.DFArc):
   This software is provided "as is" without express or implied
@@ -91,5 +91,5 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-The Debian packaging is (C) 2008, Sylvain Beucler <beuc at beuc.net> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+The Debian packaging is Copyright (C) 2008, 2009, Sylvain Beucler <beuc at beuc.net>
+and is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
diff --git a/debian/freedink-dfarc.lintian-overrides b/debian/freedink-dfarc.lintian-overrides
new file mode 100644
index 0000000..0205cac
--- /dev/null
+++ b/debian/freedink-dfarc.lintian-overrides
@@ -0,0 +1,2 @@
+# It's fine the way it is.
+extended-description-is-probably-too-short
diff --git a/debian/rules b/debian/rules
index d0e1d92..4336926 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
 # -*- makefile -*-
 
 # Uncomment this to turn on verbose mode.
-export DH_VERBOSE=1
+#export DH_VERBOSE=1
 
 
 # These are used for cross-compiling and for saving the configure script
@@ -15,22 +15,22 @@ BUILD   := $(CURDIR)/debian/build
 # default dh_make target
 TARGET  := $(CURDIR)/debian/freedink-dfarc
 
-#CFLAGS = -Wall -g
-CFLAGS = -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
+# 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
-	CFLAGS += -O2
+  confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
 endif
 
 $(BUILD)/config.status: configure
 	dh_testdir
 	[ -d $(BUILD) ] || mkdir $(BUILD)
-	# Add here commands to configure the package.
+
 	# Using '--disable-desktopfiles' to avoid installing FreeDesktop files
 	# on the builder (rather than on the end-user computer)
-	cd $(BUILD) && $(SRC)/configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --bindir=/usr/games --datadir=/usr/share/games --disable-desktopfiles CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
+	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
@@ -84,7 +84,10 @@ binary-arch: build install
 	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
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
new file mode 100644
index 0000000..a28d228
--- /dev/null
+++ b/debian/source.lintian-overrides
@@ -0,0 +1,3 @@
+# 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

-- 
Packaging for DFArc

