r5953 - in packages/trunk/briquolo/debian: . patches
Ansgar Burchardt
ansgar-guest at alioth.debian.org
Fri Feb 29 03:38:03 UTC 2008
Author: ansgar-guest
Date: 2008-02-29 03:38:03 +0000 (Fri, 29 Feb 2008)
New Revision: 5953
Added:
packages/trunk/briquolo/debian/patches/01_desktop_entry
packages/trunk/briquolo/debian/patches/10_gcc-4.3-fixes
packages/trunk/briquolo/debian/patches/series
Removed:
packages/trunk/briquolo/debian/patches/00list
packages/trunk/briquolo/debian/patches/01_desktop_entry.dpatch
Modified:
packages/trunk/briquolo/debian/changelog
packages/trunk/briquolo/debian/control
packages/trunk/briquolo/debian/copyright
packages/trunk/briquolo/debian/rules
Log:
* Use quilt for patch management instead of dpatch
* New patch `10_gcc-4.3-fixes': Fix build with gcc-4.3 (Closes: #462203)
* Remove deprecated Encoding key from desktop file
* debian/control: Add Vcs-* fields
* debian/copyright: Change file reference to GPL-2
Modified: packages/trunk/briquolo/debian/changelog
===================================================================
--- packages/trunk/briquolo/debian/changelog 2008-02-29 02:20:18 UTC (rev 5952)
+++ packages/trunk/briquolo/debian/changelog 2008-02-29 03:38:03 UTC (rev 5953)
@@ -1,5 +1,6 @@
briquolo (0.5.6-3) UNRELEASED; urgency=low
+ [ Bradley Smith ]
* New Maintainer. Closes: #454303
* Move briquolo.desktop to /usr/share/applications. Closes: #448146
* 01_desktop_entry
@@ -17,8 +18,15 @@
* Add xpm version of icon for debian/menu
* Add copyright for debian packaging.
- -- Bradley Smith <brad at brad-smith.co.uk> Sat, 29 Dec 2007 11:33:12 +0000
+ [ Ansgar Burchardt ]
+ * Use quilt for patch management instead of dpatch
+ * New patch `10_gcc-4.3-fixes': Fix build with gcc-4.3 (Closes: #462203)
+ * Remove deprecated Encoding key from desktop file
+ * debian/control: Add Vcs-* fields
+ * debian/copyright: Change file reference to GPL-2
+ -- Ansgar Burchardt <ansgar at 43-1.org> Fri, 29 Feb 2008 04:36:42 +0100
+
briquolo (0.5.6-2) unstable; urgency=low
* Orphaning package, setting maintainer to the Debian QA Group.
Modified: packages/trunk/briquolo/debian/control
===================================================================
--- packages/trunk/briquolo/debian/control 2008-02-29 02:20:18 UTC (rev 5952)
+++ packages/trunk/briquolo/debian/control 2008-02-29 03:38:03 UTC (rev 5953)
@@ -2,9 +2,11 @@
Section: games
Priority: optional
Maintainer: Bradley Smith <brad at brad-smith.co.uk>
-Build-Depends: debhelper (>= 5), autotools-dev, libsdl1.2-dev, libsdl-mixer1.2-dev, libsdl-ttf2.0-dev, libpng12-dev, dpatch
+Build-Depends: debhelper (>= 5), autotools-dev, libsdl1.2-dev, libsdl-mixer1.2-dev, libsdl-ttf2.0-dev, libpng12-dev, quilt
Standards-Version: 3.7.3
Homepage: http://briquolo.free.fr/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/briquolo/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/briquolo/?op=log
Package: briquolo
Architecture: any
Modified: packages/trunk/briquolo/debian/copyright
===================================================================
--- packages/trunk/briquolo/debian/copyright 2008-02-29 02:20:18 UTC (rev 5952)
+++ packages/trunk/briquolo/debian/copyright 2008-02-29 03:38:03 UTC (rev 5953)
@@ -33,4 +33,4 @@
Debian packaging is also licensed under the GNU General Public License.
On Debian systems, the complete text of the GNU General Public License
-can be found in `/usr/share/common-licenses/GPL'.
+can be found in `/usr/share/common-licenses/GPL-2'.
Deleted: packages/trunk/briquolo/debian/patches/00list
===================================================================
--- packages/trunk/briquolo/debian/patches/00list 2008-02-29 02:20:18 UTC (rev 5952)
+++ packages/trunk/briquolo/debian/patches/00list 2008-02-29 03:38:03 UTC (rev 5953)
@@ -1 +0,0 @@
-01_desktop_entry
Copied: packages/trunk/briquolo/debian/patches/01_desktop_entry (from rev 5952, packages/trunk/briquolo/debian/patches/01_desktop_entry.dpatch)
===================================================================
--- packages/trunk/briquolo/debian/patches/01_desktop_entry (rev 0)
+++ packages/trunk/briquolo/debian/patches/01_desktop_entry 2008-02-29 03:38:03 UTC (rev 5953)
@@ -0,0 +1,27 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_desktop_entry.dpatch by <brad at pyrite.brad-smith.co.uk>
+##
+## DP: Tidy up Desktop Entry
+
+ at DPATCH@
+
+--- briquolo-0.5.6.orig/desktop/briquolo.desktop 2007-12-29 14:50:25.000000000 +0000
++++ briquolo-0.5.6/desktop/briquolo.desktop 2007-12-29 14:50:58.000000000 +0000
+@@ -8,15 +8,13 @@
+ Comment[fr]=Un casse brique OpenGL
+
+ Type=Application
+-Categories=ArcadeGame;Game;
++Categories=Game;ArcadeGame;
+
+-TryExec=briquolo
+ Exec=briquolo
+-FilePattern=briquolo
++TryExec=/usr/games/briquolo
+
+ Icon=briquolo.svg
+ Terminal=false
+
+ GenericName=BreakOut
+ GenericName[fr]=Casse Briques
+-Categories=Application;Game;
Deleted: packages/trunk/briquolo/debian/patches/01_desktop_entry.dpatch
===================================================================
--- packages/trunk/briquolo/debian/patches/01_desktop_entry.dpatch 2008-02-29 02:20:18 UTC (rev 5952)
+++ packages/trunk/briquolo/debian/patches/01_desktop_entry.dpatch 2008-02-29 03:38:03 UTC (rev 5953)
@@ -1,27 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_desktop_entry.dpatch by <brad at pyrite.brad-smith.co.uk>
-##
-## DP: Tidy up Desktop Entry
-
- at DPATCH@
-
---- briquolo-0.5.6.orig/desktop/briquolo.desktop 2007-12-29 14:50:25.000000000 +0000
-+++ briquolo-0.5.6/desktop/briquolo.desktop 2007-12-29 14:50:58.000000000 +0000
-@@ -8,15 +8,13 @@
- Comment[fr]=Un casse brique OpenGL
-
- Type=Application
--Categories=ArcadeGame;Game;
-+Categories=Game;ArcadeGame;
-
--TryExec=briquolo
- Exec=briquolo
--FilePattern=briquolo
-+TryExec=/usr/games/briquolo
-
- Icon=briquolo.svg
- Terminal=false
-
- GenericName=BreakOut
- GenericName[fr]=Casse Briques
--Categories=Application;Game;
Added: packages/trunk/briquolo/debian/patches/10_gcc-4.3-fixes
===================================================================
--- packages/trunk/briquolo/debian/patches/10_gcc-4.3-fixes (rev 0)
+++ packages/trunk/briquolo/debian/patches/10_gcc-4.3-fixes 2008-02-29 03:38:03 UTC (rev 5953)
@@ -0,0 +1,94 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_gcc-4.3-fixes.dpatch.dpatch by <ansgar at 43-1.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix compliation with gcc-4.3
+
+ at DPATCH@
+Index: briquolo-0.5.6/src/MOGL/MOGL_EnsembleObjet.cpp
+===================================================================
+--- briquolo-0.5.6.orig/src/MOGL/MOGL_EnsembleObjet.cpp
++++ briquolo-0.5.6/src/MOGL/MOGL_EnsembleObjet.cpp
+@@ -23,7 +23,8 @@
+ #include "MOGL_Armature.h"
+ #include "MOGL_Peau.h"
+ //#include
+-#include <stdio.h>
++#include <cstdio>
++#include <cstring>
+
+ //#include <mmsystem.h>
+
+Index: briquolo-0.5.6/src/MOGL/MOGL_GestionnaireObjet.cpp
+===================================================================
+--- briquolo-0.5.6.orig/src/MOGL/MOGL_GestionnaireObjet.cpp
++++ briquolo-0.5.6/src/MOGL/MOGL_GestionnaireObjet.cpp
+@@ -20,6 +20,7 @@
+ *
+ *****************************************************************************/
+ #include "MOGL_GestionnaireObjet.h"
++#include <cstring>
+
+ bool MOGL_GestionnaireObjet::ChargerObjetASCTriangle(const char * p_NomFichier, const MOGL_GestionnaireTexture & p_GM,
+ MOGL_Objet & p_Objet)
+Index: briquolo-0.5.6/src/MOGL/MOGL_GestionnaireObjet.h
+===================================================================
+--- briquolo-0.5.6.orig/src/MOGL/MOGL_GestionnaireObjet.h
++++ briquolo-0.5.6/src/MOGL/MOGL_GestionnaireObjet.h
+@@ -24,7 +24,7 @@
+
+ #include <vector>
+ #include <iostream>
+-#include <stdio.h>
++#include <cstdio>
+
+ #include "MOGL_Triangle.h"
+ #include "MOGL_Objet.h"
+Index: briquolo-0.5.6/src/MOGL/MOGL_Objet.cpp
+===================================================================
+--- briquolo-0.5.6.orig/src/MOGL/MOGL_Objet.cpp
++++ briquolo-0.5.6/src/MOGL/MOGL_Objet.cpp
+@@ -20,6 +20,7 @@
+ *
+ *****************************************************************************/
+ #include "MOGL_Objet.h"
++#include <cstdlib>
+
+ //MOGL_Objet::MOGL_Objet(): MOGL_ObjetAbstrait(), MOGL_ElementArbre()
+ MOGL_Objet::MOGL_Objet(): MOGL_Noeud(), _ModifieTriangle(true), _ModifieStrip(true),
+Index: briquolo-0.5.6/src/MOGL/MOGL_Peau.cpp
+===================================================================
+--- briquolo-0.5.6.orig/src/MOGL/MOGL_Peau.cpp
++++ briquolo-0.5.6/src/MOGL/MOGL_Peau.cpp
+@@ -20,6 +20,7 @@
+ *
+ *****************************************************************************/
+ #include "MOGL_Peau.h"
++#include <cstdlib>
+
+ MOGL_Peau::MOGL_Peau(): MOGL_Noeud(), _ModifieTriangle(true)
+ {
+Index: briquolo-0.5.6/src/Constante.cpp
+===================================================================
+--- briquolo-0.5.6.orig/src/Constante.cpp
++++ briquolo-0.5.6/src/Constante.cpp
+@@ -20,6 +20,7 @@
+ *
+ *****************************************************************************/
+ #include "Constante.h"
++#include <cstdlib>
+
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+Index: briquolo-0.5.6/src/I18n.cpp
+===================================================================
+--- briquolo-0.5.6.orig/src/I18n.cpp
++++ briquolo-0.5.6/src/I18n.cpp
+@@ -22,6 +22,7 @@
+ #include "I18n.h"
+ #include <iostream>
+ #include "Constante.h"
++#include <cstdlib>
+
+ #ifdef WIN32
+ #include <windows.h>
Added: packages/trunk/briquolo/debian/patches/series
===================================================================
--- packages/trunk/briquolo/debian/patches/series (rev 0)
+++ packages/trunk/briquolo/debian/patches/series 2008-02-29 03:38:03 UTC (rev 5953)
@@ -0,0 +1,2 @@
+01_desktop_entry
+10_gcc-4.3-fixes
Modified: packages/trunk/briquolo/debian/rules
===================================================================
--- packages/trunk/briquolo/debian/rules 2008-02-29 02:20:18 UTC (rev 5952)
+++ packages/trunk/briquolo/debian/rules 2008-02-29 03:38:03 UTC (rev 5953)
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -13,7 +13,7 @@
CFLAGS += -O2
endif
-config.status: patch configure
+config.status: $(QUILT_STAMPFN) configure
dh_testdir
CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --datadir=\$${prefix}/share/games --bindir=\$${prefix}/games --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
@@ -24,7 +24,8 @@
$(MAKE)
touch build-stamp
-clean: unpatch
+clean: clean-patched unpatch
+clean-patched:
dh_testdir
dh_testroot
rm -f build-stamp
More information about the Pkg-games-commits
mailing list