r12935 - in packages/trunk/pathogen/debian: . patches source

Mon Dec 5 09:38:56 UTC 2011

Author: udienz-guest
Date: 2011-12-05 09:38:56 +0000 (Mon, 05 Dec 2011)
New Revision: 12935

Added:
   packages/trunk/pathogen/debian/patches/04-ftbfs-as-needed.patch
   packages/trunk/pathogen/debian/source/
   packages/trunk/pathogen/debian/source/format
   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/patches/series
   packages/trunk/pathogen/debian/rules
Log:
  * debian/patches/04-ftbfs-as-needed.patch: Fix FTBFS with ld as-needed.
    Patch from Ubuntu, Thanks to Alex Chiang <achiang at canonical.com>
    (Closes: #641386).
  * debian/control:
    - Bump Standard-Version to 3.9.2, no source changes.
    - Add Homepage field.
    - Drop quilt as Build-Depends.
  * 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.

Modified: packages/trunk/pathogen/debian/changelog
===================================================================

--- packages/trunk/pathogen/debian/changelog	2011-12-05 06:20:56 UTC (rev 12934)
+++ packages/trunk/pathogen/debian/changelog	2011-12-05 09:38:56 UTC (rev 12935)
@@ -1,9 +1,27 @@
-pathogen (1.1.1-3) UNRELEASED; urgency=low
+pathogen (1.1.1-3) unstable; urgency=low
 
-  * 
+  * Team Upload.
 
- -- Barry deFreese <bddebian at comcast.net>  Fri, 25 Apr 2008 12:15:14 -0400
+  [ 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 <achiang at canonical.com>
+    (Closes: #641386).
+  * debian/control:
+    - Bump Standard-Version to 3.9.2, no source changes.
+    - Add Homepage field.
+    - Drop quilt as Build-Depends.
+  * 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 <udienz at ubuntu.com>  Mon, 05 Dec 2011 16:36:28 +0700
+
 pathogen (1.1.1-2) unstable; urgency=low
 
   * New Maintainer. (Closes: #461897).

Modified: packages/trunk/pathogen/debian/compat
===================================================================
--- packages/trunk/pathogen/debian/compat	2011-12-05 06:20:56 UTC (rev 12934)
+++ packages/trunk/pathogen/debian/compat	2011-12-05 09:38:56 UTC (rev 12935)
@@ -1 +1 @@
-5
+7

Modified: packages/trunk/pathogen/debian/control
===================================================================
--- packages/trunk/pathogen/debian/control	2011-12-05 06:20:56 UTC (rev 12934)
+++ packages/trunk/pathogen/debian/control	2011-12-05 09:38:56 UTC (rev 12935)
@@ -3,10 +3,11 @@
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Barry deFreese <bddebian at comcast.net>
-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
+Homepage: http://jet.ro/games/prototypes/pathogen-warrior/
 
 Package: pathogen
 Architecture: any

Modified: packages/trunk/pathogen/debian/copyright
===================================================================
--- packages/trunk/pathogen/debian/copyright	2011-12-05 06:20:56 UTC (rev 12934)
+++ packages/trunk/pathogen/debian/copyright	2011-12-05 09:38:56 UTC (rev 12935)
@@ -1,4 +1,6 @@
-Original source may be found at: http://iki.fi/jetro/
+Source: http://iki.fi/jetro/
+Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=202
+
 Files: debian/*
 Copyright: Copyright 2004-2007, Gürkan Sengün <gurkan at linuks.mine.nu>
 	Copyright 2008, Barry deFreese <bddebian at comcast.net>
@@ -8,19 +10,19 @@
 Copyright: Copyright 2004, Jetro Lauha <jetro+pathogendebian at NOSPAM.iki.fi>
 Upstream Author: Jetro Lauha <jetro+pathogendebian at NOSPAM.iki.fi>
 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'.

Added: packages/trunk/pathogen/debian/patches/04-ftbfs-as-needed.patch
===================================================================
--- packages/trunk/pathogen/debian/patches/04-ftbfs-as-needed.patch	                        (rev 0)
+++ packages/trunk/pathogen/debian/patches/04-ftbfs-as-needed.patch	2011-12-05 09:38:56 UTC (rev 12935)
@@ -0,0 +1,17 @@
+Description: Fix FTBFS binutils gold with ld --as-needed
+Author: Alex Chiang <achiang at canonical.com>
+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

Modified: packages/trunk/pathogen/debian/patches/series
===================================================================
--- packages/trunk/pathogen/debian/patches/series	2011-12-05 06:20:56 UTC (rev 12934)
+++ packages/trunk/pathogen/debian/patches/series	2011-12-05 09:38:56 UTC (rev 12935)
@@ -1,3 +1,4 @@
 01_makefile.diff
 02_fix_paths.diff
 03_errormsg_cpp.diff
+04-ftbfs-as-needed.patch

Modified: packages/trunk/pathogen/debian/rules
===================================================================
--- packages/trunk/pathogen/debian/rules	2011-12-05 06:20:56 UTC (rev 12934)
+++ packages/trunk/pathogen/debian/rules	2011-12-05 09:38:56 UTC (rev 12935)
@@ -6,72 +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_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

Added: packages/trunk/pathogen/debian/source/format
===================================================================
--- packages/trunk/pathogen/debian/source/format	                        (rev 0)
+++ packages/trunk/pathogen/debian/source/format	2011-12-05 09:38:56 UTC (rev 12935)
@@ -0,0 +1 @@
+3.0 (quilt)

Added: packages/trunk/pathogen/debian/source/local-options
===================================================================
--- packages/trunk/pathogen/debian/source/local-options	                        (rev 0)
+++ packages/trunk/pathogen/debian/source/local-options	2011-12-05 09:38:56 UTC (rev 12935)
@@ -0,0 +1 @@
+unapply-patches


