r11393 - in packages/trunk/neverball/debian: . patches
Alexander Reichle-Schmehl
tolimar at alioth.debian.org
Mon Oct 4 13:41:37 UTC 2010
Author: tolimar
Date: 2010-10-04 13:41:36 +0000 (Mon, 04 Oct 2010)
New Revision: 11393
Added:
packages/trunk/neverball/debian/patches/
packages/trunk/neverball/debian/patches/sepperate-data-and-bin
packages/trunk/neverball/debian/patches/series
Modified:
packages/trunk/neverball/debian/changelog
packages/trunk/neverball/debian/control
packages/trunk/neverball/debian/rules
Log:
* Patch Upstream Makefile to have sepperate rules to build data and
executables
* Use these targets during the build of arch:all and arch:any packages
That should "fix" the FTBFS on mips
Modified: packages/trunk/neverball/debian/changelog
===================================================================
--- packages/trunk/neverball/debian/changelog 2010-09-28 13:27:44 UTC (rev 11392)
+++ packages/trunk/neverball/debian/changelog 2010-10-04 13:41:36 UTC (rev 11393)
@@ -1,3 +1,11 @@
+neverball (1.5.4-3) unstable; urgency=low
+
+ * Don't build data files every time (Closes: #598614)
+ * Patch upstram Makefile to provide seppereta rules for data and executables
+ * Use them to build arch:all and arch:any packages
+
+ -- Alexander Reichle-Schmehl <tolimar at debian.org> Mon, 04 Oct 2010 08:22:25 +0000
+
neverball (1.5.4-2) unstable; urgency=low
* debian/rules: Set HOME to an existing directory as a temporary workaround
Modified: packages/trunk/neverball/debian/control
===================================================================
--- packages/trunk/neverball/debian/control 2010-09-28 13:27:44 UTC (rev 11392)
+++ packages/trunk/neverball/debian/control 2010-10-04 13:41:36 UTC (rev 11393)
@@ -5,7 +5,7 @@
Uploaders: Alexander Reichle-Schmehl <tolimar at debian.org>,
Jordà Polo <jorda at ettin.org>, Tamas SZERB <toma at rulez.org>
Build-Depends: debhelper (>= 5), libsdl1.2-dev, libsdl-ttf2.0-dev,
- libvorbis-dev, libpng12-dev, libjpeg62-dev, libphysfs-dev
+ libvorbis-dev, libpng12-dev, libjpeg62-dev, libphysfs-dev, quilt
Standards-Version: 3.8.3
Homepage: http://neverball.org/
Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/neverball/
Added: packages/trunk/neverball/debian/patches/sepperate-data-and-bin
===================================================================
--- packages/trunk/neverball/debian/patches/sepperate-data-and-bin (rev 0)
+++ packages/trunk/neverball/debian/patches/sepperate-data-and-bin 2010-10-04 13:41:36 UTC (rev 11393)
@@ -0,0 +1,13 @@
+--- a/Makefile
++++ b/Makefile
+@@ -311,6 +311,10 @@ DESKTOPS := $(basename $(wildcard dist/*
+
+ all : $(BALL_TARG) $(PUTT_TARG) $(MAPC_TARG) sols locales desktops
+
++data : sols locales
++
++executables: $(BALL_TARG) $(PUTT_TARG) $(MAPC_TARG) desktops
++
+ $(BALL_TARG) : $(BALL_OBJS)
+ $(CC) $(ALL_CFLAGS) -o $(BALL_TARG) $(BALL_OBJS) $(LDFLAGS) $(ALL_LIBS)
+
Added: packages/trunk/neverball/debian/patches/series
===================================================================
--- packages/trunk/neverball/debian/patches/series (rev 0)
+++ packages/trunk/neverball/debian/patches/series 2010-10-04 13:41:36 UTC (rev 11393)
@@ -0,0 +1 @@
+sepperate-data-and-bin
Modified: packages/trunk/neverball/debian/rules
===================================================================
--- packages/trunk/neverball/debian/rules 2010-09-28 13:27:44 UTC (rev 11392)
+++ packages/trunk/neverball/debian/rules 2010-10-04 13:41:36 UTC (rev 11393)
@@ -4,6 +4,8 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+include /usr/share/quilt/quilt.make
+
CFLAGS = -Wall -g
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -16,39 +18,61 @@
INSTALL_PROGRAM += -s
endif
-build: build-stamp
-build-stamp:
+build: build-arch build-indep
+
+build-arch: build-arch-stamp
+build-arch-stamp: patch
dh_testdir
# Set HOME to an existent directory as a workaround for #544835. Note that
# HOME isn't actually used, but some buildds set it to a non-existent
# directory, and PhysicsFS currently fails if the directory doesn't exist
# (see #553174).
$(MAKE) DATADIR=/usr/share/games/neverball LOCALEDIR=/usr/share/locale \
- HOME=$(CURDIR)
+ HOME=$(CURDIR) executables
# Rename icons for .desktop files.
cp dist/neverball_128.png dist/neverball.png
cp dist/neverputt_128.png dist/neverputt.png
touch $@
-clean:
+build-indep: build-indep-stamp
+build-indep-stamp: patch
dh_testdir
+ # we build in binary-indep, as "dpkg-buildpackage -B" insist on
+ # calling the general build target
+ touch $@
+
+clean: unpatch
+ dh_testdir
dh_testroot
- rm -f build-stamp
+ rm -f build-arch-stamp build-indep-stamp
[ ! -f Makefile ] || $(MAKE) clean
rm -f dist/neverball.png dist/neverputt.png
dh_clean
-install: build
+install: install-arch
+
+install-arch:
dh_testdir
dh_testroot
dh_clean -k
- dh_installdirs
- dh_install
+ dh_installdirs -a
+ dh_install -a
# Build architecture-independent files here.
-binary-indep: build install
+binary-indep: build-indep
dh_testdir -i
dh_testroot -i
+ # Set HOME to an existent directory as a workaround for #544835. Note that
+ # HOME isn't actually used, but some buildds set it to a non-existent
+ # directory, and PhysicsFS currently fails if the directory doesn't exist
+ # (see #553174).
+ $(MAKE) DATADIR=/usr/share/games/neverball LOCALEDIR=/usr/share/locale \
+ HOME=$(CURDIR) data
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs -i
+ dh_install -i
dh_installchangelogs -i CHANGES
dh_installdocs -i
dh_link -i
@@ -60,7 +84,7 @@
dh_builddeb -i
# Build architecture-dependent files here.
-binary-arch: build install
+binary-arch: build-arch install-arch
dh_testdir -a
dh_testroot -a
dh_installchangelogs -a CHANGES
More information about the Pkg-games-commits
mailing list