r10247 - in packages/trunk/zaz/debian: . patches pkg-config
Miriam Ruiz
miriam at alioth.debian.org
Sun Aug 30 12:46:30 UTC 2009
Author: miriam
Date: 2009-08-30 12:46:30 +0000 (Sun, 30 Aug 2009)
New Revision: 10247
Added:
packages/trunk/zaz/debian/pkg-config/
packages/trunk/zaz/debian/pkg-config/gl.pc
packages/trunk/zaz/debian/pkg-config/glu.pc
Modified:
packages/trunk/zaz/debian/changelog
packages/trunk/zaz/debian/patches/no_music.patch
packages/trunk/zaz/debian/rules
Log:
New Upstream Release
Add local pkg-config files for opengl and glu
Modified: packages/trunk/zaz/debian/changelog
===================================================================
--- packages/trunk/zaz/debian/changelog 2009-08-30 12:27:20 UTC (rev 10246)
+++ packages/trunk/zaz/debian/changelog 2009-08-30 12:46:30 UTC (rev 10247)
@@ -1,3 +1,9 @@
+zaz (0.2.9+dfsg1-1) UNRELEASED; urgency=low
+
+ * New Upstream Release
+
+ -- Miriam Ruiz <little_miry at yahoo.es> Sun, 30 Aug 2009 14:34:56 +0200
+
zaz (0.2.8+dfsg1-1) UNRELEASED; urgency=low
* New Upstream Release
Modified: packages/trunk/zaz/debian/patches/no_music.patch
===================================================================
--- packages/trunk/zaz/debian/patches/no_music.patch 2009-08-30 12:27:20 UTC (rev 10246)
+++ packages/trunk/zaz/debian/patches/no_music.patch 2009-08-30 12:46:30 UTC (rev 10247)
@@ -1,6 +1,6 @@
---- zaz-0.2.8.orig/data/Makefile.am
-+++ zaz-0.2.8/data/Makefile.am
-@@ -20,10 +20,6 @@
+--- zaz-0.2.9.orig/data/Makefile.am
++++ zaz-0.2.9/data/Makefile.am
+@@ -20,11 +20,6 @@
player.png\
FreeSans.ttf\
FreeMonoBold.ttf\
@@ -8,12 +8,13 @@
- mus2.ogg\
- mus3.ogg\
- mus4.ogg\
+- mus5.ogg\
pull.ogg\
push.ogg\
ouch.ogg\
---- zaz-0.2.8.orig/data/Makefile.in
-+++ zaz-0.2.8/data/Makefile.in
-@@ -166,10 +166,6 @@
+--- zaz-0.2.9.orig/data/Makefile.in
++++ zaz-0.2.9/data/Makefile.in
+@@ -193,10 +193,6 @@
player.png\
FreeSans.ttf\
FreeMonoBold.ttf\
@@ -24,8 +25,8 @@
pull.ogg\
push.ogg\
ouch.ogg\
---- zaz-0.2.8.orig/src/mainmenu.cpp
-+++ zaz-0.2.8/src/mainmenu.cpp
+--- zaz-0.2.9.orig/src/mainmenu.cpp
++++ zaz-0.2.9/src/mainmenu.cpp
@@ -212,8 +212,8 @@
void MainMenu::StartMusic()
@@ -38,15 +39,15 @@
void MainMenu::StopMusic()
@@ -422,9 +422,9 @@
- CenterMsg("Remigiusz Dybka", 43.5, font, 0.1);
- CenterMsg("[remigiusz.dybka at gmail.com]", 41.5, font, 0.08);
+ CenterMsg(_("Remigiusz Dybka"), 43.5, font, 0.1);
+ CenterMsg(_("[remigiusz.dybka at gmail.com]"), 41.5, font, 0.08);
-- CenterMsg("music:", 37, font, 0.08);
-- CenterMsg("Nine Inch Nails", 34.5, font, 0.1);
-- CenterMsg("[http://nin.com] Released under Creative Commons Attribution Non-Commercial Share Alike License", 32.5, font, 0.08);
-+ //CenterMsg("music:", 37, font, 0.08);
-+ //CenterMsg("Nine Inch Nails", 34.5, font, 0.1);
-+ //CenterMsg("[http://nin.com] Released under Creative Commons Attribution Non-Commercial Share Alike License", 32.5, font, 0.08);
+- CenterMsg(_("music:"), 37, font, 0.08);
+- CenterMsg(_("Nine Inch Nails"), 34.5, font, 0.1);
+- CenterMsg(_("[http://nin.com] Released under Creative Commons Attribution Non-Commercial Share Alike License"), 32.5, font, 0.08);
++ //CenterMsg(_("music:"), 37, font, 0.08);
++ //CenterMsg(_("Nine Inch Nails"), 34.5, font, 0.1);
++ //CenterMsg(_("[http://nin.com] Released under Creative Commons Attribution Non-Commercial Share Alike License"), 32.5, font, 0.08);
- glLoadIdentity();
- glEnable(GL_TEXTURE_2D);
+ CenterMsg(_("quality assurance:"), 28, font, 0.08);
+ CenterMsg(_("Irena Klon & Kamil Krzyspiak"), 25.5, font, 0.1);
Added: packages/trunk/zaz/debian/pkg-config/gl.pc
===================================================================
--- packages/trunk/zaz/debian/pkg-config/gl.pc (rev 0)
+++ packages/trunk/zaz/debian/pkg-config/gl.pc 2009-08-30 12:46:30 UTC (rev 10247)
@@ -0,0 +1,11 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=/usr/lib
+includedir=/usr/include
+
+Name: gl
+Description: OpenGL Library
+Requires.private: x11 xext
+Libs: -L${libdir} -lGL
+Libs.private: -lm -lpthread
+Cflags: -I${includedir}
Added: packages/trunk/zaz/debian/pkg-config/glu.pc
===================================================================
--- packages/trunk/zaz/debian/pkg-config/glu.pc (rev 0)
+++ packages/trunk/zaz/debian/pkg-config/glu.pc 2009-08-30 12:46:30 UTC (rev 10247)
@@ -0,0 +1,12 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=/usr/lib
+includedir=/usr/include
+
+Name: glu
+Description: OpenGL Utility Library
+Requires: gl
+Requires.private:
+Libs: -L${libdir} -lGLU
+Libs.private: -lm
+Cflags: -I${includedir}
Modified: packages/trunk/zaz/debian/rules
===================================================================
--- packages/trunk/zaz/debian/rules 2009-08-30 12:27:20 UTC (rev 10246)
+++ packages/trunk/zaz/debian/rules 2009-08-30 12:46:30 UTC (rev 10247)
@@ -23,6 +23,7 @@
ifneq "$(wildcard /usr/share/misc/config.guess)" ""
cp -f /usr/share/misc/config.guess config.guess
endif
+ export PKG_CONFIG_PATH="$(CURDIR)/debian/pkg-config/" \
./configure $(CROSS) \
--prefix=/usr \
--bindir=\$${prefix}/games \
@@ -36,7 +37,8 @@
build: build-stamp
build-stamp: config
dh_testdir
- $(MAKE)
+ export PKG_CONFIG_PATH="$(CURDIR)/debian/pkg-config/" \
+ $(MAKE)
touch $@
clean: config
@@ -53,7 +55,8 @@
dh_testroot
dh_prep
dh_installdirs
- $(MAKE) DESTDIR=$(CURDIR)/debian/zaz install
+ export PKG_CONFIG_PATH="$(CURDIR)/debian/pkg-config/" \
+ $(MAKE) DESTDIR=$(CURDIR)/debian/zaz install
rm debian/zaz/usr/share/games/zaz/FreeMonoBold.ttf
ln -s /usr/share/fonts/truetype/freefont/FreeMonoBold.ttf debian/zaz/usr/share/games/zaz/FreeMonoBold.ttf
rm debian/zaz/usr/share/games/zaz/FreeSans.ttf
@@ -105,13 +108,14 @@
dh_testdir
dh_testroot
rm -f zaz-0.2.?.tar.gz
- wget http://downloads.sourceforge.net/project/zaz/zaz-0.2.8.tar.gz?use_mirror=freefr
+ wget http://downloads.sourceforge.net/project/zaz/zaz-0.2.9.tar.gz?use_mirror=freefr
rm -rf zaz-0.2.?
tar xvfz zaz-0.2.?.tar.gz
rm zaz-0.2.?.tar.gz
# Remove CC-by-sa-nc music by Nine Inch Nails
rm -f zaz-0.2.?/data/mus?.ogg
- tar cvfz ../zaz_0.2.8+dfsg1.orig.tar.gz zaz-0.2.?
+ rm -f cvfz ../zaz_0.2.9+dfsg1.orig.tar.gz
+ tar cvfz ../zaz_0.2.9+dfsg1.orig.tar.gz zaz-0.2.?
rm -r zaz-0.2.?
binary: binary-indep binary-arch
More information about the Pkg-games-commits
mailing list