r12583 - packages/trunk/funguloids/debian

Paul Wise pabs at alioth.debian.org
Sat Aug 13 13:05:30 UTC 2011 

Author: pabs
Date: 2011-08-13 13:05:30 +0000 (Sat, 13 Aug 2011)
New Revision: 12583

Added:
   packages/trunk/funguloids/debian/manpages
Modified:
   packages/trunk/funguloids/debian/changelog
   packages/trunk/funguloids/debian/compat
   packages/trunk/funguloids/debian/control
   packages/trunk/funguloids/debian/funguloids.install
   packages/trunk/funguloids/debian/rules
Log:
Switch to debhelper 7 dh & dh-autoreconf

Modified: packages/trunk/funguloids/debian/changelog
===================================================================
--- packages/trunk/funguloids/debian/changelog	2011-08-13 11:54:29 UTC (rev 12582)
+++ packages/trunk/funguloids/debian/changelog	2011-08-13 13:05:30 UTC (rev 12583)
@@ -4,6 +4,7 @@
   * Improve the menu file
   * Wrap the build-deps and deps one per line
   * Switch to dpkg-source v3 format
+  * Switch to debhelper 7 dh & dh-autoreconf
 
  -- Paul Wise <pabs at debian.org>  Sat, 02 Apr 2011 13:12:20 +0800
 

Modified: packages/trunk/funguloids/debian/compat
===================================================================
--- packages/trunk/funguloids/debian/compat	2011-08-13 11:54:29 UTC (rev 12582)
+++ packages/trunk/funguloids/debian/compat	2011-08-13 13:05:30 UTC (rev 12583)
@@ -1 +1 @@
-5
+7

Modified: packages/trunk/funguloids/debian/control
===================================================================
--- packages/trunk/funguloids/debian/control	2011-08-13 11:54:29 UTC (rev 12582)
+++ packages/trunk/funguloids/debian/control	2011-08-13 13:05:30 UTC (rev 12583)
@@ -3,8 +3,8 @@
 Section: contrib/games
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Michael Koch <konqueror at gmx.de>
-Build-Depends: debhelper (>= 5),
- automake,
+Build-Depends: debhelper (>= 7.0.50~),
+ dh-autoreconf,
  pkg-config,
  liblua5.1-0-dev,
  libois-dev,

Modified: packages/trunk/funguloids/debian/funguloids.install
===================================================================
--- packages/trunk/funguloids/debian/funguloids.install	2011-08-13 11:54:29 UTC (rev 12582)
+++ packages/trunk/funguloids/debian/funguloids.install	2011-08-13 13:05:30 UTC (rev 12583)
@@ -1,4 +1 @@
-usr/games/*
-usr/share/games/*
-usr/share/pixmaps/*
-../funguloids.desktop usr/share/applications
+debian/funguloids.desktop usr/share/applications

Added: packages/trunk/funguloids/debian/manpages
===================================================================
--- packages/trunk/funguloids/debian/manpages	                        (rev 0)
+++ packages/trunk/funguloids/debian/manpages	2011-08-13 13:05:30 UTC (rev 12583)
@@ -0,0 +1 @@
+debian/funguloids.6

Modified: packages/trunk/funguloids/debian/rules
===================================================================
--- packages/trunk/funguloids/debian/rules	2011-08-13 11:54:29 UTC (rev 12582)
+++ packages/trunk/funguloids/debian/rules	2011-08-13 13:05:30 UTC (rev 12583)
@@ -1,133 +1,15 @@
 #! /usr/bin/make -f
-# -*- makefile -*-
-
-# Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# These are from the autotools-dev package documentation.
-# /usr/share/doc/autotools-dev/README.Debian.gz
-# from the section titled "Calling GNU configure properly"
-export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-# FOR AUTOCONF 2.52 AND NEWER ONLY
-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
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-  DEB_CXXFLAGS += -O0 -g -Wall
-else
-  DEB_CXXFLAGS += -O2 -g -Wall
-endif
-
-# Specify extra option to build funguliods while disabling keyboard and mouse
-# capture
 ifneq (,$(findstring nomousecapture,$(DEB_BUILD_OPTIONS)))
-  DEB_CXXFLAGS += -DDISABLE_MOUSE_CAPTURE
+  CXXFLAGS += -DDISABLE_MOUSE_CAPTURE
 endif
 
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-# Some strange issue happened where the build-aux directory was never imported
-# using git-import-orig, thus the next line ensures that it's there
-	[ -d build-aux ] || mkdir build-aux
-	aclocal
-	autoheader -f
-	automake --add-missing --force-missing --copy
-	autoconf -f
-	CXXFLAGS="$(DEB_CXXFLAGS)" \
-		./configure $(confflags) --prefix=/usr --with-fmod=no
-	touch configure-stamp
+%:
+	dh $@ --parallel --with autoreconf
 
-build: configure build-stamp
-build-stamp:
-	dh_testdir
-	$(MAKE)
-	touch build-stamp
+override_dh_auto_configure:
+	CXXFLAGS="$(CXXFLAGS)" dh_auto_configure -- --with-fmod=no
 
-clean: clean-stamp
-clean-stamp:
-	dh_testdir
-	dh_testroot
-	[ ! -f Makefile ] || $(MAKE) clean distclean
-	[ -d build-aux ] && rm -f build-aux/*
-	[ ! -f configure-stamp ] || rm configure-stamp
-	[ ! -f build-stamp ] || rm build-stamp
-	rm -f aclocal.m4 configure
-	rm -f bin/music/playlist.lua
-	find . -name Makefile -delete
-	find . -name Makefile.in -delete
-	rm -rf .pc
-	dh_clean
-
-install: build
-	dh_testdir 
-	dh_testroot
-	dh_clean -k
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-
-# Build architecture-independent files here.
-binary-indep:
-# Nothing to do for binary-indep
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_install --sourcedir=debian/tmp -Xplugins.cfg
-	dh_link /etc/OGRE/plugins.cfg usr/share/games/funguloids/plugins.cfg
-	dh_installchangelogs
-	dh_installman debian/funguloids.6
-	dh_installdocs debian/tmp/usr/share/docs/funguloids/*
-	dh_installmenu
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-# Common variables used to ease maintenance of the get-orig-source target.
-FUNGULOIDS_TARBALL = funguloids-linux-1.06-4.tar.bz2
-FUNGULOIDS_VERSION = 1.06
-CORRECT_CHECKSUM = 1d9d92b08f58715d3dcb59c2ebcb7db7
-COMPUTED_CHECKSUM = $(shell md5sum $(FUNGULOIDS_TARBALL) | cut -d ' ' -f 1)
-get-orig-source:
-	[ -e $(FUNGULOIDS_TARBALL) ] || \
-		wget http://downloads.sourceforge.net/funguloids/$(FUNGULOIDS_TARBALL)
-ifeq ($(CORRECT_CHECKSUM),$(COMPUTED_CHECKSUM))
-	@echo Generating orig tarball
-	tar -xjf $(FUNGULOIDS_TARBALL)
-	mv funguloids funguloids-$(FUNGULOIDS_VERSION).orig
-# This next part shouldn't have been done. It won't be done on next release
-# or next time the orig tarball is reuploaded.
-	rm funguloids-$(FUNGULOIDS_VERSION).orig/build-aux/install-sh
-	rm funguloids-$(FUNGULOIDS_VERSION).orig/build-aux/missing
-	rm funguloids-$(FUNGULOIDS_VERSION).orig/build-aux/depcomp
-	rm funguloids-$(FUNGULOIDS_VERSION).orig/bin/music/Makefile.in
-	rm funguloids-$(FUNGULOIDS_VERSION).orig/bin/Makefile.in
-	rm funguloids-$(FUNGULOIDS_VERSION).orig/bin/icon/Makefile.in
-	rm funguloids-$(FUNGULOIDS_VERSION).orig/bin/docs/Makefile.in
-	rm funguloids-$(FUNGULOIDS_VERSION).orig/Makefile.in
-	rm funguloids-$(FUNGULOIDS_VERSION).orig/include/Makefile.in
-	rm funguloids-$(FUNGULOIDS_VERSION).orig/src/Makefile.in
-	rm funguloids-$(FUNGULOIDS_VERSION).orig/configure
-	rm funguloids-$(FUNGULOIDS_VERSION).orig/aclocal.m4
-	tar -czf funguloids_$(FUNGULOIDS_VERSION).orig.tar.gz funguloids-$(FUNGULOIDS_VERSION).orig
-	rm -rf funguloids-$(FUNGULOIDS_VERSION).orig
-	rm $(FUNGULOIDS_TARBALL)
-	@echo done.
-else
-	@echo Checksum mismatch. Correct checksum is $(CORRECT_CHECKSUM).
-	@echo Computed checksum was $(COMPUTED_CHECKSUM).
-	exit 1
-endif
-
-binary: binary-arch binary-indep
-.PHONY: unpack configure build clean binary-indep binary-arch binary install
+override_dh_auto_clean:
+	dh_auto_clean -- clean distclean

More information about the Pkg-games-commits mailing list