Commit 862b174b authored by Ricardo Mones's avatar Ricardo Mones

incorporate patch from previous NMU using dpatch; fix conflicts/replaces for -data

parent f4e3e8aa
epiphany (0.5.1-3) unstable; urgency=low
* Acknowledge NMU and incorporate patch cleanly (Closes: #377110)
* Conflict and replace unsplitted versions (Closes: #373978)
-- Ricardo Mones <mones@debian.org> Sun, 9 Jul 2006 01:00:03 +0200
epiphany (0.5.1-2.1) unstable; urgency=high
* Non-maintainer upload.
* Define RESOURCE_PATH="/usr/share/epiphany" in the Makefile; fixes
segfault on startup, patch from Mohammed Sameer. (Closes: #374408)
-- Steinar H. Gunderson <sesse@debian.org> Thu, 6 Jul 2006 20:39:19 +0200
epiphany (0.5.1-2) unstable; urgency=low
[ Joerg Jaspert ]
......
......@@ -3,7 +3,7 @@ Section: games
Priority: optional
Maintainer: Joerg Jaspert <joerg@debian.org>
Uploaders: Ricardo Mones <mones@debian.org>
Build-Depends: debhelper (>> 5.0.0), libclanlib-dev
Build-Depends: debhelper (>> 5.0.0), dpatch (>= 2.0.10), libclanlib-dev
Standards-Version: 3.7.2
Package: epiphany
......@@ -20,6 +20,8 @@ Description: clone of Boulder Dash game
Package: epiphany-data
Architecture: all
Conflicts: epiphany (<< 0.5.1-2)
Replaces: epiphany (<< 0.5.1-2)
Recommends: epiphany (>= ${Source-Version})
Description: required maps for epiphany game
This package provides all architecture-independent data files
......
01Makefile.dpatch
#! /bin/sh /usr/share/dpatch/dpatch-run
## 01Makefile.dpatch by Ricardo Mones <mones@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Set resource path
@DPATCH@
--- epiphany-0.5.1.orig/Makefile
+++ epiphany-0.5.1/Makefile
@@ -14,7 +14,7 @@
entity_steel.o entity_grass.o entity_exit.o entity_key.o pointer.o \
screen.o sprite.o menu.o game.o
-RESOURCE=-DRESOURCE_PATH="\".\""
+RESOURCE=-DRESOURCE_PATH="\"/usr/share/epiphany/\""
%.o: %.cpp
$(CXX) $(OPTFLAGS) $(DEBUGFLAGS) $(RESOURCE) -c $^
--- epiphany-0.5.1.orig/Makefile
+++ epiphany-0.5.1/Makefile
@@ -14,7 +14,7 @@
entity_steel.o entity_grass.o entity_exit.o entity_key.o pointer.o \
screen.o sprite.o menu.o game.o
-RESOURCE=-DRESOURCE_PATH="\".\""
+RESOURCE=-DRESOURCE_PATH="\"/usr/share/epiphany/\""
%.o: %.cpp
$(CXX) $(OPTFLAGS) $(DEBUGFLAGS) $(RESOURCE) -c $^
#!/usr/bin/make -f
include /usr/share/dpatch/dpatch.make
#export DH_VERBOSE=1
export DH_COMPAT=5
......@@ -20,14 +22,16 @@ else
CFLAGS += -O2
endif
build: build-stamp
build: patch build-stamp
build-stamp:
dh_testdir
$(MAKE) DEBUGFLAGS="" OPTFLAGS='$(CFLAGS)'
touch build-stamp
clean:
clean: clean-patched unpatch
clean-patched:
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment