Author: apo Date: 2016-06-03 09:17:28 +0000 (Fri, 03 Jun 2016) New Revision: 15787
Added: packages/trunk/pathogen/debian/patches/hardening.patch Removed: packages/trunk/pathogen/debian/source/local-options Modified: packages/trunk/pathogen/debian/changelog packages/trunk/pathogen/debian/compat packages/trunk/pathogen/debian/control packages/trunk/pathogen/debian/copyright packages/trunk/pathogen/debian/docs packages/trunk/pathogen/debian/patches/01_makefile.diff packages/trunk/pathogen/debian/patches/02_fix_paths.diff packages/trunk/pathogen/debian/patches/03_errormsg_cpp.diff packages/trunk/pathogen/debian/patches/04-ftbfs-as-needed.patch packages/trunk/pathogen/debian/patches/series packages/trunk/pathogen/debian/pathogen.6 packages/trunk/pathogen/debian/pathogen.desktop packages/trunk/pathogen/debian/rules Log: Release pathogen 1.1.1-4 Modified: packages/trunk/pathogen/debian/changelog =================================================================== --- packages/trunk/pathogen/debian/changelog 2016-06-03 07:59:54 UTC (rev 15786) +++ packages/trunk/pathogen/debian/changelog 2016-06-03 09:17:28 UTC (rev 15787) @@ -1,8 +1,17 @@ -pathogen (1.1.1-4) UNRELEASED; urgency=low +pathogen (1.1.1-4) unstable; urgency=medium - * Correct Vcs-* URLs to point to anonscm.debian.org + * Team upload. + * pathogen.desktop: Add keywords and a comment in German. + * wrap-and-sort -sa. + * Use compat level 9 and require debhelper >= 9. + * Declare compliance with Debian Policy 3.9.8. + * Use canonical VCS-URI. + * Use ball.png as 64x64 pixel icon for pathogen's desktop file. + (Closes: #726848) + * Fix Lintian warning missing-license-paragraph-in-dep5-copyright. + * Add hardening.patch and build with Debian's build flags. - -- Evgeni Golov <[email protected]> Mon, 15 Jul 2013 22:21:52 +0200 + -- Markus Koschany <[email protected]> Fri, 03 Jun 2016 10:34:37 +0200 pathogen (1.1.1-3) unstable; urgency=low @@ -19,6 +28,7 @@ - Bump Standard-Version to 3.9.2, no source changes. - Add Homepage field. - Drop quilt as Build-Depends. + - Refresh SVN http viewer. * debian/copyright: Refreshed as per dep5 * Raise debhelper to 7 - debian/control @@ -26,7 +36,7 @@ * debian/rules: Use simply rules. * debian/source/*: Use quilt 3.0 as patch system. - -- Mahyuddin Susanto <[email protected]> Mon, 05 Dec 2011 16:36:28 +0700 + -- Mahyuddin Susanto <[email protected]> Mon, 05 Dec 2011 16:40:36 +0700 pathogen (1.1.1-2) unstable; urgency=low Modified: packages/trunk/pathogen/debian/compat =================================================================== --- packages/trunk/pathogen/debian/compat 2016-06-03 07:59:54 UTC (rev 15786) +++ packages/trunk/pathogen/debian/compat 2016-06-03 09:17:28 UTC (rev 15787) @@ -1 +1 @@ -7 +9 Modified: packages/trunk/pathogen/debian/control =================================================================== --- packages/trunk/pathogen/debian/control 2016-06-03 07:59:54 UTC (rev 15786) +++ packages/trunk/pathogen/debian/control 2016-06-03 09:17:28 UTC (rev 15787) @@ -2,16 +2,23 @@ Section: games Priority: optional Maintainer: Debian Games Team <[email protected]> -Uploaders: Barry deFreese <[email protected]> -Build-Depends: debhelper (>= 7.0.50~), libsdl-image1.2-dev, libsdl-mixer1.2-dev, libsdl1.2-dev -Standards-Version: 3.9.2 +Uploaders: + Barry deFreese <[email protected]> +Build-Depends: + debhelper (>= 9), + libsdl-image1.2-dev, + libsdl-mixer1.2-dev, + libsdl1.2-dev +Standards-Version: 3.9.8 Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/pathogen/ -Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/pathogen/ +Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-games/packages/trunk/pathogen/ Homepage: http://jet.ro/games/prototypes/pathogen-warrior/ Package: pathogen Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: + ${misc:Depends}, + ${shlibs:Depends} Description: Puzzle game about matching 3D model structures Pathogen Warrior is a puzzle game about matching 3D model structures with a 2D hexagon map. It was one of the entrants to the 4th Ludum Dare 48-hour Modified: packages/trunk/pathogen/debian/copyright =================================================================== --- packages/trunk/pathogen/debian/copyright 2016-06-03 07:59:54 UTC (rev 15786) +++ packages/trunk/pathogen/debian/copyright 2016-06-03 09:17:28 UTC (rev 15787) @@ -1,14 +1,17 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Contact: Jetro Lauha <[email protected]> Source: http://iki.fi/jetro/ -Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=202 +Files: * +Copyright: 2004, Jetro Lauha <[email protected]> +License: GPL-2+ + Files: debian/* -Copyright: Copyright 2004-2007, Gürkan Sengün <[email protected]> - Copyright 2008, Barry deFreese <[email protected]> +Copyright: 2004-2007, Gürkan Sengün <[email protected]> + 2008, Barry deFreese <[email protected]> + 2016, Markus Koschany <[email protected]> License: GPL-2+ -Files: * -Copyright: Copyright 2004, Jetro Lauha <[email protected]> -Upstream Author: Jetro Lauha <[email protected]> License: GPL-2+ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: packages/trunk/pathogen/debian/docs =================================================================== --- packages/trunk/pathogen/debian/docs 2016-06-03 07:59:54 UTC (rev 15786) +++ packages/trunk/pathogen/debian/docs 2016-06-03 09:17:28 UTC (rev 15787) @@ -1,3 +1,3 @@ README.txt +postmortem.txt timelog.txt -postmortem.txt Modified: packages/trunk/pathogen/debian/patches/01_makefile.diff =================================================================== --- packages/trunk/pathogen/debian/patches/01_makefile.diff 2016-06-03 07:59:54 UTC (rev 15786) +++ packages/trunk/pathogen/debian/patches/01_makefile.diff 2016-06-03 09:17:28 UTC (rev 15787) @@ -1,7 +1,16 @@ -Index: pathogen-1.1.1/Makefile +From: Debian Games Team <[email protected]> +Date: Fri, 3 Jun 2016 10:57:06 +0200 +Subject: _makefile + =================================================================== ---- pathogen-1.1.1.orig/Makefile 2008-04-16 15:37:49.000000000 -0400 -+++ pathogen-1.1.1/Makefile 2008-04-16 15:39:56.000000000 -0400 +--- + Makefile | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index 99cbc7b..511e419 100644 +--- a/Makefile ++++ b/Makefile @@ -6,8 +6,8 @@ # $Id: Makefile,v 1.2 2004/07/12 16:05:50 tonic Exp $ # $Revision: 1.2 $ @@ -13,7 +22,7 @@ all: pathogen -@@ -17,6 +17,12 @@ +@@ -17,6 +17,12 @@ LDFLAGS := $(shell sdl-config --libs) -lSDL_image -lSDL_mixer -lGLU -lGL pathogen: $(objects) $(CXX) $(LDFLAGS) -o $@ $^ Modified: packages/trunk/pathogen/debian/patches/02_fix_paths.diff =================================================================== --- packages/trunk/pathogen/debian/patches/02_fix_paths.diff 2016-06-03 07:59:54 UTC (rev 15786) +++ packages/trunk/pathogen/debian/patches/02_fix_paths.diff 2016-06-03 09:17:28 UTC (rev 15787) @@ -1,8 +1,19 @@ -Index: pathogen-1.1.1/src/BuildState.cpp +From: Debian Games Team <[email protected]> +Date: Fri, 3 Jun 2016 10:57:06 +0200 +Subject: _fix_paths + =================================================================== ---- pathogen-1.1.1.orig/src/BuildState.cpp 2008-04-16 15:42:15.000000000 -0400 -+++ pathogen-1.1.1/src/BuildState.cpp 2008-04-16 15:43:20.000000000 -0400 -@@ -147,17 +147,17 @@ +--- + src/BuildState.cpp | 22 +++++++++++----------- + src/GameApp.cpp | 2 +- + src/sound.cpp | 2 +- + 3 files changed, 13 insertions(+), 13 deletions(-) + +diff --git a/src/BuildState.cpp b/src/BuildState.cpp +index 812beef..91ae909 100644 +--- a/src/BuildState.cpp ++++ b/src/BuildState.cpp +@@ -147,17 +147,17 @@ BuildState::~BuildState() BOOL BuildState::init() { @@ -31,11 +42,11 @@ return TRUE; } -Index: pathogen-1.1.1/src/GameApp.cpp -=================================================================== ---- pathogen-1.1.1.orig/src/GameApp.cpp 2008-04-16 15:43:35.000000000 -0400 -+++ pathogen-1.1.1/src/GameApp.cpp 2008-04-16 15:44:29.000000000 -0400 -@@ -46,7 +46,7 @@ +diff --git a/src/GameApp.cpp b/src/GameApp.cpp +index 0bee6ec..559df92 100644 +--- a/src/GameApp.cpp ++++ b/src/GameApp.cpp +@@ -46,7 +46,7 @@ BOOL GameApp::init() if (!result) return result; @@ -44,10 +55,10 @@ mBuildState = new BuildState; mBuildState->init(); -Index: pathogen-1.1.1/src/sound.cpp -=================================================================== ---- pathogen-1.1.1.orig/src/sound.cpp 2008-04-16 15:44:35.000000000 -0400 -+++ pathogen-1.1.1/src/sound.cpp 2008-04-16 15:44:55.000000000 -0400 +diff --git a/src/sound.cpp b/src/sound.cpp +index 9dc04e5..6826447 100644 +--- a/src/sound.cpp ++++ b/src/sound.cpp @@ -24,7 +24,7 @@ Modified: packages/trunk/pathogen/debian/patches/03_errormsg_cpp.diff =================================================================== --- packages/trunk/pathogen/debian/patches/03_errormsg_cpp.diff 2016-06-03 07:59:54 UTC (rev 15786) +++ packages/trunk/pathogen/debian/patches/03_errormsg_cpp.diff 2016-06-03 09:17:28 UTC (rev 15787) @@ -1,7 +1,18 @@ -Index: pathogen-1.1.1/src/errormsg.cpp +From: Debian Games Team <[email protected]> +Date: Fri, 3 Jun 2016 10:57:06 +0200 +Subject: _errormsg_cpp + =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ pathogen-1.1.1/src/errormsg.cpp 2008-04-16 15:47:46.000000000 -0400 +--- + src/errormsg.cpp | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 56 insertions(+) + create mode 100644 src/errormsg.cpp + +diff --git a/src/errormsg.cpp b/src/errormsg.cpp +new file mode 100644 +index 0000000..c78fa6d +--- /dev/null ++++ b/src/errormsg.cpp @@ -0,0 +1,56 @@ +/* Pathogen Warrior + * Copyright 2004 Jetro Lauha - http://iki.fi/jetro/ Modified: packages/trunk/pathogen/debian/patches/04-ftbfs-as-needed.patch =================================================================== --- packages/trunk/pathogen/debian/patches/04-ftbfs-as-needed.patch 2016-06-03 07:59:54 UTC (rev 15786) +++ packages/trunk/pathogen/debian/patches/04-ftbfs-as-needed.patch 2016-06-03 09:17:28 UTC (rev 15787) @@ -1,12 +1,19 @@ -Description: Fix FTBFS binutils gold with ld --as-needed -Author: Alex Chiang <[email protected]> +From: Alex Chiang <[email protected]> +Date: Fri, 3 Jun 2016 10:57:07 +0200 +Subject: ftbfs-as-needed + Bug-Debian: http://bugs.debian.org/641386 Bug-Ubuntu: https://launchpad.net/bugs/770915 -Index: pathogen-1.1.1/Makefile =================================================================== ---- pathogen-1.1.1.orig/Makefile 2011-12-05 15:39:36.746847932 +0700 -+++ pathogen-1.1.1/Makefile 2011-12-05 15:39:35.426841380 +0700 -@@ -15,7 +15,7 @@ +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 511e419..5f6ffe5 100644 +--- a/Makefile ++++ b/Makefile +@@ -15,7 +15,7 @@ CXXFLAGS := $(shell sdl-config --cflags) LDFLAGS := $(shell sdl-config --libs) -lSDL_image -lSDL_mixer -lGLU -lGL pathogen: $(objects) Added: packages/trunk/pathogen/debian/patches/hardening.patch =================================================================== --- packages/trunk/pathogen/debian/patches/hardening.patch (rev 0) +++ packages/trunk/pathogen/debian/patches/hardening.patch 2016-06-03 09:17:28 UTC (rev 15787) @@ -0,0 +1,28 @@ +From: Markus Koschany <[email protected]> +Date: Fri, 3 Jun 2016 11:02:29 +0200 +Subject: hardening + +--- + Makefile | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/Makefile b/Makefile +index 5f6ffe5..297f87e 100644 +--- a/Makefile ++++ b/Makefile +@@ -11,11 +11,12 @@ objects := $(sources:%.cpp=%.o) + + all: pathogen + +-CXXFLAGS := $(shell sdl-config --cflags) +-LDFLAGS := $(shell sdl-config --libs) -lSDL_image -lSDL_mixer -lGLU -lGL ++CXXFLAGS := $(shell sdl-config --cflags) `dpkg-buildflags --get CXXFLAGS` ++LDFLAGS := $(shell sdl-config --libs) -lSDL_image -lSDL_mixer -lGLU -lGL `dpkg-buildflags --get LDFLAGS` ++CFLAGS := `dpkg-buildflags --get CFLAGS` + + pathogen: $(objects) +- $(CXX) -o $@ $^ $(LDFLAGS) ++ $(CXX) $(CFLAGS) $(CXXFLAGS) -o $@ $^ $(LDFLAGS) + + install: + mkdir -p $(DESTDIR)/usr/games Modified: packages/trunk/pathogen/debian/patches/series =================================================================== --- packages/trunk/pathogen/debian/patches/series 2016-06-03 07:59:54 UTC (rev 15786) +++ packages/trunk/pathogen/debian/patches/series 2016-06-03 09:17:28 UTC (rev 15787) @@ -2,3 +2,4 @@ 02_fix_paths.diff 03_errormsg_cpp.diff 04-ftbfs-as-needed.patch +hardening.patch Modified: packages/trunk/pathogen/debian/pathogen.6 =================================================================== --- packages/trunk/pathogen/debian/pathogen.6 2016-06-03 07:59:54 UTC (rev 15786) +++ packages/trunk/pathogen/debian/pathogen.6 2016-06-03 09:17:28 UTC (rev 15787) @@ -11,7 +11,7 @@ because the original program does not have a manual page. .PP .\" TeX users may be more comfortable with the \fB<whatever>\fP and -.\" \fI<whatever>\fP escape sequences to invode bold face and italics, +.\" \fI<whatever>\fP escape sequences to invode bold face and italics, .\" respectively. \fBPathogen Warrior\fP is a puzzle game about matching 3D model structures with a 2D hexagon map. It was one of the entrants to the 4th Ludum Dare Modified: packages/trunk/pathogen/debian/pathogen.desktop =================================================================== --- packages/trunk/pathogen/debian/pathogen.desktop 2016-06-03 07:59:54 UTC (rev 15786) +++ packages/trunk/pathogen/debian/pathogen.desktop 2016-06-03 09:17:28 UTC (rev 15787) @@ -2,9 +2,11 @@ Name=Pathogen GenericName=pathogen Comment=Destroy the pathogens +Comment[de]=Zerstöre die Pathogene Type=Application Exec=pathogen Icon=pathogen Terminal=false Categories=Game;LogicGame; +Keywords=puzzle;3D;hexagon;2D;time;limit;level;infection; Modified: packages/trunk/pathogen/debian/rules =================================================================== --- packages/trunk/pathogen/debian/rules 2016-06-03 07:59:54 UTC (rev 15786) +++ packages/trunk/pathogen/debian/rules 2016-06-03 09:17:28 UTC (rev 15787) @@ -1,17 +1,14 @@ #!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# GNU copyright 1997 to 1999 by Joey Hess. - -# Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 %: dh $@ override_dh_auto_install: - dh_clean - dh_installdirs $(MAKE) install DESTDIR=$(CURDIR)/debian/pathogen - mkdir $(CURDIR)/debian/pathogen/usr/share/applications - cp debian/pathogen.desktop $(CURDIR)/debian/pathogen/usr/share/applications/ + +override_dh_install: + dh_install + dh_install debian/pathogen.desktop usr/share/applications + mkdir -p debian/pathogen/usr/share/icons/hicolor/64x64/apps + cp data/ball.png debian/pathogen/usr/share/icons/hicolor/64x64/apps/pathogen.png Deleted: packages/trunk/pathogen/debian/source/local-options =================================================================== --- packages/trunk/pathogen/debian/source/local-options 2016-06-03 07:59:54 UTC (rev 15786) +++ packages/trunk/pathogen/debian/source/local-options 2016-06-03 09:17:28 UTC (rev 15787) @@ -1 +0,0 @@ -unapply-patches _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
