r15740 - in packages/trunk/xmahjongg/debian: . source

Thu Apr 7 20:25:26 UTC 2016

Author: apo
Date: 2016-04-07 20:25:25 +0000 (Thu, 07 Apr 2016)
New Revision: 15740

Added:
   packages/trunk/xmahjongg/debian/source/include-binaries
   packages/trunk/xmahjongg/debian/xmahjongg.png
Modified:
   packages/trunk/xmahjongg/debian/changelog
   packages/trunk/xmahjongg/debian/compat
   packages/trunk/xmahjongg/debian/control
   packages/trunk/xmahjongg/debian/copyright
   packages/trunk/xmahjongg/debian/docs
   packages/trunk/xmahjongg/debian/rules
   packages/trunk/xmahjongg/debian/watch
   packages/trunk/xmahjongg/debian/xmahjongg.desktop
   packages/trunk/xmahjongg/debian/xmahjongg.install
Log:
Release 3.7-4


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

--- packages/trunk/xmahjongg/debian/changelog	2016-04-06 14:03:37 UTC (rev 15739)
+++ packages/trunk/xmahjongg/debian/changelog	2016-04-07 20:25:25 UTC (rev 15740)
@@ -1,14 +1,15 @@
-xmahjongg (3.7-4) UNRELEASED; urgency=low
+xmahjongg (3.7-4) unstable; urgency=medium
 
+  * Team upload.
+
   [ Paul Wise ]
   * Drop unneeded suggests on menu
 
   [ Peter Pentchev ]
-  * Switch to the 3.0 (quilt) source format:
+  * Switch to the 3.0 (quilt) source format.
     - no longer use quilt.make in the rules file
     - drop the quilt dependency
     - drop the README.source file
-  * Bump Standards-Version to 3.9.1 with no changes.
   * Update the copyright file a bit:
     - convert it to the latest DEP 5 revision (header, no Author fields)
     - break out the licenses' text into separate sections
@@ -18,18 +19,28 @@
     CPPFLAGS and LDFLAGS.
   * Install the NEWS file as a changelog and remove the Lintian override.
   * Remove a trailing space in the 01-autotools patch.
-  * Use the hardening-includes package instead of hardening-wrapper so that
-    the hardening flags are visible in CFLAGS and LDFLAGS.
-  * Let debhelper's dh_auto_configure and dh_auto_install DTRT.
-  * Bump the debhelper compatibility level to 8 with no changes.
   * Choose the small tileset if the screen is less than 1024 pixels wide.
-    Closes: #606374
+    (Closes: #606374)
 
   [ Evgeni Golov ]
   * Correct Vcs-* URLs to point to anonscm.debian.org
 
- -- Peter Pentchev <roam at ringlet.net>  Sat, 11 Dec 2010 13:21:28 +0200
+  [ Markus Koschany ]
+  * Simplify debian/rules and do not export build flags manually.
+  * Declare compliance with Debian Policy 3.9.7.
+  * Use compat level 9 and require debhelper >= 9.
+  * Vcs-Browser: Use https.
+  * Remove dpkg-dev build-dependency.
+  * Remove obsolete hardening-wrapper build-dependency.
+  * xmahjongg.desktop: Add keywords and a comment in German. Change category
+    to BoardGame.
+  * debian/watch: Use version=4.
+  * Update debian/copyright to copyright format 1.0.
+  * Use shares/backgrounds/default.gif as new desktop icon after converting it
+    to xmahjongg.png. (Closes: #726904)
 
+ -- Markus Koschany <apo at debian.org>  Thu, 07 Apr 2016 22:02:25 +0200
+
 xmahjongg (3.7-3) unstable; urgency=low
 
   * Unbreak reading layout files.  Closes: #522740

Modified: packages/trunk/xmahjongg/debian/compat
===================================================================
--- packages/trunk/xmahjongg/debian/compat	2016-04-06 14:03:37 UTC (rev 15739)
+++ packages/trunk/xmahjongg/debian/compat	2016-04-07 20:25:25 UTC (rev 15740)
@@ -1 +1 @@
-8
+9

Modified: packages/trunk/xmahjongg/debian/control
===================================================================
--- packages/trunk/xmahjongg/debian/control	2016-04-06 14:03:37 UTC (rev 15739)
+++ packages/trunk/xmahjongg/debian/control	2016-04-07 20:25:25 UTC (rev 15740)
@@ -2,20 +2,25 @@
 Section: games
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Peter Pentchev <roam at ringlet.net>
-Standards-Version: 3.9.1
-Build-Depends: debhelper (>= 8), dpkg-dev (>= 1.15.7~), libx11-dev,
-	x11proto-core-dev, hardening-includes
+Uploaders:
+ Peter Pentchev <roam at ringlet.net>
+Standards-Version: 3.9.7
+Build-Depends:
+ debhelper (>= 9),
+ libx11-dev,
+ x11proto-core-dev
 Homepage: http://www.lcdf.org/xmahjongg/
 Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/xmahjongg
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/xmahjongg/
+Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-games/packages/trunk/xmahjongg/
 
 Package: xmahjongg
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
 Description: tile-based solitaire game
  Xmahjongg is a simple implementation of the popular solitaire Mah Jongg game.
  The object is to remove all 144 tiles from the playing area by matching them
- two at a time.  Xmahjongg is the classical version with little in the way of
+ two at a time. Xmahjongg is the classical version with little in the way of
  requirements and enough aesthetical and gameplay features to provide hours
  and hours of fun.

Modified: packages/trunk/xmahjongg/debian/copyright
===================================================================
--- packages/trunk/xmahjongg/debian/copyright	2016-04-06 14:03:37 UTC (rev 15739)
+++ packages/trunk/xmahjongg/debian/copyright	2016-04-07 20:25:25 UTC (rev 15740)
@@ -1,10 +1,10 @@
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
-Name: xmahjongg
-Maintainer: Eddie Kohler <eddietwo at lcs.mit.edu>
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: xmahjongg
+Upstream-Contact: Eddie Kohler <eddietwo at lcs.mit.edu>
 Source: http://www.lcdf.org/xmahjongg/
 
 Files: *
-Copyright: Copyright (C) 1993-2000 Eddie Kohler.
+Copyright: 1993-2000 Eddie Kohler
 License: GPL-2+
 
 Files: liblcdf/clp.c include/lcdf/clp.h
@@ -12,9 +12,9 @@
 License: MIT
 
 Files: liblcdf/giffunc.c liblcdf/gifread.c liblcdf/gifx.c
-       include/gif.h include/gifx.h
+       include/lcdfgif/gif.h include/lcdfgif/gifx.h
 Copyright: Copyright (C) 1997-9 Eddie Kohler, eddietwo at lcs.mit.edu
-Licnese: GIF-GPL-2+
+License: GIF-GPL-2+
   This file is part of the GIF library.
   .
   The GIF library is free software*. It is distributed under the GNU General
@@ -58,8 +58,9 @@
 License: GPL-2+
 
 Files: debian/*
-Copyright: Copyright (C) 1998-2005  Dave Swegen <dsw at debian.org>
-           Copyright (C) 2009, 2010  Peter Pentchev <roam at ringlet.net>
+Copyright: 1998-2005,  Dave Swegen <dsw at debian.org>
+           2009, 2010, Peter Pentchev <roam at ringlet.net>
+           2016,       Markus Koschany <apo at debian.org>
 License: GPL-2+
 
 License: GPL-2+

Modified: packages/trunk/xmahjongg/debian/docs
===================================================================
--- packages/trunk/xmahjongg/debian/docs	2016-04-06 14:03:37 UTC (rev 15739)
+++ packages/trunk/xmahjongg/debian/docs	2016-04-07 20:25:25 UTC (rev 15740)
@@ -1 +1 @@
-README 
+README

Modified: packages/trunk/xmahjongg/debian/rules
===================================================================
--- packages/trunk/xmahjongg/debian/rules	2016-04-06 14:03:37 UTC (rev 15739)
+++ packages/trunk/xmahjongg/debian/rules	2016-04-07 20:25:25 UTC (rev 15740)
@@ -1,40 +1,16 @@
 #!/usr/bin/make -f
-# MAde with the aid of dh_make, by Craig Small
-# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
-# Some lines taken from debmake, by Cristoph Lameter.
-
-# Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-PACKAGE=	xmahjongg
-D=		$(CURDIR)/debian/$(PACKAGE)
+%:
+	dh $@
 
-CFLAGS=		$(shell dpkg-buildflags --get CFLAGS)
-CPPFLAGS=	$(shell dpkg-buildflags --get CPPFLAGS)
-LDFLAGS=	$(shell dpkg-buildflags --get LDFLAGS)
-
-include /usr/share/hardening-includes/hardening.make
-ifeq (,$(filter nohardening,$(DEB_BUILD_OPTIONS)))
-CFLAGS+=	$(HARDENING_CFLAGS)
-CXXFLAGS+=	$(HARDENING_CFLAGS)
-LDFLAGS+=	$(HARDENING_LDFLAGS)
-endif
-
-WARNFLAGS?=
-ifneq (,$(filter werror,$(DEB_BUILD_OPTIONS)))
-	WARNFLAGS+=	-Werror
-endif
-CFLAGS+=	${WARNFLAGS}
-CXXFLAGS+=	${WARNFLAGS}
-export CFLAGS CXXFLAGS
-
 override_dh_auto_configure:
-	dh_auto_configure -- --bindir=/usr/games --datadir=/usr/share/games
+	dh_auto_configure -- \
+		--bindir=/usr/games \
+		--datadir=/usr/share/games
 	# Avoid rebuilding config.h.in
 	touch config.h.in && touch configure && touch config.status
 
 override_dh_installchangelogs:
 	dh_installchangelogs NEWS
 
-%:
-	dh $@

Added: packages/trunk/xmahjongg/debian/source/include-binaries
===================================================================
--- packages/trunk/xmahjongg/debian/source/include-binaries	                        (rev 0)
+++ packages/trunk/xmahjongg/debian/source/include-binaries	2016-04-07 20:25:25 UTC (rev 15740)
@@ -0,0 +1 @@
+debian/xmahjongg.png

Modified: packages/trunk/xmahjongg/debian/watch
===================================================================
--- packages/trunk/xmahjongg/debian/watch	2016-04-06 14:03:37 UTC (rev 15739)
+++ packages/trunk/xmahjongg/debian/watch	2016-04-07 20:25:25 UTC (rev 15740)
@@ -1,2 +1,2 @@
-version=3
+version=4
 http://www.lcdf.org/xmahjongg/ xmahjongg-([\d.]+)\.tar\.gz

Modified: packages/trunk/xmahjongg/debian/xmahjongg.desktop
===================================================================
--- packages/trunk/xmahjongg/debian/xmahjongg.desktop	2016-04-06 14:03:37 UTC (rev 15739)
+++ packages/trunk/xmahjongg/debian/xmahjongg.desktop	2016-04-07 20:25:25 UTC (rev 15740)
@@ -6,7 +6,9 @@
 GenericName=
 Comment=A colorful solitaire Mah Jongg game
 Comment[bg_BG.UTF-8]=Премахване на купчина плочки чрез групирането им по двойки
-Icon=
-Exec=/usr/games/xmahjongg
+Comment[de]=ein farbenfrohes Mahjong-Spiel
+Icon=xmahjongg
+Exec=xmahjongg
 Terminal=false
-Categories=Game;CardGame;
+Categories=Game;BoardGame;
+Keywords=tiles;mahjongg;solitaire;

Modified: packages/trunk/xmahjongg/debian/xmahjongg.install
===================================================================
--- packages/trunk/xmahjongg/debian/xmahjongg.install	2016-04-06 14:03:37 UTC (rev 15739)
+++ packages/trunk/xmahjongg/debian/xmahjongg.install	2016-04-07 20:25:25 UTC (rev 15740)
@@ -1 +1,2 @@
-debian/xmahjongg.desktop	usr/share/applications
+debian/xmahjongg.desktop    usr/share/applications
+debian/xmahjongg.png        usr/share/icons/hicolor/128x128/apps

Added: packages/trunk/xmahjongg/debian/xmahjongg.png
===================================================================
(Binary files differ)


Property changes on: packages/trunk/xmahjongg/debian/xmahjongg.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream


