r3567 - in packages/trunk/neverball/debian: . patches
Jordà Polo
jorda-guest at alioth.debian.org
Mon Aug 6 23:17:13 UTC 2007
Author: jorda-guest
Date: 2007-08-06 23:17:13 +0000 (Mon, 06 Aug 2007)
New Revision: 3567
Added:
packages/trunk/neverball/debian/patches/
packages/trunk/neverball/debian/patches/data_path.patch
packages/trunk/neverball/debian/patches/series
Removed:
packages/trunk/neverball/debian/config.h.diff
Modified:
packages/trunk/neverball/debian/changelog
packages/trunk/neverball/debian/control
packages/trunk/neverball/debian/rules
Log:
* debian/rules cleanup.
* Switching to quilt for patch management.
* Fixed incorrect data file permissions.
Modified: packages/trunk/neverball/debian/changelog
===================================================================
--- packages/trunk/neverball/debian/changelog 2007-08-06 20:25:02 UTC (rev 3566)
+++ packages/trunk/neverball/debian/changelog 2007-08-06 23:17:13 UTC (rev 3567)
@@ -3,6 +3,12 @@
* debian/control:
+ New maintainer: Debian Games Team. (Closes: #387471)
+ Standards-Version dumped to 3.7.2; no changes needed.
+ + Added a new build dependency on quilt (>= 0.40).
+ * debian/rules:
+ + Targets and comments cleanup.
+ + Do not ignore `make clean'.
+ + Fix permissions of various data files that are marked as executable.
+ * Use quilt as patch manager.
-- Jordà Polo <jorda at ettin.org> Mon, 06 Aug 2007 22:14:45 +0200
Deleted: packages/trunk/neverball/debian/config.h.diff
===================================================================
--- packages/trunk/neverball/debian/config.h.diff 2007-08-06 20:25:02 UTC (rev 3566)
+++ packages/trunk/neverball/debian/config.h.diff 2007-08-06 23:17:13 UTC (rev 3567)
@@ -1,11 +0,0 @@
---- share/config.h 2004-06-29 17:51:39.000000000 +0200
-+++ debian/config.h.diff 2004-06-29 17:53:21.000000000 +0200
-@@ -20,7 +20,7 @@
-
- /*---------------------------------------------------------------------------*/
-
--#define CONFIG_DATA "./data"
-+#define CONFIG_DATA "/usr/share/games/neverdata"
- #define CONFIG_USER ".neverball"
-
- /*
Modified: packages/trunk/neverball/debian/control
===================================================================
--- packages/trunk/neverball/debian/control 2007-08-06 20:25:02 UTC (rev 3566)
+++ packages/trunk/neverball/debian/control 2007-08-06 23:17:13 UTC (rev 3567)
@@ -2,7 +2,7 @@
Section: games
Priority: optional
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 4.0.0), libsdl1.2-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev, libsdl-ttf2.0-dev
+Build-Depends: debhelper (>= 4.0.0), quilt (>= 0.40), libsdl1.2-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev, libsdl-ttf2.0-dev
Standards-Version: 3.7.2
Package: neverball
Added: packages/trunk/neverball/debian/patches/data_path.patch
===================================================================
--- packages/trunk/neverball/debian/patches/data_path.patch (rev 0)
+++ packages/trunk/neverball/debian/patches/data_path.patch 2007-08-06 23:17:13 UTC (rev 3567)
@@ -0,0 +1,11 @@
+--- neverball-1.4.0.orig/share/config.h
++++ neverball-1.4.0/share/config.h
+@@ -20,7 +20,7 @@
+
+ /*---------------------------------------------------------------------------*/
+
+-#define CONFIG_DATA "./data"
++#define CONFIG_DATA "/usr/share/games/neverdata"
+ #define CONFIG_USER ".neverball"
+
+ /*
Added: packages/trunk/neverball/debian/patches/series
===================================================================
--- packages/trunk/neverball/debian/patches/series (rev 0)
+++ packages/trunk/neverball/debian/patches/series 2007-08-06 23:17:13 UTC (rev 3567)
@@ -0,0 +1 @@
+data_path.patch
Modified: packages/trunk/neverball/debian/rules
===================================================================
--- packages/trunk/neverball/debian/rules 2007-08-06 20:25:02 UTC (rev 3566)
+++ packages/trunk/neverball/debian/rules 2007-08-06 23:17:13 UTC (rev 3567)
@@ -1,19 +1,11 @@
#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-#
-# Modified to make a template file for a multi-binary package with separated
-# build-arch and build-indep targets by Bill Allombert 2001
+# Based on the sample rules file written by Joey Hess.
+include /usr/share/quilt/quilt.make
+
# Uncomment this to turn on verbose mode.
-export DH_VERBOSE=1
+#export DH_VERBOSE=1
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
-
-
-
CFLAGS = -Wall -g
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -21,125 +13,64 @@
else
CFLAGS += -O2
endif
+
ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
INSTALL_PROGRAM += -s
endif
-configure: configure-stamp
-configure-stamp:
+build: patch build-stamp
+build-stamp:
dh_testdir
- # Add here commands to configure the package.
-
- #apply the patches then remove the devnull .rej file:
- for i in debian/*.diff; do \
- patch -r debian/devnull -N -p0 <$$i || true; \
- done
- rm -f debian/devnull
-
- #touch configure-stamp
-
-#Architecture
-build: build-arch build-indep
-
-build-arch: build-arch-stamp
-build-arch-stamp: configure-stamp
-
- # Add here commands to compile the arch part of the package.
$(MAKE)
- touch build-arch-stamp
+ touch $@
-build-indep: build-indep-stamp
-build-indep-stamp: configure-stamp
-
- # Add here commands to compile the indep part of the package.
- #$(MAKE) doc
- touch build-indep-stamp
-
-clean:
+clean: unpatch
dh_testdir
dh_testroot
- rm -f build-arch-stamp build-indep-stamp configure-stamp
-
- # Add here commands to clean up after the build process.
- -$(MAKE) clean
-
- #reverse the patches and remove the devnull .rej file:
- for i in debian/*.diff; do \
- patch -R -r debian/devnull -N -p0 <$$i || true; \
- done
- rm -f debian/devnull
-
+ rm -f build-stamp
+ [ ! -f Makefile ] || $(MAKE) clean
dh_clean
-
-install: install-indep install-arch
-
-install-indep:
+install: build
dh_testdir
dh_testroot
- dh_clean -k -i
- dh_installdirs -i
+ dh_clean -k
+ dh_installdirs
+ dh_install --fail-missing
- # Add here commands to install the indep part of the package into
- # debian/<package>-doc.
- #INSTALLDOC#
+# Build architecture-independent files here.
+binary-indep: build install
+ dh_testdir -i
+ dh_testroot -i
+ dh_installchangelogs -i
+ dh_installdocs -i
+ dh_link -i
+ dh_compress -i
+ dh_fixperms -i
+ # Fixing permissions of data files.
+ find debian/neverdata/usr/share/games/neverdata -type f -perm /+x \
+ -exec chmod 0644 {} +
+ dh_installdeb -i
+ dh_gencontrol -i
+ dh_md5sums -i
+ dh_builddeb -i
- dh_install -i
+# Build architecture-dependent files here.
+binary-arch: build install
+ dh_testdir -a
+ dh_testroot -a
+ dh_installchangelogs -a
+ dh_installdocs -a
+ dh_installman -a
+ dh_installmenu -a
+ dh_strip -a
+ dh_compress -a
+ dh_fixperms -a
+ dh_installdeb -a
+ dh_shlibdeps -a
+ dh_gencontrol -a
+ dh_md5sums -a
+ dh_builddeb -a
-install-arch:
- dh_testdir
- dh_testroot
- dh_clean -k -s
- dh_installdirs -s
-
- # Add here commands to install the arch part of the package into
- # debian/tmp.
- #$(MAKE) install DESTDIR=$(CURDIR)/debian/neverball
-
- dh_install -s
-# Must not depend on anything. This is to be called by
-# binary-arch/binary-indep
-# in another 'make' thread.
-binary-common:
- dh_testdir
- dh_testroot
- dh_installchangelogs CHANGES
- dh_installdocs
- dh_installexamples
- dh_installmenu
-# dh_installdebconf
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_installinit
-# dh_installcron
-# dh_installinfo
- dh_installman
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
-# dh_perl
-# dh_python
- dh_makeshlibs
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-# Build architecture independant packages using the common target.
-binary-indep: build-indep install-indep
- $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
-
-# Build architecture dependant packages using the common target.
-binary-arch: build-arch install-arch
- $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
-
-#because Architecture: all in the control file for every package,
-#no need to install independent things:
-
-binary: binary-arch binary-indep
-binary: binary-arch
-
-.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
More information about the Pkg-games-commits
mailing list