r15884 - in packages/trunk/netrek-client-cow/debian: . patches

Thu Sep 15 22:41:18 UTC 2016

Author: apo
Date: 2016-09-15 22:41:17 +0000 (Thu, 15 Sep 2016)
New Revision: 15884

Modified:
   packages/trunk/netrek-client-cow/debian/changelog
   packages/trunk/netrek-client-cow/debian/compat
   packages/trunk/netrek-client-cow/debian/control
   packages/trunk/netrek-client-cow/debian/copyright
   packages/trunk/netrek-client-cow/debian/docs
   packages/trunk/netrek-client-cow/debian/install
   packages/trunk/netrek-client-cow/debian/patches/series
   packages/trunk/netrek-client-cow/debian/rules
   packages/trunk/netrek-client-cow/debian/watch
Log:
Release netrek-client-cow 3.3.1-1


Modified: packages/trunk/netrek-client-cow/debian/changelog
===================================================================

--- packages/trunk/netrek-client-cow/debian/changelog	2016-09-15 19:13:15 UTC (rev 15883)
+++ packages/trunk/netrek-client-cow/debian/changelog	2016-09-15 22:41:17 UTC (rev 15884)
@@ -1,9 +1,38 @@
-netrek-client-cow (3.3.0-4) UNRELEASED; urgency=low
+netrek-client-cow (3.3.1-1) unstable; urgency=medium
 
-  * Correct Vcs-* URLs to point to anonscm.debian.org
+  * Team upload.
+  * Thanks to gregor herrmann for the last NMU.
+  * New upstream version 3.3.1. (Closes: #825869)
+  * wrap-and-sort -sab.
+  * Declare compliance with Debian Policy 3.9.8.
+  * Use canonical VCS-URI.
+  * Use compat level 9.
+  * Don't export the hardening flags. Just use the defaults.
+  * Drop dpkg-dev from Build-Depends.
+  * Drop hardening-includes build-dependency. (Closes: #836758)
+  * Drop all patches except gcc5.patch which was rebased.
+    Everything else was fixed upstream.
+  * Export DEB_CFLAGS_MAINT_APPEND=-std=gnu89.
+  * Remove chmod command in override for dh_auto_install.
+  * Update d/copyright for new release.
+  * Drop menu file due to CTTE decision. (Closes: #726845)
 
- -- Evgeni Golov <evgeni at debian.org>  Mon, 15 Jul 2013 22:21:48 +0200
+ -- Markus Koschany <apo at debian.org>  Fri, 16 Sep 2016 00:08:44 +0200
 
+netrek-client-cow (3.3.0-3.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix "ftbfs with GCC-5": add patches provided by Thavatchai
+    Makphaibulchoke:
+    - add -std=gn89 to CFLAGS in debian/rules, a work around to instruct gcc-5
+      to use gnu-89 semantics for inline function declarations
+    - 006-gcc5.patch: add -P to CPPFLAGS when checking for GMP 2, a work
+      around for gcc-5 preprocessor started to emit line markers to properly
+      distinguish whether a macro token comes from a system header
+    (Closes: #778025)
+
+ -- gregor herrmann <gregoa at debian.org>  Tue, 04 Aug 2015 16:54:47 +0200
+
 netrek-client-cow (3.3.0-3) unstable; urgency=low
 
   * Team upload.

Modified: packages/trunk/netrek-client-cow/debian/compat
===================================================================
--- packages/trunk/netrek-client-cow/debian/compat	2016-09-15 19:13:15 UTC (rev 15883)
+++ packages/trunk/netrek-client-cow/debian/compat	2016-09-15 22:41:17 UTC (rev 15884)
@@ -1 +1 @@
-8
+9

Modified: packages/trunk/netrek-client-cow/debian/control
===================================================================
--- packages/trunk/netrek-client-cow/debian/control	2016-09-15 19:13:15 UTC (rev 15883)
+++ packages/trunk/netrek-client-cow/debian/control	2016-09-15 22:41:17 UTC (rev 15884)
@@ -2,16 +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), autotools-dev (>= 20100122.1), dpkg-dev (>= 1.15.7~), hardening-includes, libsdl1.2-dev, libsdl-mixer1.2-dev, libgmp-dev, libxt-dev, libxxf86vm-dev, libimlib2-dev
-Standards-Version: 3.9.2
+Uploaders:
+ Barry deFreese <bdefreese at debian.org>
+Build-Depends:
+ autotools-dev,
+ debhelper (>= 9),
+ libgmp-dev,
+ libimlib2-dev,
+ libsdl-mixer1.2-dev,
+ libsdl1.2-dev,
+ libxt-dev,
+ libxxf86vm-dev
+Standards-Version: 3.9.8
 Homepage: http://www.netrek.org
 Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/netrek-client-cow/
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/netrek-client-cow/
+Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-games/packages/trunk/netrek-client-cow/
 
 Package: netrek-client-cow
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
 Description: client for netrek online game
  This is a client for the multi-player game of Netrek.
  .

Modified: packages/trunk/netrek-client-cow/debian/copyright
===================================================================
--- packages/trunk/netrek-client-cow/debian/copyright	2016-09-15 19:13:15 UTC (rev 15883)
+++ packages/trunk/netrek-client-cow/debian/copyright	2016-09-15 22:41:17 UTC (rev 15884)
@@ -1,7 +1,7 @@
-Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=173
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Netrek COW client
 Upstream-Contact: cow at netrek.org
-Source: http://sourceforge.net/project/showfiles.php?group_id=968
+Source: http://www.netrek.org/files/COW/
 
 Files: *
 Copyright:
@@ -53,7 +53,11 @@
   Nathan Doss
   Michael Kantner
 
-Files: tools.c:
+Files: lurk.py
+Copyright: 2007, James Cameron (quozl at us.netrek.org)
+License: GPL-2+
+
+Files: tools.c
 Copyright: 1993 Kurt Siegl <007 at netrek.org>
 License: netrek-tools
   copyright 1993 Kurt Siegl <007 at netrek.org> Free to use, hack, etc.
@@ -127,7 +131,11 @@
 Copyright:
   (C) 2008, 2009  Barry deFreese <bdefreese at comcast.net>
   (C) 2011  Peter Pentchev <roam at ringlet.net>
+  (C) 2016, Markus Koschany <apo at debian.org>
 License: GPL-2+
+
+
+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; either version 2 of the License,
  or (at your option) any later version.

Modified: packages/trunk/netrek-client-cow/debian/docs
===================================================================
--- packages/trunk/netrek-client-cow/debian/docs	2016-09-15 19:13:15 UTC (rev 15883)
+++ packages/trunk/netrek-client-cow/debian/docs	2016-09-15 22:41:17 UTC (rev 15884)
@@ -1,5 +1,5 @@
+CHANGES
 README
 README.3.01
 TODO
-CHANGES
 XTREKRC.example

Modified: packages/trunk/netrek-client-cow/debian/install
===================================================================
--- packages/trunk/netrek-client-cow/debian/install	2016-09-15 19:13:15 UTC (rev 15883)
+++ packages/trunk/netrek-client-cow/debian/install	2016-09-15 22:41:17 UTC (rev 15884)
@@ -1,2 +1,2 @@
+cow.png usr/share/pixmaps
 netrek-client-cow.desktop usr/share/applications
-cow.png usr/share/pixmaps

Modified: packages/trunk/netrek-client-cow/debian/patches/series
===================================================================
--- packages/trunk/netrek-client-cow/debian/patches/series	2016-09-15 19:13:15 UTC (rev 15883)
+++ packages/trunk/netrek-client-cow/debian/patches/series	2016-09-15 22:41:17 UTC (rev 15884)
@@ -1,5 +1 @@
-001-configure-gmp-version.patch
-002-make-reallyclean.patch
-003-typos.patch
-004-honor-flags.patch
-005-hardening.patch
+gcc5.patch

Modified: packages/trunk/netrek-client-cow/debian/rules
===================================================================
--- packages/trunk/netrek-client-cow/debian/rules	2016-09-15 19:13:15 UTC (rev 15883)
+++ packages/trunk/netrek-client-cow/debian/rules	2016-09-15 22:41:17 UTC (rev 15884)
@@ -1,27 +1,10 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-
-# Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
+export DEB_CFLAGS_MAINT_APPEND=-std=gnu89
 
-CFLAGS:=	$(shell dpkg-buildflags --get CFLAGS)
-CPPFLAGS:=	$(shell dpkg-buildflags --get CPPFLAGS)
-LDFLAGS:=	$(shell dpkg-buildflags --get LDFLAGS)
+%:
+	dh $@ --with autotools_dev
 
-ifneq (,$(filter werror,$(DEB_BUILD_OPTIONS)))
-EXTRACFLAGS+=	-Werror
-endif
-
-LDFLAGS+=	-Wl,-z,defs -Wl,--as-needed
-
-include /usr/share/hardening-includes/hardening.make
-ifeq (,$(filter nohardening,$(DEB_BUILD_OPTIONS)))
-EXTRACFLAGS+=	$(HARDENING_CFLAGS)
-LDFLAGS+=	$(HARDENING_LDFLAGS)
-endif
-
-export CPPFLAGS CFLAGS EXTRACFLAGS LDFLAGS
-
 override_dh_auto_configure:
 	dh_auto_configure -- \
 		--bindir=\$${prefix}/games \
@@ -32,7 +15,4 @@
 
 override_dh_auto_install:
 	dh_auto_install -- prefix=/usr
-	chmod -x $(CURDIR)/debian/netrek-client-cow/usr/share/games/netrek-client-cow/key.cow.linux
 
-%:
-	dh $@ --with autotools_dev

Modified: packages/trunk/netrek-client-cow/debian/watch
===================================================================
--- packages/trunk/netrek-client-cow/debian/watch	2016-09-15 19:13:15 UTC (rev 15883)
+++ packages/trunk/netrek-client-cow/debian/watch	2016-09-15 22:41:17 UTC (rev 15884)
@@ -1,3 +1,2 @@
 version=3
-
 http://www.netrek.org/files/COW/netrek-client-cow-([\d.]+)\.tar\.gz


