diff -Nru pathogen-1.1.1/debian/changelog pathogen-1.1.1/debian/changelog --- pathogen-1.1.1/debian/changelog 2011-12-26 13:24:28.000000000 +0000 +++ pathogen-1.1.1/debian/changelog 2011-12-05 09:41:01.000000000 +0000 @@ -1,9 +1,27 @@ -pathogen (1.1.1-2ubuntu1) oneiric; urgency=low +pathogen (1.1.1-3) unstable; urgency=low - * 01_Makefile.diff: update to fix FTBFS with ld that defaults to --as-needed - (LP: #770915) + * Team Upload. - -- Alex Chiang Mon, 12 Sep 2011 22:48:10 -0600 + [ Paul Wise ] + * debian/rules: Drop use of dh_desktop since it no longer does anything. + + [ Mahyuddin Susanto ] + * debian/patches/04-ftbfs-as-needed.patch: Fix FTBFS with ld as-needed. + Patch from Ubuntu, Thanks to Alex Chiang + (Closes: #641386). + * debian/control: + - 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 + - debian/compat + * debian/rules: Use simply rules. + * debian/source/*: Use quilt 3.0 as patch system. + + -- Mahyuddin Susanto Mon, 05 Dec 2011 16:40:36 +0700 pathogen (1.1.1-2) unstable; urgency=low diff -Nru pathogen-1.1.1/debian/compat pathogen-1.1.1/debian/compat --- pathogen-1.1.1/debian/compat 2011-12-26 13:24:28.000000000 +0000 +++ pathogen-1.1.1/debian/compat 2011-12-05 08:49:15.000000000 +0000 @@ -1 +1 @@ -5 +7 diff -Nru pathogen-1.1.1/debian/control pathogen-1.1.1/debian/control --- pathogen-1.1.1/debian/control 2011-12-26 13:24:28.000000000 +0000 +++ pathogen-1.1.1/debian/control 2011-12-05 09:40:33.000000000 +0000 @@ -1,13 +1,13 @@ Source: pathogen Section: games Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian Games Team +Maintainer: Debian Games Team Uploaders: Barry deFreese -Build-Depends: debhelper (>= 5.0.0), quilt, libsdl-image1.2-dev, libsdl-mixer1.2-dev, libsdl1.2-dev -Standards-Version: 3.7.3 +Build-Depends: debhelper (>= 7.0.50~), libsdl-image1.2-dev, libsdl-mixer1.2-dev, libsdl1.2-dev +Standards-Version: 3.9.2 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/pathogen/ -Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/pathogen/?op=log +Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/pathogen/ +Homepage: http://jet.ro/games/prototypes/pathogen-warrior/ Package: pathogen Architecture: any diff -Nru pathogen-1.1.1/debian/copyright pathogen-1.1.1/debian/copyright --- pathogen-1.1.1/debian/copyright 2011-12-26 13:24:28.000000000 +0000 +++ pathogen-1.1.1/debian/copyright 2011-12-05 09:45:13.000000000 +0000 @@ -1,4 +1,7 @@ -Original source may be found at: http://iki.fi/jetro/ +Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=202 +Upstream-Contact: Jetro Lauha +Source: http://iki.fi/jetro/ + Files: debian/* Copyright: Copyright 2004-2007, Gürkan Sengün Copyright 2008, Barry deFreese @@ -6,21 +9,20 @@ Files: * Copyright: Copyright 2004, Jetro Lauha -Upstream Author: Jetro Lauha 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 - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this package; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. - - On Debian GNU/Linux systems, the complete text of the GNU General - Public License can be found in `/usr/share/common-licenses/GPL'. + 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 + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software Foundation, + Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + . + On Debian GNU/Linux systems, the complete text of the GNU General + Public License can be found in `/usr/share/common-licenses/GPL-2'. diff -Nru pathogen-1.1.1/debian/patches/01_makefile.diff pathogen-1.1.1/debian/patches/01_makefile.diff --- pathogen-1.1.1/debian/patches/01_makefile.diff 2011-12-26 13:24:28.000000000 +0000 +++ pathogen-1.1.1/debian/patches/01_makefile.diff 2011-12-05 08:38:46.000000000 +0000 @@ -1,7 +1,7 @@ Index: pathogen-1.1.1/Makefile =================================================================== ---- pathogen-1.1.1.orig/Makefile 2004-07-12 10:05:00.000000000 -0600 -+++ pathogen-1.1.1/Makefile 2011-09-12 22:49:14.964921411 -0600 +--- 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 @@ -6,8 +6,8 @@ # $Id: Makefile,v 1.2 2004/07/12 16:05:50 tonic Exp $ # $Revision: 1.2 $ @@ -13,18 +13,16 @@ all: pathogen -@@ -15,7 +15,13 @@ - LDFLAGS := $(shell sdl-config --libs) -lSDL_image -lSDL_mixer -lGLU -lGL - +@@ -17,6 +17,12 @@ pathogen: $(objects) -- $(CXX) $(LDFLAGS) -o $@ $^ -+ $(CXX) -o $@ $^ $(LDFLAGS) -+ + $(CXX) $(LDFLAGS) -o $@ $^ + +install: + mkdir -p $(DESTDIR)/usr/games + mkdir -p $(DESTDIR)/usr/share/pathogen + install -o root -g games -m 644 data/* $(DESTDIR)/usr/share/pathogen + install -o root -g games -m 755 pathogen $(DESTDIR)/usr/games - ++ .PHONY: clean clean: + $(RM) pathogen $(objects) diff -Nru pathogen-1.1.1/debian/patches/04-ftbfs-as-needed.patch pathogen-1.1.1/debian/patches/04-ftbfs-as-needed.patch --- pathogen-1.1.1/debian/patches/04-ftbfs-as-needed.patch 1970-01-01 00:00:00.000000000 +0000 +++ pathogen-1.1.1/debian/patches/04-ftbfs-as-needed.patch 2011-12-05 08:43:01.000000000 +0000 @@ -0,0 +1,17 @@ +Description: Fix FTBFS binutils gold with ld --as-needed +Author: Alex Chiang +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 @@ + LDFLAGS := $(shell sdl-config --libs) -lSDL_image -lSDL_mixer -lGLU -lGL + + pathogen: $(objects) +- $(CXX) $(LDFLAGS) -o $@ $^ ++ $(CXX) -o $@ $^ $(LDFLAGS) + + install: + mkdir -p $(DESTDIR)/usr/games diff -Nru pathogen-1.1.1/debian/patches/series pathogen-1.1.1/debian/patches/series --- pathogen-1.1.1/debian/patches/series 2011-12-26 13:24:28.000000000 +0000 +++ pathogen-1.1.1/debian/patches/series 2011-12-05 08:39:07.000000000 +0000 @@ -1,3 +1,4 @@ 01_makefile.diff 02_fix_paths.diff 03_errormsg_cpp.diff +04-ftbfs-as-needed.patch diff -Nru pathogen-1.1.1/debian/rules pathogen-1.1.1/debian/rules --- pathogen-1.1.1/debian/rules 2011-12-26 13:24:28.000000000 +0000 +++ pathogen-1.1.1/debian/rules 2011-12-05 09:12:27.000000000 +0000 @@ -6,73 +6,12 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -include /usr/share/quilt/quilt.make +%: + dh $@ -CFLAGS = -Wall -g - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif - -build: build-stamp -build-stamp: patch - dh_testdir - - # Add here commands to compile the package. - $(MAKE) - #/usr/bin/docbook-to-man debian/pathogen.sgml > pathogen.1 - - touch build-stamp - -clean: clean-stamp unpatch -clean-stamp: - dh_testdir - dh_testroot - rm -f build-stamp - - # Add here commands to clean up after the build process. - [ ! -f Makefile ] || $(MAKE) clean - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k +override_dh_auto_install: + dh_clean dh_installdirs - - # Add here commands to install the package into debian/pathogen. $(MAKE) install DESTDIR=$(CURDIR)/debian/pathogen - mkdir $(CURDIR)/debian/pathogen/usr/share/applications cp debian/pathogen.desktop $(CURDIR)/debian/pathogen/usr/share/applications/ - -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs - dh_installexamples -# dh_install - dh_installmenu - dh_installman - dh_desktop - dh_link - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure diff -Nru pathogen-1.1.1/debian/source/format pathogen-1.1.1/debian/source/format --- pathogen-1.1.1/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ pathogen-1.1.1/debian/source/format 2011-12-26 13:24:29.000000000 +0000 @@ -0,0 +1 @@ +3.0 (quilt)