[netpanzer] 12/118: + - remove merged patches: + * 01_gcc4.1.patch + * 02_setframe_denial_of_service.patch + * netpanze depends on netpanzer-data (= ${Source-Version}) + * cdbs simple-patchsys.ml replaced by quilt + * add Aaron Perez in the debian/copyright + * add gcc-4.3.diff Thanks again Martin Michlmayr (Closes: #417445)

Sun Jun 5 10:16:23 UTC 2016

This is an automated email from the git hooks/post-receive script.

apo pushed a commit to branch master
in repository netpanzer.

commit 538c67cb21eaf513727ab703adee45dedd4f9662
Author: Gonéri Le Bouder <goneri at rulezlan.org>
Date:   Wed Jul 11 13:53:17 2007 +0000

    +   - remove merged patches:
    +    * 01_gcc4.1.patch
    +    * 02_setframe_denial_of_service.patch
    +  * netpanze depends on netpanzer-data (= ${Source-Version})
    +  * cdbs simple-patchsys.ml replaced by quilt
    +  * add Aaron Perez in the debian/copyright
    +  * add gcc-4.3.diff Thanks again Martin Michlmayr (Closes: #417445)
---
 debian/changelog                                   | 11 ++++-
 debian/control                                     |  4 +-
 debian/copyright                                   |  1 +
 debian/netpanzer-data.install                      |  1 +
 debian/netpanzer.install                           |  2 +
 debian/patches/01_gcc4.1.patch                     | 40 ------------------
 debian/patches/02_setframe_denial_of_service.patch | 15 -------
 debian/patches/gcc-4.3.diff                        | 49 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 debian/rules                                       | 24 +++++------
 10 files changed, 77 insertions(+), 71 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4d5d9aa..d9f1d3b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,18 @@
-netpanzer (0.8.2-1) UNRELEASED; urgency=low
+netpanzer (0.8.2-1) unstable; urgency=low
 
   * new upstream release (Closes: #294213)
    - merge netpanzer-data and netpanzer like upstream did
+   - remove merged patches:
+    * 01_gcc4.1.patch
+    * 02_setframe_denial_of_service.patch
   * change from pkg-games to Debian Games Team in copyright
-   - i removed this entry from 0.8+svn20060319-2 the changelog
+   - removed this entry from 0.8+svn20060319-2 changelog entry
   * creates netpanzer-dbg that provide debugging symbol in order to help
     bugchasing (thanks Fabian Fagerholm) (Closes: #401775)
+  * netpanze depends on netpanzer-data (= ${Source-Version})
+  * cdbs simple-patchsys.ml replaced by quilt
+  * add Aaron Perez in the debian/copyright
+  * add gcc-4.3.diff Thanks again Martin Michlmayr (Closes: #417445) 
 
  -- Gonéri Le Bouder <goneri at rulezlan.org>  Thu,  7 Dec 2006 18:09:04 +0100
 
diff --git a/debian/control b/debian/control
index 0a3d26c..0c09b0e 100644
--- a/debian/control
+++ b/debian/control
@@ -3,12 +3,12 @@ Section: games
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Gonéri Le Bouder <goneri at rulezlan.org>
-Build-Depends: debhelper (>= 5.0.0), jam, pkg-config (>= 0.15.0), libsdl1.2-dev, libsdl-mixer1.2-dev, libsdl-image1.2-dev, libphysfs-dev, cdbs
+Build-Depends: debhelper (>= 5.0.0), jam, pkg-config (>= 0.15.0), libsdl1.2-dev, libsdl-mixer1.2-dev, libsdl-image1.2-dev, libphysfs-dev, quilt
 Standards-Version: 3.7.2
 
 Package: netpanzer
 Architecture: any
-Depends: ${shlibs:Depends}, netpanzer-data (>= 0.8-1)
+Depends: ${shlibs:Depends}, netpanzer-data (= ${Source-Version})
 Suggests: xqf
 Description: online multiplayer tactical warfare game
  netPanzer is an isometric view real-time tactical game designed for
diff --git a/debian/copyright b/debian/copyright
index e76c80d..b246469 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -16,6 +16,7 @@ Copyright:
 
 Copyright 1998 Pyrosoft Inc. (www.pyrosoftgames.com), Matthew Bogue
 Copyright 2003-2005 Matthias Braun <matze at braunis.de> and others
+Copyright 2007 Aaron Perez <aaronps at gmail.com>
 
 License:
 
diff --git a/debian/netpanzer-data.install b/debian/netpanzer-data.install
new file mode 100644
index 0000000..4e947ec
--- /dev/null
+++ b/debian/netpanzer-data.install
@@ -0,0 +1 @@
+/usr/share/games/netpanzer
diff --git a/debian/netpanzer.install b/debian/netpanzer.install
new file mode 100644
index 0000000..693fb27
--- /dev/null
+++ b/debian/netpanzer.install
@@ -0,0 +1,2 @@
+/usr/games
+/usr/share/pixmaps
diff --git a/debian/patches/01_gcc4.1.patch b/debian/patches/01_gcc4.1.patch
deleted file mode 100644
index 7e64f6c..0000000
--- a/debian/patches/01_gcc4.1.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-## DP: author: Martin Michlmayr
-## DP: fix build on gcc4.1
-diff -ru netpanzer-0.8+svn20060319.orig/src/Lib/Network/Address.hpp netpanzer-0.8+svn20060319/src/Lib/Network/Address.hpp
---- netpanzer-0.8+svn20060319.orig/src/Lib/Network/Address.hpp	2006-03-20 17:44:11.000000000 +0100
-+++ netpanzer-0.8+svn20060319/src/Lib/Network/Address.hpp	2006-03-20 17:46:10.000000000 +0100
-@@ -34,7 +34,7 @@
-     /** resolves a hostname or IP-Number together with a port and returns a
-      * new Address object.
-      */
--    static Address Address::resolve(const std::string& name, uint16_t port);
-+    static Address resolve(const std::string& name, uint16_t port);
- 
-     /** returns the ip address of this Address as string */
-     std::string getIP() const;
-diff -ru netpanzer-0.8+svn20060319.orig/src/NetPanzer/Classes/PlayerState.hpp netpanzer-0.8+svn20060319/src/NetPanzer/Classes/PlayerState.hpp
---- netpanzer-0.8+svn20060319.orig/src/NetPanzer/Classes/PlayerState.hpp	2006-03-20 17:44:11.000000000 +0100
-+++ netpanzer-0.8+svn20060319/src/NetPanzer/Classes/PlayerState.hpp	2006-03-20 17:45:32.000000000 +0100
-@@ -81,8 +81,8 @@
- public:
-     PlayerUnitConfig unit_config;
- 
--    PlayerState::PlayerState();
--    PlayerState::PlayerState(const PlayerState& other);
-+    PlayerState();
-+    PlayerState(const PlayerState& other);
- 
-     void operator= (const PlayerState& other);
- 
-diff -ru netpanzer-0.8+svn20060319.orig/src/NetPanzer/Interfaces/Console.cpp netpanzer-0.8+svn20060319/src/NetPanzer/Interfaces/Console.cpp
---- netpanzer-0.8+svn20060319.orig/src/NetPanzer/Interfaces/Console.cpp	2006-03-20 17:44:11.000000000 +0100
-+++ netpanzer-0.8+svn20060319/src/NetPanzer/Interfaces/Console.cpp	2006-03-20 17:45:08.000000000 +0100
-@@ -46,7 +46,7 @@
-         setp(buf, buf+sizeof(buf));
-     }
- 
--    FileStampStreamBuf::~FileStampStreamBuf()
-+    ~FileStampStreamBuf()
-     {
-         sync();
-         if(file)
diff --git a/debian/patches/02_setframe_denial_of_service.patch b/debian/patches/02_setframe_denial_of_service.patch
deleted file mode 100644
index 444896e..0000000
--- a/debian/patches/02_setframe_denial_of_service.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-# use an exception instead of an assert since assert do an exit
---- src/Lib/2D/Surface.hpp.orig	2006-06-04 14:16:29.000000000 +0200
-+++ src/Lib/2D/Surface.hpp	2006-06-04 14:09:17.000000000 +0200
-@@ -366,8 +366,9 @@
- 
-     void setFrame(const float &frameNum)
-     {
--        assert(frameNum >= 0.0);
--        assert(frameNum < frameCount);
-+        if (frameNum < 0.0 || frameNum >= frameCount)
-+            return;
-+        
-         mem = frame0 + (pix.y * stride) * int(frameNum);
-     }
- 
diff --git a/debian/patches/gcc-4.3.diff b/debian/patches/gcc-4.3.diff
new file mode 100644
index 0000000..cf8c476
--- /dev/null
+++ b/debian/patches/gcc-4.3.diff
@@ -0,0 +1,49 @@
+Index: netpanzer-0.8.2/src/Lib/2D/ColorTable.cpp
+===================================================================
+--- netpanzer-0.8.2.orig/src/Lib/2D/ColorTable.cpp	2007-07-11 12:59:02.000000000 +0000
++++ netpanzer-0.8.2/src/Lib/2D/ColorTable.cpp	2007-07-11 12:59:12.000000000 +0000
+@@ -17,6 +17,8 @@
+ */
+ #include <config.h>
+ 
++#include <memory>
++
+ #include "Util/FileSystem.hpp"
+ #include "Util/Log.hpp"
+ #include "Util/Exception.hpp"
+Index: netpanzer-0.8.2/src/Lib/2D/Palette.cpp
+===================================================================
+--- netpanzer-0.8.2.orig/src/Lib/2D/Palette.cpp	2007-07-11 12:58:40.000000000 +0000
++++ netpanzer-0.8.2/src/Lib/2D/Palette.cpp	2007-07-11 12:58:52.000000000 +0000
+@@ -18,6 +18,7 @@
+ #include <config.h>
+ 
+ #include <math.h>
++#include <memory>
+ 
+ #include "Palette.hpp"
+ #include "Util/FileSystem.hpp"
+Index: netpanzer-0.8.2/src/NetPanzer/Network/ProxyServer.cpp
+===================================================================
+--- netpanzer-0.8.2.orig/src/NetPanzer/Network/ProxyServer.cpp	2007-07-11 12:59:19.000000000 +0000
++++ netpanzer-0.8.2/src/NetPanzer/Network/ProxyServer.cpp	2007-07-11 12:59:34.000000000 +0000
+@@ -17,6 +17,7 @@
+ */
+ #include <config.h>
+ 
++#include <cstdlib>
+ #include <string>
+ #include <stdexcept>
+ #include <ctype.h>
+Index: netpanzer-0.8.2/src/NetPanzer/Views/MainMenu/Multi/MapSelectionView.cpp
+===================================================================
+--- netpanzer-0.8.2.orig/src/NetPanzer/Views/MainMenu/Multi/MapSelectionView.cpp	2007-07-11 12:59:44.000000000 +0000
++++ netpanzer-0.8.2/src/NetPanzer/Views/MainMenu/Multi/MapSelectionView.cpp	2007-07-11 12:59:52.000000000 +0000
+@@ -17,6 +17,7 @@
+ */
+ #include <config.h>
+ 
++#include <memory>
+ #include <vector>
+ #include <string>
+ #include "MapSelectionView.hpp"
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..127d2ea
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+gcc-4.3.diff
diff --git a/debian/rules b/debian/rules
index c453a00..050cb83 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,6 @@
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
@@ -23,6 +22,7 @@ endif
 
 config.status: configure
 	dh_testdir
+	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
 	CFLAGS="$(CFLAGS)" ./configure --without-wx-config --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --bindir=\$${prefix}/games --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --datadir=\$${prefix}/share/games
 
 build: build-stamp
@@ -33,13 +33,13 @@ build-stamp: config.status
 
 	touch build-stamp
 
-clean::
+clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp 
-
+	
 	if test -f $(CURDIR)/Jamconfig; then jam distclean; fi
-
+	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
 	dh_clean 
 
 install: build
@@ -48,10 +48,10 @@ install: build
 	dh_clean -k 
 	dh_installdirs
 
-	jam -sprefix=$(CURDIR)/debian/netpanzer/usr \
-	-sapplicationsdir=$(CURDIR)/debian/netpanzer/usr/share/applications \
-	-sNO_DATA=1 install
-	-rm -fR debian/netpanzer/usr/share/games/
+	jam -sprefix=$(CURDIR)/debian/tmp/usr \
+	-sapplicationsdir=$(CURDIR)/debian/netpanzer/usr/share/applications install
+	rm -Rf debian/tmp/usr/share/games/doc
+	[ ! -d debian/tmp/usr/share/games/pixmaps ] || mv debian/tmp/usr/share/games/pixmaps debian/tmp/usr/share/pixmaps
 
 binary-indep: build install
 
@@ -59,16 +59,16 @@ binary-arch: build install
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs ChangeLog
-	dh_installdocs
+	dh_installdocs docs/tipofday.txt docs/serverhowto.html
 	dh_installman docs/netpanzer.6
 	dh_installmenu
-	dh_install 
+	dh_install --fail-missing --sourcedir=debian/tmp
 	dh_link
-	dh_strip
+	dh_strip --dbg-package=netpanzer-dbg
 	dh_compress
 	dh_fixperms
 	dh_installdeb
-	dh_shlibdeps --dbg-package=netpanzer-dbg
+	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/netpanzer.git

