Bug#865199: qonk: diff for NMU version 0.3.1-3.2
Boyuan Yang
byang at debian.org
Fri Jan 18 15:39:49 GMT 2019
Control: tags 865199 + patch
Control: tags 865199 + pending
Dear maintainer,
I've prepared an NMU for qonk (versioned as 0.3.1-3.2) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.
Besides, I put my git repo at
https://salsa.debian.org/byang/qonk.git .
Please help move (clone) this git repo back to games-team
(https://salsa.debian.org/games-team/qonk.git) at your convenience.
Regards.
diff -Nru qonk-0.3.1/debian/changelog qonk-0.3.1/debian/changelog
--- qonk-0.3.1/debian/changelog 2019-01-18 10:35:18.000000000 -0500
+++ qonk-0.3.1/debian/changelog 2019-01-18 10:21:54.000000000 -0500
@@ -1,3 +1,25 @@
+qonk (0.3.1-3.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Rebuild for Debian Buster.
+ * debian: Apply "wrap-and-sort -abst".
+ * debian/control:
+ + Bump debhelper compat to v12.
+ + Bump Standards-Version to 4.3.0.
+ + Use Rules-Requires-Root: no.
+ + Update Vcs-* fields to point to git repo under Salsa games-team.
+ + Remove build-dependency on old automake1.11.
+ (Closes: #865199)
+ + Replace legacy dependency on ttf-dejavu with fonts-dejavu.
+ * debian/rules:
+ + Switch to debhelper and dh syntax.
+ + Enable full hardening.
+ + Use qonk.links file to create symlinks.
+ * debian/README.source: Removed, no longer needed.
+ * debian/menu: Removed per ctte's decision on desktop/menu files.
+
+ -- Boyuan Yang <byang at debian.org> Fri, 18 Jan 2019 10:21:54 -0500
+
qonk (0.3.1-3.1) unstable; urgency=low
* Non-maintainer upload.
diff -Nru qonk-0.3.1/debian/compat qonk-0.3.1/debian/compat
--- qonk-0.3.1/debian/compat 2019-01-18 10:35:18.000000000 -0500
+++ qonk-0.3.1/debian/compat 1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-5
diff -Nru qonk-0.3.1/debian/control qonk-0.3.1/debian/control
--- qonk-0.3.1/debian/control 2019-01-18 10:35:18.000000000 -0500
+++ qonk-0.3.1/debian/control 2019-01-18 10:19:23.000000000 -0500
@@ -2,17 +2,27 @@
Section: games
Priority: optional
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Martín Ferrari <tincho at debian.org>, Barry deFreese <
bdefreese at debian.org>
-Build-Depends: cdbs, debhelper (>= 5), quilt, autoconf, automake1.11,
libtool, libsdl1.2-dev, libsdl-ttf2.0-dev,
- libsdl-gfx1.2-dev, libsdl-image1.2-dev
-Standards-Version: 3.8.3
+Uploaders:
+ Martín Ferrari <tincho at debian.org>,
+ Barry deFreese <bdefreese at debian.org>,
+Build-Depends:
+ debhelper-compat (= 12),
+ libsdl-gfx1.2-dev,
+ libsdl-image1.2-dev,
+ libsdl-ttf2.0-dev,
+ libsdl1.2-dev,
+Rules-Requires-Root: no
+Standards-Version: 4.3.0
Homepage: http://sourceforge.net/projects/qonk/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/qonk/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/qonk/?op=log
+Vcs-Git: https://salsa.debian.org/games-team/qonk.git
+Vcs-Browser: https://salsa.debian.org/games-team/qonk
Package: qonk
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ttf-dejavu
+Depends:
+ fonts-dejavu,
+ ${misc:Depends},
+ ${shlibs:Depends},
Description: Small build-and-conquer strategy game with very simple rules
The setting of the game is a solar system of planets. Your goal is to
conquer all of the planets in the game by sending ships there. Planets
diff -Nru qonk-0.3.1/debian/copyright qonk-0.3.1/debian/copyright
--- qonk-0.3.1/debian/copyright 2019-01-18 10:35:18.000000000 -0500
+++ qonk-0.3.1/debian/copyright 2019-01-18 10:06:47.000000000 -0500
@@ -118,4 +118,3 @@
The Debian packaging is Copyright (C) 2006, 2007, Martín Ferrari
<martin.ferrari at gmail.com> and is licensed under the GPL, see above.
-
diff -Nru qonk-0.3.1/debian/docs qonk-0.3.1/debian/docs
--- qonk-0.3.1/debian/docs 2019-01-18 10:35:18.000000000 -0500
+++ qonk-0.3.1/debian/docs 2019-01-18 10:06:47.000000000 -0500
@@ -1,2 +1,2 @@
-TODO
README
+TODO
diff -Nru qonk-0.3.1/debian/menu qonk-0.3.1/debian/menu
--- qonk-0.3.1/debian/menu 2019-01-18 10:35:18.000000000 -0500
+++ qonk-0.3.1/debian/menu 1969-12-31 19:00:00.000000000 -0500
@@ -1,2 +0,0 @@
-?package(qonk):needs="X11" section="Games/Strategy"\
- title="qonk" command="/usr/games/qonk"
diff -Nru qonk-0.3.1/debian/qonk.desktop qonk-0.3.1/debian/qonk.desktop
--- qonk-0.3.1/debian/qonk.desktop 2019-01-18 10:35:18.000000000 -0500
+++ qonk-0.3.1/debian/qonk.desktop 2019-01-18 10:14:14.000000000 -0500
@@ -2,9 +2,9 @@
Name=Qonk
GenericName=qonk
Comment=Conquer the planets
+Comment[zh_CN]=征服星球
Type=Application
Exec=qonk
Icon=qonk
Terminal=false
Categories=Game;StrategyGame;
-
diff -Nru qonk-0.3.1/debian/qonk.links qonk-0.3.1/debian/qonk.links
--- qonk-0.3.1/debian/qonk.links 1969-12-31 19:00:00.000000000 -0500
+++ qonk-0.3.1/debian/qonk.links 2019-01-18 10:13:29.000000000 -0500
@@ -0,0 +1 @@
+/usr/share/fonts/truetype/dejavu/DejaVuSansMono.ttf
/usr/share/games/qonk/font.ttf
diff -Nru qonk-0.3.1/debian/qonk.not-installed qonk-0.3.1/debian/qonk.not-
installed
--- qonk-0.3.1/debian/qonk.not-installed 1969-12-31 19:00:00.000000000
-0500
+++ qonk-0.3.1/debian/qonk.not-installed 2019-01-18 10:11:28.000000000
-0500
@@ -0,0 +1 @@
+font.ttf
diff -Nru qonk-0.3.1/debian/README.source qonk-0.3.1/debian/README.source
--- qonk-0.3.1/debian/README.source 2019-01-18 10:35:18.000000000 -0500
+++ qonk-0.3.1/debian/README.source 1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-Task: apply debian patches
-Tools: quilt
-Command: quilt push -a
-Description:
- Please read /usr/share/doc/quilt/README.source how to use quilt for
- managing Debian patches.
- .
- This might not be needed for there are not always patches. The steps
- outlined above should always work nonetheless. If you want to see if
- there are patches, check if there are files in debian/patches apart
- from the one called «series»
-
- -- Christoph Egger <debian at christoph-egger.org>, Sun, 30 Aug 2009 22:39:52
+0200
diff -Nru qonk-0.3.1/debian/rules qonk-0.3.1/debian/rules
--- qonk-0.3.1/debian/rules 2019-01-18 10:35:18.000000000 -0500
+++ qonk-0.3.1/debian/rules 2019-01-18 10:13:36.000000000 -0500
@@ -1,21 +1,25 @@
#!/usr/bin/make -f
+# -*- makefile -*-
+# Uncomment this to turn on verbose mode.
+# export DH_VERBOSE=1
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-
-DEB_AUTO_UPDATE_ACLOCAL = 1.11
-DEB_AUTO_UPDATE_AUTOCONF = 2.61
-DEB_AUTO_UPDATE_AUTOMAKE = 1.11
-DEB_AUTO_UPDATE_LIBTOOL := 1.5
-DEB_AUTO_CLEANUP_RCS := yes
-DEB_INSTALL_CHANGELOGS_ALL := HISTORY
-DEB_CONFIGURE_EXTRA_FLAGS := --bindir="\$${prefix}/games" \
- --datadir="\$${prefix}/share/games"
-
-install/qonk::
- rm -rf $(DEB_DESTDIR)/guichan \
- $(DEB_DESTDIR)/usr/share/games/qonk/font.ttf
- ln -s ../../fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf \
- $(DEB_DESTDIR)/usr/share/games/qonk/font.ttf
+# see FEATURE AREAS in dpkg-buildflags(1)
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+# see ENVIRONMENT in dpkg-buildflags(1)
+# package maintainers to append CFLAGS
+#export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic
+# package maintainers to append LDFLAGS
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+
+
+%:
+ dh $@
+
+override_dh_auto_configure:
+ dh_auto_configure -- \
+ --bindir="\$${prefix}/games" \
+ --datadir="\$${prefix}/share/games"
+
+override_dh_missing:
+ dh_missing --fail-missing
diff -Nru qonk-0.3.1/debian/source/format qonk-0.3.1/debian/source/format
--- qonk-0.3.1/debian/source/format 1969-12-31 19:00:00.000000000 -0500
+++ qonk-0.3.1/debian/source/format 2019-01-18 10:15:16.000000000 -0500
@@ -0,0 +1 @@
+3.0 (quilt)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 858 bytes
Desc: This is a digitally signed message part
URL: <http://alioth-lists.debian.net/pipermail/pkg-games-devel/attachments/20190118/8447f68f/attachment-0001.sig>
More information about the Pkg-games-devel
mailing list