Bug#859956: unblock: cytadela/1.1.0-3
Package: release.debian.org
User: release.debian.org@packages.debian.org
Usertags: unblock
Severity: normal
Please unblock package cytadela.
As other game packages such as tworld, the current packaging breaks
binNMU due to /usr/share/doc symlink from the main cytadela "arch"
package to the secondary cytadela-data "all" package.
diff -Nru cytadela-1.1.0/debian/changelog cytadela-1.1.0/debian/changelog
--- cytadela-1.1.0/debian/changelog 2014-06-07 20:30:47.000000000 +0200
+++ cytadela-1.1.0/debian/changelog 2017-04-09 18:01:11.000000000 +0200
@@ -1,3 +1,13 @@
+cytadela (1.1.0-3) unstable; urgency=medium
+
+ * Drop --link-doc from dh_installdocs as it breaks binNMU (Closes: #859349)
+ * Install docs into cytadela package instead of cytadela-data
+ * Depends on vlc-plugin-base instead of transitional vlc-nox (Closes: #845583)
+ * Fix typo in description
+ * Bump Standards-Version to 3.9.8 (no changes)
+
+ -- Sylvain Beucler <beuc@debian.org> Sun, 09 Apr 2017 18:01:16 +0200
+
cytadela (1.1.0-2) unstable; urgency=medium
* Re-upload to experimental (closes: #639765)
diff -Nru cytadela-1.1.0/debian/control cytadela-1.1.0/debian/control
--- cytadela-1.1.0/debian/control 2014-06-07 20:30:47.000000000 +0200
+++ cytadela-1.1.0/debian/control 2017-04-09 17:38:04.000000000 +0200
@@ -4,14 +4,14 @@
Maintainer: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>
Uploaders: Sylvain Beucler <beuc@debian.org>
Build-Depends: debhelper (>= 9), libsdl1.2-dev, libsdl-mixer1.2-dev, mesa-common-dev, libglu1-mesa-dev, libvlc-dev (>= 2.0)
-Standards-Version: 3.9.5
+Standards-Version: 3.9.8
Homepage: http://cytadela.sf.net/
Vcs-Git: git://anonscm.debian.org/pkg-games/cytadela.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-games/cytadela.git
Package: cytadela
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, cytadela-data (= ${source:Version}), vlc-nox
+Depends: ${shlibs:Depends}, ${misc:Depends}, cytadela-data (= ${source:Version}), vlc-plugin-base
Description: old-school first person shooter game
Cytadela is a single player game in which the player fights against
computer-controlled (AI) enemies. The goal of the game is to find six
diff -Nru cytadela-1.1.0/debian/cytadela-data.docs cytadela-1.1.0/debian/cytadela-data.docs
--- cytadela-1.1.0/debian/cytadela-data.docs 2014-06-07 20:26:13.000000000 +0200
+++ cytadela-1.1.0/debian/cytadela-data.docs 1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-NEWS
-README
-AUTHORS
-data/doc/*
diff -Nru cytadela-1.1.0/debian/cytadela.docs cytadela-1.1.0/debian/cytadela.docs
--- cytadela-1.1.0/debian/cytadela.docs 1970-01-01 01:00:00.000000000 +0100
+++ cytadela-1.1.0/debian/cytadela.docs 2017-04-09 17:24:46.000000000 +0200
@@ -0,0 +1,4 @@
+NEWS
+README
+AUTHORS
+data/doc/*
diff -Nru cytadela-1.1.0/debian/cytadela.maintscript cytadela-1.1.0/debian/cytadela.maintscript
--- cytadela-1.1.0/debian/cytadela.maintscript 1970-01-01 01:00:00.000000000 +0100
+++ cytadela-1.1.0/debian/cytadela.maintscript 2017-04-09 18:01:16.000000000 +0200
@@ -0,0 +1,2 @@
+symlink_to_dir /usr/share/doc/cytadela cytadela-data 1.1.0-3~~
+symlink_to_dir /usr/share/doc/cytadela-dbg cytadela-data 1.1.0-3~~
diff -Nru cytadela-1.1.0/debian/README.source cytadela-1.1.0/debian/README.source
--- cytadela-1.1.0/debian/README.source 2014-06-07 20:30:47.000000000 +0200
+++ cytadela-1.1.0/debian/README.source 2017-04-09 17:59:34.000000000 +0200
@@ -21,11 +21,13 @@
# - git-buildpackage --git-ignore-new ...
git commit -am "New upstream release - v$VERSION"
KEYID=...
-git-buildpackage \
- --git-builder="pdebuild --buildresult ../ --auto-debsign --debsign-k $KEYID " \
+gbp buildpackage \
+ --git-builder="pdebuild --buildresult ../ --auto-debsign --debsign-k $KEYID" \
--git-tag --git-keyid=$KEYID
git push origin master pristine-tar upstream
git push --tags
# http://mentors.debian.net/cgi-bin/maintainer-intro
-debrelease mentors
+debrelease --dput mentors
+
+ -- Sylvain Beucler <beuc@debian.org>, Sun, 9 Apr 2017 17:59:24 +0200
diff -Nru cytadela-1.1.0/debian/rules cytadela-1.1.0/debian/rules
--- cytadela-1.1.0/debian/rules 2014-06-07 20:30:47.000000000 +0200
+++ cytadela-1.1.0/debian/rules 2017-04-09 18:01:16.000000000 +0200
@@ -32,11 +32,7 @@
dh_install -Xcytadela/doc/
override_dh_installdocs:
- # Group all documentation in the -data arch-indep package
- dh_installdocs --link-doc=cytadela-data
-# dh_listpackages uses DH_INTERNAL_OPTIONS that is set to '-a'/'-i'/''
-ifneq (,$(findstring cytadela-data, $(shell dh_listpackages)))
+ dh_installdocs
# lintian extra-license-file
- rm debian/cytadela-data/usr/share/doc/cytadela-data/COPYING
- rm debian/cytadela-data/usr/share/doc/cytadela-data/GNUFDL
-endif
+ rm debian/cytadela/usr/share/doc/cytadela/COPYING
+ rm debian/cytadela/usr/share/doc/cytadela/GNUFDL
unblock cytadela/1.1.0-3
-- System Information:
Debian Release: 9.0
APT prefers testing
APT policy: (500, 'testing'), (50, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.9.0-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
Reply to: