r14480 - in packages/trunk/phlipple/debian: . patches
Miriam Ruiz
miriam at alioth.debian.org
Tue Aug 13 23:55:53 UTC 2013
Author: miriam
Date: 2013-08-13 23:55:53 +0000 (Tue, 13 Aug 2013)
New Revision: 14480
Modified:
packages/trunk/phlipple/debian/changelog
packages/trunk/phlipple/debian/compat
packages/trunk/phlipple/debian/control
packages/trunk/phlipple/debian/patches/support_us.patch
packages/trunk/phlipple/debian/rules
Log:
New Upstream Release
Modified: packages/trunk/phlipple/debian/changelog
===================================================================
--- packages/trunk/phlipple/debian/changelog 2013-08-13 21:43:39 UTC (rev 14479)
+++ packages/trunk/phlipple/debian/changelog 2013-08-13 23:55:53 UTC (rev 14480)
@@ -1,3 +1,13 @@
+phlipple (0.8.5-1) UNRELEASED; urgency=low
+
+ [ Miriam Ruiz ]
+ * New upstream release.
+ * Upgraded compat level to 9.
+ * Using hardening options in the compilation.
+ * http://phuzzboxmedia.com/games/phlipple returns 404. Replacing it.
+
+ -- Miriam Ruiz <miriam at debian.org> Wed, 14 Aug 2013 01:09:28 +0200
+
phlipple (0.8.2-2.1) unstable; urgency=low
[ Miriam Ruiz ]
Modified: packages/trunk/phlipple/debian/compat
===================================================================
--- packages/trunk/phlipple/debian/compat 2013-08-13 21:43:39 UTC (rev 14479)
+++ packages/trunk/phlipple/debian/compat 2013-08-13 23:55:53 UTC (rev 14480)
@@ -1 +1 @@
-7
+9
Modified: packages/trunk/phlipple/debian/control
===================================================================
--- packages/trunk/phlipple/debian/control 2013-08-13 21:43:39 UTC (rev 14479)
+++ packages/trunk/phlipple/debian/control 2013-08-13 23:55:53 UTC (rev 14480)
@@ -2,14 +2,14 @@
Section: games
Priority: optional
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Miriam Ruiz <little_miry at yahoo.es>
-Build-Depends: debhelper (>= 7), dh-buildinfo, quilt, autotools-dev,
+Uploaders: Miriam Ruiz <miriam at debian.org>
+Build-Depends: debhelper (>= 9), dh-buildinfo, quilt, autotools-dev,
libsdl1.2-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev,
libglew1.6-dev | libglew1.5-dev
Standards-Version: 3.9.4
-Homepage: http://phuzzboxmedia.com/games/phlipple
Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/phlipple/
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/phlipple/
+Homepage: http://sourceforge.net/projects/phlipple/
Package: phlipple
Architecture: any
Modified: packages/trunk/phlipple/debian/patches/support_us.patch
===================================================================
--- packages/trunk/phlipple/debian/patches/support_us.patch 2013-08-13 21:43:39 UTC (rev 14479)
+++ packages/trunk/phlipple/debian/patches/support_us.patch 2013-08-13 23:55:53 UTC (rev 14480)
@@ -1,104 +1,46 @@
---- phlipple-0.8.2.orig/src/mainscreen.c
-+++ phlipple-0.8.2/src/mainscreen.c
-@@ -76,8 +76,7 @@
- static int showBrowser = 0;
- static int fadeOut = 0;
+Index: phlipple-0.8.5/src/gfxconstants.h
+===================================================================
+--- phlipple-0.8.5.orig/src/gfxconstants.h 2012-05-19 13:58:35.000000000 +0200
++++ phlipple-0.8.5/src/gfxconstants.h 2013-08-14 01:28:57.000000000 +0200
+@@ -38,9 +38,8 @@
--static int highlightSupp1 = 0;
--static int highlightSupp2 = 0;
-+static int highlightSupp = 0;
-
- // 0 none, 1 quit, 2 play, 3 browser
- static int fadeAction = 0;
-@@ -204,8 +203,7 @@
- }
-
- // detect mouse over support buttonz
-- highlightSupp1 = 0;
-- highlightSupp2 = 0;
-+ highlightSupp = 0;
- float mx = (((float) OS_getMouseX() / (float) width) * (right - left))
- + left;
- float my = (((float) OS_getMouseY() / (float) height) * (bottom - top))
-@@ -213,11 +211,8 @@
-
- if (fabs(my - (bottom + buttSize / 4)) < buttSize / 4.0)
- {
-- if (fabs(mx - (left + buttSize / 2.0)) < buttSize / 2.0)
-- highlightSupp1 = 1;
+ #define COPYRIGHT "Copyright (C) Remigiusz Dybka 2012"
+ #define SEL_LEV_TXT "Select level"
+-#define LINUX_BROWSER_ANDROID "xdg-open http://market.android.com/details?id=com.phuzzboxmedia.phlipple.android"
+-#define WIN32_BROWSER_ANDROID "http://market.android.com/details?id=com.phuzzboxmedia.phlipple.android"
-
- if (fabs(mx - (right - buttSize / 2.0)) < buttSize / 2.0)
-- highlightSupp2 = 1;
-+ highlightSupp = 1;
- }
++#define LINUX_BROWSER_HOME "xdg-open http://sourceforge.net/projects/phlipple"
++#define WIN32_BROWSER_HOME "http://sourceforge.net/projects/phlipple"
- int buttPressed = 0;
-@@ -246,25 +241,14 @@
- + top;
+ //#define SHOW_SPLASH
-
-- if (highlightSupp1)
-- {
--#ifndef WIN32
-- int i = system(LINUX_BROWSER_ANDROID);
-- i++;
--#endif
--#ifdef WIN32
-- ShellExecute(NULL, "open", WIN32_BROWSER_ANDROID, NULL, NULL, SW_SHOWNORMAL);
--#endif
-- }
--
-- if (highlightSupp2)
-+ if (highlightSupp)
+Index: phlipple-0.8.5/src/mainscreen.c
+===================================================================
+--- phlipple-0.8.5.orig/src/mainscreen.c 2012-05-19 14:00:20.000000000 +0200
++++ phlipple-0.8.5/src/mainscreen.c 2013-08-14 01:20:24.000000000 +0200
+@@ -245,11 +245,11 @@
+ if (highlightSupp1)
{
#ifndef WIN32
-- int i = system(LINUX_BROWSER_APPLE);
+- int i = system(LINUX_BROWSER_ANDROID);
+ int i = system(LINUX_BROWSER_HOME);
i++;
#endif
#ifdef WIN32
-- ShellExecute(NULL, "open", WIN32_BROWSER_APPLE, NULL, NULL, SW_SHOWNORMAL);
+- ShellExecute(NULL, "open", WIN32_BROWSER_ANDROID, NULL, NULL, SW_SHOWNORMAL);
+ ShellExecute(NULL, "open", WIN32_BROWSER_HOME, NULL, NULL, SW_SHOWNORMAL);
#endif
}
-@@ -652,25 +636,10 @@
-
- float alpha = interpolator_getVal(&buttAlpha);
- alpha *= 0.5;
-- if (highlightSupp1)
-- alpha = 1.0;
--
-- // render support buttons
-- texture_apply(texSupp1);
-- glPushMatrix();
-- glColor4f(1, 1, 1, alpha);
-- glTranslatef(left + buttSize / 2, bottom + buttSize / 4, 0);
-- glScalef(buttSize, buttSize / 2.0, 0);
-- render_quad();
-- glPopMatrix();
--
--
-- alpha = interpolator_getVal(&buttAlpha);
-- alpha *= 0.5;
-- if (highlightSupp2)
-+ if (highlightSupp)
- alpha = 1.0;
-
-- texture_apply(texSupp2);
-+ texture_apply(texSupp);
- glPushMatrix();
- glColor4f(1, 1, 1, alpha);
- glTranslatef(right - buttSize / 2, bottom + buttSize / 4, 0);
---- phlipple-0.8.2.orig/src/phlipplerootscene.c
-+++ phlipple-0.8.2/src/phlipplerootscene.c
-@@ -39,8 +39,7 @@
- GLuint texTut1;
+Index: phlipple-0.8.5/src/phlipplerootscene.c
+===================================================================
+--- phlipple-0.8.5.orig/src/phlipplerootscene.c 2012-05-19 12:26:56.000000000 +0200
++++ phlipple-0.8.5/src/phlipplerootscene.c 2013-08-14 01:25:52.000000000 +0200
+@@ -40,7 +40,6 @@
GLuint texTut2;
GLuint texTut3;
--GLuint texSupp1;
+ GLuint texSupp1;
-GLuint texSupp2;
-+GLuint texSupp;
TextRenderer *txtRend;
GradientRenderer *grdRendMain;
@@ -108,40 +50,15 @@
texTut3 = texture_load("tut3.png");
- texSupp1 = texture_load("support_android.png");
- texSupp2 = texture_load("support_apple.png");
-+ texSupp = texture_load("support_us.png");
++ texSupp1 = texture_load("support_us.png");
txtRend = text_renderer_create("ubuntu_0.png", "ubuntu.fnt");
grdRendMain = gradient_renderer_create(mainGradCol0, mainGradCol1);
-@@ -131,8 +129,7 @@
- texture_destroy(texTut1);
+@@ -132,7 +130,6 @@
texture_destroy(texTut2);
texture_destroy(texTut3);
-- texture_destroy(texSupp1);
+ texture_destroy(texSupp1);
- texture_destroy(texSupp2);
-+ texture_destroy(texSupp);
text_renderer_destroy(txtRend);
gradient_renderer_destroy(grdRendMain);
---- phlipple-0.8.2.orig/src/phlipplerootscene.h
-+++ phlipple-0.8.2/src/phlipplerootscene.h
-@@ -49,8 +49,7 @@
- extern GLuint texTut1;
- extern GLuint texTut2;
- extern GLuint texTut3;
--extern GLuint texSupp1;
--extern GLuint texSupp2;
-+extern GLuint texSupp;
-
- extern TextRenderer *txtRend;
- extern GradientRenderer *grdRendMain;
---- phlipple-0.8.2.orig/src/gfxconstants.h
-+++ phlipple-0.8.2/src/gfxconstants.h
-@@ -42,6 +42,8 @@
- #define LINUX_BROWSER_APPLE "xdg-open http://itunes.apple.com/us/app/phlipple/id465466751?mt=8&uo=4"
- #define WIN32_BROWSER_ANDROID "http://market.android.com/details?id=com.phuzzboxmedia.phlipple.android"
- #define WIN32_BROWSER_APPLE "http://itunes.apple.com/us/app/phlipple/id465466751?mt=8&uo=4"
-+#define LINUX_BROWSER_HOME "xdg-open http://www.phuzzboxmedia.com/games/phlipple"
-+#define WIN32_BROWSER_HOME "http://www.phuzzboxmedia.com/games/phlipple"
-
-
- //#define SHOW_SPLASH
Modified: packages/trunk/phlipple/debian/rules
===================================================================
--- packages/trunk/phlipple/debian/rules 2013-08-13 21:43:39 UTC (rev 14479)
+++ packages/trunk/phlipple/debian/rules 2013-08-13 23:55:53 UTC (rev 14480)
@@ -3,6 +3,12 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
+CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
+LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
+LDFLAGS2:=-Wl,-z,defs -Wl,-as-needed -Wl,--no-undefined
+
# These are used for cross-compiling and for saving the configure script
# from having to guess our platform (since we know it already)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -29,8 +35,9 @@
--bindir=\$${prefix}/games \
--mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info \
- CFLAGS="$(CFLAGS)" \
- LDFLAGS="-Wl,-z,defs -Wl,--as-needed -Wl,--no-undefined"
+ CFLAGS="$(CFLAGS) $(CPPFLAGS)" \
+ CXXFLAGS="$(CXXFLAGS) $(CPPFLAGS)" \
+ LDFLAGS="$(LDFLAGS) $(LDFLAGS2)"
touch $@
build: build-stamp
More information about the Pkg-games-commits
mailing list