r15717 - in packages/trunk/zaz/debian: . patches
Markus Koschany
apo-guest at moszumanska.debian.org
Mon Mar 28 23:41:44 UTC 2016
Author: apo-guest
Date: 2016-03-28 23:41:44 +0000 (Mon, 28 Mar 2016)
New Revision: 15717
Added:
packages/trunk/zaz/debian/patches/clang-ftbfs.patch
packages/trunk/zaz/debian/patches/desktop-file.patch
packages/trunk/zaz/debian/zaz.manpages
Modified:
packages/trunk/zaz/debian/changelog
packages/trunk/zaz/debian/control
packages/trunk/zaz/debian/copyright
packages/trunk/zaz/debian/patches/libvorbis.patch
packages/trunk/zaz/debian/patches/series
packages/trunk/zaz/debian/rules
packages/trunk/zaz/debian/zaz.6
Log:
1.0.0~dfsg1-4
Modified: packages/trunk/zaz/debian/changelog
===================================================================
--- packages/trunk/zaz/debian/changelog 2016-03-25 19:30:27 UTC (rev 15716)
+++ packages/trunk/zaz/debian/changelog 2016-03-28 23:41:44 UTC (rev 15717)
@@ -1,3 +1,24 @@
+zaz (1.0.0~dfsg1-4) unstable; urgency=medium
+
+ * Team upload.
+ * Declare compliance with Debian Policy 3.9.7.
+ * Vcs-Browser: Use https.
+ * Use homepage address at sourceforge.net.
+ Thanks to Vasudev Kamath for the report. (Closes: #696481)
+ * Switch dependencies from ttf-freefont to fonts-freefont-ttf.
+ Thanks to Christian Perrier for the report. (Closes: #738262)
+ * Fix FTBFS with clang compiler.
+ Thanks to Alexander for the report and patch. (Closes: #753340)
+ * d/copyright: Fix copyright format 1.0 syntax errors.
+ * Switch to dh sequencer and simplify debian/rules.
+ * Install man page with zaz.manpages file.
+ * d/rules: Remove empty directories.
+ * Drop -dbg package because the automatic -dbgsym package is available now.
+ * Add desktop-file.patch. Add keywords, remove unused MimeType key and add a
+ comment in German.
+
+ -- Markus Koschany <apo at debian.org> Tue, 29 Mar 2016 01:31:17 +0200
+
zaz (1.0.0~dfsg1-3) unstable; urgency=medium
[ Peter Pentchev ]
@@ -2,10 +23,6 @@
* Team upload.
- * Link with libvorbis, not just libvorbisenc. Closes: #768718
+ * Link with libvorbis, not just libvorbisenc. Closes: #768718
- [ Miriam Ruiz ]
- * Upgraded Standards-Version from 3.9.4 to 3.9.6
- * Added Peter Pentchev <roam at ringlet.net> to Uploaders.
+ -- Scott Kitterman <scott at kitterman.com> Mon, 24 Nov 2014 19:30:11 -0500
- -- Peter Pentchev <roam at ringlet.net> Mon, 10 Nov 2014 12:04:13 +0200
-
zaz (1.0.0~dfsg1-2) unstable; urgency=low
Modified: packages/trunk/zaz/debian/control
===================================================================
--- packages/trunk/zaz/debian/control 2016-03-25 19:30:27 UTC (rev 15716)
+++ packages/trunk/zaz/debian/control 2016-03-28 23:41:44 UTC (rev 15717)
@@ -2,7 +2,7 @@
Section: games
Priority: optional
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Miriam Ruiz <miriam at debian.org>, Peter Pentchev <roam at ringlet.net>
+Uploaders: Miriam Ruiz <miriam at debian.org>
Build-Depends:
autotools-dev,
debhelper (>= 9),
@@ -16,20 +16,19 @@
libvorbis-dev,
libxext-dev,
pkg-config,
- ttf-freefont
-Standards-Version: 3.9.6
-Homepage: http://phuzzboxmedia.com/games/open-sourced-zaz
+ fonts-freefont-ttf
+Standards-Version: 3.9.7
+Homepage: http://zaz.sourceforge.net/
Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/zaz/
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/zaz/
+Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-games/packages/trunk/zaz/
Package: zaz
Architecture: any
Depends:
- ttf-freefont,
+ fonts-freefont-ttf,
zaz-data (>= ${source:Version}),
${misc:Depends},
${shlibs:Depends}
-Suggests: zaz-dbg (= ${binary:Version})
Description: arcade action puzzle game
Zaz is an arcade action puzzle game where the goal is to get rid of
all incoming balls by rearranging their order and making triplets.
@@ -48,13 +47,3 @@
.
This package contains the game data.
-Package: zaz-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends: zaz (= ${binary:Version}), ${misc:Depends}
-Description: arcade action puzzle game - debug
- Zaz is an arcade action puzzle game where the goal is to get rid of
- all incoming balls by rearranging their order.
- .
- This package contains the debugging symbols.
Modified: packages/trunk/zaz/debian/copyright
===================================================================
--- packages/trunk/zaz/debian/copyright 2016-03-25 19:30:27 UTC (rev 15716)
+++ packages/trunk/zaz/debian/copyright 2016-03-28 23:41:44 UTC (rev 15717)
@@ -1,24 +1,26 @@
-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
-Upstream-Source: http://sourceforge.net/projects/zaz/
-Upstream-Maintainer: Remigiusz Dybka <remigiusz.dybka at gmail.com>
-Debianized-By: Miriam Ruiz <little_miry at yahoo.es>
-Debianized-Date: Sat, 22 Aug 2009 21:06:09 +0200
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: http://sourceforge.net/projects/zaz/
+Upstream-Contact: Remigiusz Dybka <remigiusz.dybka at gmail.com>
+Comment:
+ Debianized-By: Miriam Ruiz <little_miry at yahoo.es>
+ Debianized-Date: Sat, 22 Aug 2009 21:06:09 +0200
Files: *
Copyright: Copyright (C) 2009, Remigiusz Dybka <remigiusz.dybka at gmail.com>
-Licence: GPL-3+
+License: GPL-3+
Files: data/FreeSans.ttf data/FreeMonoBold.ttf
Copyright: Copyright (C) 2002 Free Software Foundation
-Licence: GPL-2+
+License: GPL-2+
-File: src/gettext.h
+Files: src/gettext.h
Copyright: 1995-2006 Free Software Foundation
-Licence: GPL-2+
+License: GPL-2+
Files: data/font1.ttf
Copyright: Copyright (C) 2003, Phranzysko
License: OFL-1.1
+Comment:
The font can be downloaded from:
http://www.fontspace.com/phranzyskos-handwriting-fonts/dignas-handwriting
.
@@ -28,9 +30,9 @@
Files: debian/*
Copyright: Copyright (C) 2009, Miriam Ruiz <little_miry at yahoo.es>
-Licence: GPL-3+
+License: GPL-3+
-Licence: GPL-3+
+License: GPL-3+
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 3 of the License, or
@@ -39,7 +41,7 @@
On Debian systems, the complete text of version 3 of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL-3'.
-Licence: 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 as published by
the Free Software Foundation; either version 2 of the License, or
@@ -48,7 +50,7 @@
On Debian systems, the complete text of version 2 of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL-2'.
-Licence: OFL-1.1
+License: OFL-1.1
-----------------------------------------------------------
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
-----------------------------------------------------------
Added: packages/trunk/zaz/debian/patches/clang-ftbfs.patch
===================================================================
--- packages/trunk/zaz/debian/patches/clang-ftbfs.patch (rev 0)
+++ packages/trunk/zaz/debian/patches/clang-ftbfs.patch 2016-03-28 23:41:44 UTC (rev 15717)
@@ -0,0 +1,38 @@
+From: Alexander <sanek23994 at gmail.com>
+Date: Tue, 29 Mar 2016 00:33:05 +0200
+Subject: clang ftbfs
+
+Fix FTBFS with clang compiler.
+
+Bug: https://bugs.debian.org/753340
+---
+ src/mixer.cpp | 2 +-
+ src/mixer.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/mixer.cpp b/src/mixer.cpp
+index b6af4d6..acb8c21 100644
+--- a/src/mixer.cpp
++++ b/src/mixer.cpp
+@@ -23,7 +23,7 @@
+
+ namespace Scenes
+ {
+-Mixer::Mixer(MixerMode mmode = Realtime)
++Mixer::Mixer(MixerMode mmode)
+ : mode(mmode), isPlaying(false)
+ {
+ mut_disposeList = SDL_CreateMutex();
+diff --git a/src/mixer.h b/src/mixer.h
+index f1a636d..f6dd33c 100644
+--- a/src/mixer.h
++++ b/src/mixer.h
+@@ -46,7 +46,7 @@ private:
+ bool audioHWInitialized;
+
+ public:
+- Mixer(MixerMode mmode);
++ Mixer(MixerMode mmode = Realtime);
+ ~Mixer();
+ void Play();
+ void Pause();
Added: packages/trunk/zaz/debian/patches/desktop-file.patch
===================================================================
--- packages/trunk/zaz/debian/patches/desktop-file.patch (rev 0)
+++ packages/trunk/zaz/debian/patches/desktop-file.patch 2016-03-28 23:41:44 UTC (rev 15717)
@@ -0,0 +1,24 @@
+From: Markus Koschany <apo at debian.org>
+Date: Tue, 29 Mar 2016 01:07:01 +0200
+Subject: desktop file
+
+Forwarded: no
+---
+ extra/zaz.desktop | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/extra/zaz.desktop b/extra/zaz.desktop
+index 55bcdb6..06a229b 100755
+--- a/extra/zaz.desktop
++++ b/extra/zaz.desktop
+@@ -5,8 +5,9 @@ Name=Zaz
+ Comment=Zaz ain't Z***
+ Comment[ru]=Zaz не клон Z***
+ Comment[tr]=Top Yok Etme Oyunu
++Comment[de]=Zaz ist nicht Z***
+ TryExec=zaz
+ Exec=zaz
+ Categories=Game;LogicGame;
+ Icon=zaz
+-MimeType=
++Keywords=puzzle;logic;3D;
Modified: packages/trunk/zaz/debian/patches/libvorbis.patch
===================================================================
--- packages/trunk/zaz/debian/patches/libvorbis.patch 2016-03-25 19:30:27 UTC (rev 15716)
+++ packages/trunk/zaz/debian/patches/libvorbis.patch 2016-03-28 23:41:44 UTC (rev 15717)
@@ -14,11 +14,9 @@
Forwarded: not-yet
Last-Update: 2014-11-10
-Index: zaz-1.0.0/src/Makefile.in
-===================================================================
---- zaz-1.0.0.orig/src/Makefile.in
-+++ zaz-1.0.0/src/Makefile.in
-@@ -273,7 +273,7 @@ zaz_SOURCES = \
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -273,7 +273,7 @@
splash.cpp
zaz_LDFLAGS =
Modified: packages/trunk/zaz/debian/patches/series
===================================================================
--- packages/trunk/zaz/debian/patches/series 2016-03-25 19:30:27 UTC (rev 15716)
+++ packages/trunk/zaz/debian/patches/series 2016-03-28 23:41:44 UTC (rev 15717)
@@ -3,3 +3,5 @@
mismatched_delete.patch
jumpy_keyboard.patch
libvorbis.patch
+clang-ftbfs.patch
+desktop-file.patch
Modified: packages/trunk/zaz/debian/rules
===================================================================
--- packages/trunk/zaz/debian/rules 2016-03-25 19:30:27 UTC (rev 15716)
+++ packages/trunk/zaz/debian/rules 2016-03-28 23:41:44 UTC (rev 15717)
@@ -1,6 +1,4 @@
#!/usr/bin/make -f
-
-# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
@@ -9,35 +7,11 @@
LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
LDFLAGS2:=-Wl,-z,defs -Wl,-as-needed -Wl,--no-undefined
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
-CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
-else
-CROSS= --build $(DEB_BUILD_GNU_TYPE)
-endif
+%:
+ dh $@ --with autotools_dev
-PKG_CONFIG_PATH=""
-ifeq "$(wildcard /usr/lib/pkgconfig/gl.pc)" ""
- PKG_CONFIG_PATH=$(CURDIR)/debian/pkg-config/
-endif
-ifeq "$(wildcard /usr/lib/pkgconfig/glu.pc)" ""
- PKG_CONFIG_PATH=$(CURDIR)/debian/pkg-config/
-endif
-
-config: config-stamp
-config-stamp:
- dh_testdir
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- cp -f /usr/share/misc/config.guess config.guess
-endif
- export PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" && \
- ./configure $(CROSS) \
+override_dh_auto_configure:
+ dh_auto_configure -- \
--prefix=/usr \
--bindir=\$${prefix}/games \
--datarootdir=\$${prefix}/share/games \
@@ -46,30 +20,9 @@
CFLAGS="$(CFLAGS) $(CPPFLAGS)" \
CXXFLAGS="$(CXXFLAGS) $(CPPFLAGS)" \
LDFLAGS="$(LDFLAGS) $(LDFLAGS2)"
- touch $@
-build: build-stamp
-build-stamp: config
- dh_testdir
- export PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" && \
- $(MAKE)
- touch $@
-
-clean: config
- dh_testdir
- dh_testroot
- rm -fv build-stamp config-stamp
- [ ! -f Makefile ] || $(MAKE) distclean
- rm -fv config.sub config.guess
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs
- export PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" && \
- $(MAKE) DESTDIR=$(CURDIR)/debian/zaz install
+override_dh_auto_install:
+ $(MAKE) DESTDIR=$(CURDIR)/debian/zaz install
rm -v debian/zaz/usr/share/games/zaz/FreeMonoBold.ttf
ln -s /usr/share/fonts/truetype/freefont/FreeMonoBold.ttf debian/zaz/usr/share/games/zaz/FreeMonoBold.ttf
rm -v debian/zaz/usr/share/games/zaz/FreeSans.ttf
@@ -78,43 +31,9 @@
mv debian/zaz/usr/share/games/applications/ debian/zaz/usr/share/
mv debian/zaz/usr/share/games/pixmaps/ debian/zaz/usr/share/
dh_movefiles --sourcedir=debian/zaz
+ find . -type d -empty -delete
-# Build architecture-independent files here.
-binary-indep: install
- dh_testdir
- dh_testroot
- dh_installchangelogs -i
- dh_installdocs -i
- dh_installexamples -i
- dh_install -i
- dh_link -i
- dh_compress -i
- dh_fixperms -i
- dh_installdeb -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i
-# Build architecture-dependent files here.
-binary-arch: install
- dh_testdir
- dh_testroot
- dh_installchangelogs -a
- dh_installdocs -a
- dh_installexamples -a
- dh_install -a
-# dh_installmenu -a
- dh_installman debian/zaz.6 -a
- dh_link -a
- dh_strip -a --dbg-package=zaz-dbg
- dh_compress -a
- dh_fixperms -a
- dh_installdeb -a
- dh_shlibdeps -a
- dh_gencontrol -a
- dh_md5sums -a
- dh_builddeb -a
-
ORIG_VERSION=1.0.0
get-orig-source:
@@ -131,6 +50,3 @@
rm -fv ../zaz_$(ORIG_VERSION)~dfsg1.orig.tar.bz2
tar cvfj ../zaz_$(ORIG_VERSION)~dfsg1.orig.tar.bz2 zaz-$(ORIG_VERSION)
rm -rv zaz-$(ORIG_VERSION)
-
-binary: binary-indep binary-arch
-.PHONY: get-orig-source config build clean binary-indep binary-arch binary install
Modified: packages/trunk/zaz/debian/zaz.6
===================================================================
--- packages/trunk/zaz/debian/zaz.6 2016-03-25 19:30:27 UTC (rev 15716)
+++ packages/trunk/zaz/debian/zaz.6 2016-03-28 23:41:44 UTC (rev 15717)
@@ -1,15 +1,15 @@
.\" (c) 2009 Miriam Ruiz <little_miry at yahoo.es>
-.\"
+.\"
.\" This document 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 package 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
Added: packages/trunk/zaz/debian/zaz.manpages
===================================================================
--- packages/trunk/zaz/debian/zaz.manpages (rev 0)
+++ packages/trunk/zaz/debian/zaz.manpages 2016-03-28 23:41:44 UTC (rev 15717)
@@ -0,0 +1 @@
+debian/zaz.6
More information about the Pkg-games-commits
mailing list