r15749 - in packages/trunk/enemylines3/debian: . patches source

Markus Koschany apo at moszumanska.debian.org
Wed Apr 13 06:42:45 UTC 2016 

Author: apo
Date: 2016-04-13 06:42:45 +0000 (Wed, 13 Apr 2016)
New Revision: 15749

Added:
   packages/trunk/enemylines3/debian/patches/hardening.patch
Removed:
   packages/trunk/enemylines3/debian/source/local-options
Modified:
   packages/trunk/enemylines3/debian/changelog
   packages/trunk/enemylines3/debian/compat
   packages/trunk/enemylines3/debian/control
   packages/trunk/enemylines3/debian/copyright
   packages/trunk/enemylines3/debian/enemylines3.desktop
   packages/trunk/enemylines3/debian/enemylines3.sgml
   packages/trunk/enemylines3/debian/patches/01_data_in_usr_share
   packages/trunk/enemylines3/debian/patches/02_fix_gcc4.1.patch
   packages/trunk/enemylines3/debian/patches/curl-include.diff
   packages/trunk/enemylines3/debian/patches/fix_gcc4.3.patch
   packages/trunk/enemylines3/debian/patches/series
   packages/trunk/enemylines3/debian/patches/use_ttf-dejavu_from_debian.diff
   packages/trunk/enemylines3/debian/rules
Log:
Release 1.2-8


Modified: packages/trunk/enemylines3/debian/changelog
===================================================================
--- packages/trunk/enemylines3/debian/changelog	2016-04-12 06:30:38 UTC (rev 15748)
+++ packages/trunk/enemylines3/debian/changelog	2016-04-13 06:42:45 UTC (rev 15749)
@@ -1,12 +1,24 @@
-enemylines3 (1.2-8) UNRELEASED; urgency=low
+enemylines3 (1.2-8) unstable; urgency=medium
 
-  * Correct Vcs-* URLs to point to anonscm.debian.org
+  * Team upload.
 
+  [ Evgeni Golov ]
+  * Correct Vcs-* URLs to point to anonscm.debian.org.
+
   [ Markus Koschany ]
   * Update menu file. Use the absolute icon path to display the menu icon.
     (Closes: #726218)
+  * wrap-and-sort -sa.
+  * Use compat level 9 and require debhelper >= 9.
+  * Vcs-Browser: Use https.
+  * Declare compliance with Debian Policy 3.9.8.
+  * enemylines3.desktop: Add keywords and a comment in German.
+  * Switch from ttf-dejavu to fonts-dejavu dependency.
+  * Update debian/copyright to copyright format 1.0.
+  * Add DEP-3 header to all patches.
+  * Add hardening.patch and enable all hardening build flags.
 
- -- Evgeni Golov <evgeni at debian.org>  Mon, 15 Jul 2013 22:21:19 +0200
+ -- Markus Koschany <apo at debian.org>  Wed, 13 Apr 2016 07:12:11 +0200
 
 enemylines3 (1.2-7) unstable; urgency=low
 

Modified: packages/trunk/enemylines3/debian/compat
===================================================================
--- packages/trunk/enemylines3/debian/compat	2016-04-12 06:30:38 UTC (rev 15748)
+++ packages/trunk/enemylines3/debian/compat	2016-04-13 06:42:45 UTC (rev 15749)
@@ -1 +1 @@
-8
+9

Modified: packages/trunk/enemylines3/debian/control
===================================================================
--- packages/trunk/enemylines3/debian/control	2016-04-12 06:30:38 UTC (rev 15748)
+++ packages/trunk/enemylines3/debian/control	2016-04-13 06:42:45 UTC (rev 15749)
@@ -2,17 +2,27 @@
 Section: games
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Barry deFreese <bdefreese at debian.org>
-Build-Depends: debhelper (>= 8), libsdl1.2-dev, libsdl-mixer1.2-dev, libsdl-ttf2.0-dev, libcurl4-gnutls-dev, docbook-to-man
-Standards-Version: 3.9.2
+Uploaders:
+ Barry deFreese <bdefreese at debian.org>
+Build-Depends:
+ debhelper (>= 9),
+ docbook-to-man,
+ libcurl4-gnutls-dev,
+ libsdl-mixer1.2-dev,
+ libsdl-ttf2.0-dev,
+ libsdl1.2-dev
+Standards-Version: 3.9.8
 Homepage: http://proj.phk.at/el/3/
 Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/enemylines3/
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/enemylines3/
+Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-games/packages/trunk/enemylines3/
 
 Package: enemylines3
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ttf-dejavu
+Depends:
+ fonts-dejavu,
+ ${misc:Depends},
+ ${shlibs:Depends}
 Description: semi-abstract first person 3d-shooter game
- single-player game. You have to shoot evil robots before they get too 
+ single-player game. You have to shoot evil robots before they get too
  close, you can use your jetpack to  escape.
  The robos can't jump but they tear down walls.

Modified: packages/trunk/enemylines3/debian/copyright
===================================================================
--- packages/trunk/enemylines3/debian/copyright	2016-04-12 06:30:38 UTC (rev 15748)
+++ packages/trunk/enemylines3/debian/copyright	2016-04-13 06:42:45 UTC (rev 15749)
@@ -1,13 +1,18 @@
-This package was debianized by Gonéri Le Bouder <goneri at rulezlan.org> on
-Sat,  1 Apr 2006 15:14:23 +0200
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: enemy lines 3
+Source: http://proj.phk.at/el/3/
 
-It was downloaded from http://raum1.memebot.com/enemylines/
+Files: *
+Copyright: 2005-2006, Raphael Pikrin
+License: GPL-2
 
-Upstream Author: Raphael Pikrin
+Files: debian/*
+Copyright: 2006-2008, Gonéri Le Bouder <goneri at rulezlan.org>
+           2009,      Barry deFreese <bdefreese at debian.org>
+           2011,      Ansgar Burchardt <ansgar at debian.org>
+           2016,      Markus Koschany <apo at debian.org>
+License: GPL-2
 
-Copyright: Copyright (C) 2005-2006 Raphael Pikrin 
-
-License:
-
-GNU Gneral Public License 2
-see /usr/share/common-licenses/GPL-2
+License: GPL-2
+ On Debian systems, the complete text of the GNU General Public License version
+ 2 can be found in `/usr/share/common-licenses/GPL-2'.

Modified: packages/trunk/enemylines3/debian/enemylines3.desktop
===================================================================
--- packages/trunk/enemylines3/debian/enemylines3.desktop	2016-04-12 06:30:38 UTC (rev 15748)
+++ packages/trunk/enemylines3/debian/enemylines3.desktop	2016-04-13 06:42:45 UTC (rev 15749)
@@ -2,8 +2,10 @@
 Name=Enemylines3
 Comment=semi-abstract first person 3d-shooter game
 Comment[fr]=Un jeu de tir à la première personne
+Comment[de]=semi-abstraktes Egoshooter-Spiel
 Exec=enemylines3
 Icon=enemylines3
 Terminal=false
 Type=Application
 Categories=Game;ArcadeGame;
+Keywords=3d;shooter;

Modified: packages/trunk/enemylines3/debian/enemylines3.sgml
===================================================================
--- packages/trunk/enemylines3/debian/enemylines3.sgml	2016-04-12 06:30:38 UTC (rev 15748)
+++ packages/trunk/enemylines3/debian/enemylines3.sgml	2016-04-13 06:42:45 UTC (rev 15749)
@@ -8,7 +8,7 @@
 manpage.1: manpage.sgml
 	docbook-to-man $< > $@
 
-    
+
 	The docbook-to-man binary is found in the docbook-to-man package.
 	Please remember that if you create the nroff version in one of the
 	debian/rules file targets (such as build), you will need to include
@@ -77,11 +77,11 @@
     </para>
 
     <para>
-    Unless started with the '-offline' parameter the game phones home on 
+    Unless started with the '-offline' parameter the game phones home on
     Gameover. It connects via HTTP to the <ulink url="http://score.phk.at/">
     hiscore server</ulink>.</para>
 
-    
+
     </para>
     <para>This manual page documents briefly the
       <command>&dhpackage;</command> command.</para>
@@ -165,7 +165,7 @@
     <para>This manual page was written by &dhusername; &dhemail; for
       the &debian; system (but may be used by others).  Permission is
       granted to copy, distribute and/or modify this document under
-      the terms of the &gnu; General Public License, Version 2 any 
+      the terms of the &gnu; General Public License, Version 2 any
 	  later version published by the Free Software Foundation.
     </para>
 	<para>

Modified: packages/trunk/enemylines3/debian/patches/01_data_in_usr_share
===================================================================
--- packages/trunk/enemylines3/debian/patches/01_data_in_usr_share	2016-04-12 06:30:38 UTC (rev 15748)
+++ packages/trunk/enemylines3/debian/patches/01_data_in_usr_share	2016-04-13 06:42:45 UTC (rev 15749)
@@ -1,3 +1,7 @@
+From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Date: Wed, 13 Apr 2016 07:30:36 +0200
+Subject: _data_in_usr_share
+
 #! /bin/sh /usr/share/dpatch/dpatch-run
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: Goneri Le Bouder
@@ -5,11 +9,15 @@
 ## DP: avoid conflit with installed from source release
 
 @DPATCH@
+---
+ main.cc | 9 ---------
+ 1 file changed, 9 deletions(-)
 
-diff -ru enemylines3-1.2.orig/main.cc enemylines3-1.2/main.cc
---- enemylines3-1.2.orig/main.cc	2006-03-30 18:16:47.000000000 +0200
-+++ enemylines3-1.2/main.cc	2006-04-01 15:49:21.000000000 +0200
-@@ -49,15 +49,6 @@
+diff --git a/main.cc b/main.cc
+index 533a94f..f9e22c5 100644
+--- a/main.cc
++++ b/main.cc
+@@ -49,15 +49,6 @@ void light() {
  void load_audio(std::string dir) {
  	std::string path;
  	if (dir=="") {

Modified: packages/trunk/enemylines3/debian/patches/02_fix_gcc4.1.patch
===================================================================
--- packages/trunk/enemylines3/debian/patches/02_fix_gcc4.1.patch	2016-04-12 06:30:38 UTC (rev 15748)
+++ packages/trunk/enemylines3/debian/patches/02_fix_gcc4.1.patch	2016-04-13 06:42:45 UTC (rev 15749)
@@ -1,3 +1,7 @@
+From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Date: Wed, 13 Apr 2016 07:30:36 +0200
+Subject: _fix_gcc4.1
+
 #! /bin/sh /usr/share/dpatch/dpatch-run
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: Goneri Le Bouder
@@ -4,10 +8,16 @@
 ## DP: fix the build with gcc-4.1 
 
 @DPATCH@
+---
+ font_ttf.h | 2 +-
+ game.cc    | 2 +-
+ map.h      | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
 
-diff -ru enemylines3-1.2.orig/font_ttf.h enemylines3-1.2/font_ttf.h
---- enemylines3-1.2.orig/font_ttf.h	2006-03-30 18:16:47.000000000 +0200
-+++ enemylines3-1.2/font_ttf.h	2006-05-03 10:07:37.000000000 +0200
+diff --git a/font_ttf.h b/font_ttf.h
+index 38434ea..6b4865f 100644
+--- a/font_ttf.h
++++ b/font_ttf.h
 @@ -7,7 +7,7 @@
  
  class Font_ttf{
@@ -17,10 +27,11 @@
  	static int dx();
  	static int dy();
  };
-diff -ru enemylines3-1.2.orig/game.cc enemylines3-1.2/game.cc
---- enemylines3-1.2.orig/game.cc	2006-03-30 18:16:47.000000000 +0200
-+++ enemylines3-1.2/game.cc	2006-05-03 10:15:04.000000000 +0200
-@@ -504,7 +504,7 @@
+diff --git a/game.cc b/game.cc
+index edb12fe..8d6dc74 100644
+--- a/game.cc
++++ b/game.cc
+@@ -504,7 +504,7 @@ void Game::tick(unsigned int ticks) {
  	}
  	wave_interval.tick(ticks);
  	if (wave_interval.check()) {
@@ -29,10 +40,11 @@
  			action(A_ADDENEMY);
  		}
  		action(A_ADDEXTRA);
-diff -ru enemylines3-1.2.orig/map.h enemylines3-1.2/map.h
---- enemylines3-1.2.orig/map.h	2006-03-30 18:16:47.000000000 +0200
-+++ enemylines3-1.2/map.h	2006-05-03 10:18:02.000000000 +0200
-@@ -24,7 +24,7 @@
+diff --git a/map.h b/map.h
+index 85e19a3..5cade0b 100644
+--- a/map.h
++++ b/map.h
+@@ -24,7 +24,7 @@ public:
  	unsigned int dz();
  
  

Modified: packages/trunk/enemylines3/debian/patches/curl-include.diff
===================================================================
--- packages/trunk/enemylines3/debian/patches/curl-include.diff	2016-04-12 06:30:38 UTC (rev 15748)
+++ packages/trunk/enemylines3/debian/patches/curl-include.diff	2016-04-13 06:42:45 UTC (rev 15749)
@@ -1,11 +1,15 @@
 From: Ansgar Burchardt <ansgar at debian.org>
 Date: Sun, 14 Aug 2011 09:54:51 +0200
 Subject: no longer include now non-existant curl/types.h
-Origin: vendor
-Bug-Debian: http://bugs.debian.org/636457
 
---- enemylines3.orig/hiscore.cc
-+++ enemylines3/hiscore.cc
+---
+ hiscore.cc | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/hiscore.cc b/hiscore.cc
+index 745b070..df7859f 100644
+--- a/hiscore.cc
++++ b/hiscore.cc
 @@ -1,7 +1,6 @@
  #include <sstream>
  #ifndef NOCURL

Modified: packages/trunk/enemylines3/debian/patches/fix_gcc4.3.patch
===================================================================
--- packages/trunk/enemylines3/debian/patches/fix_gcc4.3.patch	2016-04-12 06:30:38 UTC (rev 15748)
+++ packages/trunk/enemylines3/debian/patches/fix_gcc4.3.patch	2016-04-13 06:42:45 UTC (rev 15749)
@@ -1,18 +1,17 @@
-Index: enemylines3-1.2/random.cc
+From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Date: Wed, 13 Apr 2016 07:30:36 +0200
+Subject: fix_gcc4.3
+
 ===================================================================
---- enemylines3-1.2.orig/random.cc	2006-03-30 18:16:47.000000000 +0200
-+++ enemylines3-1.2/random.cc	2007-05-14 22:36:20.000000000 +0200
-@@ -1,5 +1,6 @@
- #include "random.h"
- 
-+#include <cstdlib>
- #include <iostream>
- 
- 
-Index: enemylines3-1.2/c3_tpl.h
-===================================================================
---- enemylines3-1.2.orig/c3_tpl.h	2007-05-14 22:37:33.000000000 +0200
-+++ enemylines3-1.2/c3_tpl.h	2007-05-14 22:38:46.000000000 +0200
+---
+ c3_tpl.h  | 1 +
+ random.cc | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/c3_tpl.h b/c3_tpl.h
+index ac4ba53..6c663ba 100644
+--- a/c3_tpl.h
++++ b/c3_tpl.h
 @@ -1,6 +1,7 @@
  #include <iostream>
  #include <sstream>
@@ -21,3 +20,14 @@
  #include <cmath>
  
  
+diff --git a/random.cc b/random.cc
+index d8147e4..b1e9dda 100644
+--- a/random.cc
++++ b/random.cc
+@@ -1,5 +1,6 @@
+ #include "random.h"
+ 
++#include <cstdlib>
+ #include <iostream>
+ 
+ 

Added: packages/trunk/enemylines3/debian/patches/hardening.patch
===================================================================
--- packages/trunk/enemylines3/debian/patches/hardening.patch	                        (rev 0)
+++ packages/trunk/enemylines3/debian/patches/hardening.patch	2016-04-13 06:42:45 UTC (rev 15749)
@@ -0,0 +1,24 @@
+From: Markus Koschany <apo at debian.org>
+Date: Wed, 13 Apr 2016 08:32:00 +0200
+Subject: hardening
+
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 0120e46..027650b 100644
+--- a/Makefile
++++ b/Makefile
+@@ -5,9 +5,9 @@ TARGET = enemylines3
+ 
+ CXX= g++
+ 
+-CXXFLAGS = -O2 -Wall `sdl-config --cflags` -I./ -Ielements/
++CXXFLAGS = `dpkg-buildflags --get CXXFLAGS` `sdl-config --cflags` -I./ -Ielements/
+ 
+-LDFLAGS = `sdl-config --libs` -lGL -lGLU -lSDL_mixer -lSDL_ttf -lcurl
++LDFLAGS = `dpkg-buildflags --get LDFLAGS` `sdl-config --libs` -lGL -lGLU -lSDL_mixer -lSDL_ttf -lcurl
+ 
+ 
+ all: $(TARGET)

Modified: packages/trunk/enemylines3/debian/patches/series
===================================================================
--- packages/trunk/enemylines3/debian/patches/series	2016-04-12 06:30:38 UTC (rev 15748)
+++ packages/trunk/enemylines3/debian/patches/series	2016-04-13 06:42:45 UTC (rev 15749)
@@ -3,3 +3,4 @@
 fix_gcc4.3.patch
 use_ttf-dejavu_from_debian.diff
 curl-include.diff
+hardening.patch

Modified: packages/trunk/enemylines3/debian/patches/use_ttf-dejavu_from_debian.diff
===================================================================
--- packages/trunk/enemylines3/debian/patches/use_ttf-dejavu_from_debian.diff	2016-04-12 06:30:38 UTC (rev 15748)
+++ packages/trunk/enemylines3/debian/patches/use_ttf-dejavu_from_debian.diff	2016-04-13 06:42:45 UTC (rev 15749)
@@ -1,8 +1,47 @@
-Index: enemylines3-1.2/main.cc
+From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Date: Wed, 13 Apr 2016 07:30:36 +0200
+Subject: use_ttf-dejavu_from_debian
+
 ===================================================================
---- enemylines3-1.2.orig/main.cc	2007-05-14 23:00:24.000000000 +0200
-+++ enemylines3-1.2/main.cc	2007-05-14 23:00:24.000000000 +0200
-@@ -63,24 +63,10 @@
+---
+ font.cc |  8 ++++----
+ main.cc | 20 +++-----------------
+ 2 files changed, 7 insertions(+), 21 deletions(-)
+
+diff --git a/font.cc b/font.cc
+index fcb9ff4..664f35a 100644
+--- a/font.cc
++++ b/font.cc
+@@ -25,20 +25,20 @@ bool Font::load(std::string path) {
+ 		return true;
+ 	#endif
+ 
+-	dl=Font_ttf::gen_dl(path+"font.ttf",11);
++	dl=Font_ttf::gen_dl(path+"DejaVuSansMono.ttf",11);
+ 	if (dl==0) return false;
+ 	Font_ogl::init_font(0,dl,6,11);
+ 
+-	dl=Font_ttf::gen_dl(path+"font.ttf",22);
++	dl=Font_ttf::gen_dl(path+"DejaVuSansMono.ttf",22);
+ 	if (dl==0) return false;
+ 	Font_ogl::init_font(1,dl,14,22);
+ 
+-	dl=Font_ttf::gen_dl(path+"font.ttf",22,C3(250,0,0));
++	dl=Font_ttf::gen_dl(path+"DejaVuSansMono.ttf",22,C3(250,0,0));
+ 	if (dl==0) return false;
+ 	Font_ogl::init_font(2,dl,14,22);
+ 
+ 
+-	dl=Font_ttf::gen_dl(path+"font.ttf",11,C3(255,255,0));
++	dl=Font_ttf::gen_dl(path+"DejaVuSansMono.ttf",11,C3(255,255,0));
+ 	if (dl==0) return false;
+ 	Font_ogl::init_font(3,dl,6,11);
+ 
+diff --git a/main.cc b/main.cc
+index f9e22c5..d536d69 100644
+--- a/main.cc
++++ b/main.cc
+@@ -63,24 +63,10 @@ void load_audio(std::string dir) {
  }
  void load_font(std::string dir) {
  	std::string path;
@@ -16,46 +55,17 @@
 -		path+="/";
 -		std::cout << "  Looking in " << path << std::endl;
 -		if (Font::load(path)) return;
--
+ 
 -		path="/usr/share/";
 -		path+=PATHNAME;
 -		path+="/";
 -		std::cout << "  Looking in " << path << std::endl;
 -		if (Font::load(path)) return;
- 
+-
 -	}
-+  path="/usr/share/fonts/truetype/ttf-dejavu/";
++  path="/usr/share/fonts/truetype/dejavu/";
 +  std::cout << "  Looking in " << path << std::endl;
 +  if (Font::load(path)) return;
  
  	if (Font::load(dir)) return;
  	std::cerr << "  Font file not found ... Using fallback." << std::endl;
-Index: enemylines3-1.2/font.cc
-===================================================================
---- enemylines3-1.2.orig/font.cc	2007-05-14 23:00:23.000000000 +0200
-+++ enemylines3-1.2/font.cc	2007-05-14 23:01:18.000000000 +0200
-@@ -25,20 +25,20 @@
- 		return true;
- 	#endif
- 
--	dl=Font_ttf::gen_dl(path+"font.ttf",11);
-+	dl=Font_ttf::gen_dl(path+"DejaVuSansMono.ttf",11);
- 	if (dl==0) return false;
- 	Font_ogl::init_font(0,dl,6,11);
- 
--	dl=Font_ttf::gen_dl(path+"font.ttf",22);
-+	dl=Font_ttf::gen_dl(path+"DejaVuSansMono.ttf",22);
- 	if (dl==0) return false;
- 	Font_ogl::init_font(1,dl,14,22);
- 
--	dl=Font_ttf::gen_dl(path+"font.ttf",22,C3(250,0,0));
-+	dl=Font_ttf::gen_dl(path+"DejaVuSansMono.ttf",22,C3(250,0,0));
- 	if (dl==0) return false;
- 	Font_ogl::init_font(2,dl,14,22);
- 
- 
--	dl=Font_ttf::gen_dl(path+"font.ttf",11,C3(255,255,0));
-+	dl=Font_ttf::gen_dl(path+"DejaVuSansMono.ttf",11,C3(255,255,0));
- 	if (dl==0) return false;
- 	Font_ogl::init_font(3,dl,6,11);
- 

Modified: packages/trunk/enemylines3/debian/rules
===================================================================
--- packages/trunk/enemylines3/debian/rules	2016-04-12 06:30:38 UTC (rev 15748)
+++ packages/trunk/enemylines3/debian/rules	2016-04-13 06:42:45 UTC (rev 15749)
@@ -1,4 +1,5 @@
 #!/usr/bin/make -f
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
 	dh $@

Deleted: packages/trunk/enemylines3/debian/source/local-options
===================================================================
--- packages/trunk/enemylines3/debian/source/local-options	2016-04-12 06:30:38 UTC (rev 15748)
+++ packages/trunk/enemylines3/debian/source/local-options	2016-04-13 06:42:45 UTC (rev 15749)
@@ -1 +0,0 @@
-abort-on-upstream-changes

More information about the Pkg-games-commits mailing list