[cytadela] 01/01: Stop using dh_installdocs --link-doc + tidy packaging

[Sylvain Beucler]

This is an automated email from the git hooks/post-receive script.

beuc pushed a commit to branch master
in repository cytadela.

commit 7e4cc1b021d55fb3ea64223fb57b598c131d8abe
Author: Sylvain Beucler <beuc at beuc.net>
Date:   Sun Apr 9 18:31:45 2017 +0200

    Stop using dh_installdocs --link-doc + tidy packaging
---
 debian/README.source                         |  4 +++-
 debian/changelog                             | 10 ++++++++++
 debian/control                               |  6 +++---
 debian/{cytadela-data.docs => cytadela.docs} |  0
 debian/cytadela.maintscript                  |  2 ++
 debian/rules                                 | 10 +++-------
 6 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/debian/README.source b/debian/README.source
index ee1656a..c6daee0 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -21,7 +21,7 @@ git-import-orig --pristine-tar ../cytadela_$VERSION.orig.tar.gz
 # - git-buildpackage --git-ignore-new ...
 git commit -am "New upstream release - v$VERSION"
 KEYID=...
-git-buildpackage \
+gbp buildpackage \
   --git-builder="pdebuild --buildresult ../ --auto-debsign --debsign-k $KEYID" \
   --git-tag --git-keyid=$KEYID
 git push origin master pristine-tar upstream
@@ -29,3 +29,5 @@ git push --tags
 
 # http://mentors.debian.net/cgi-bin/maintainer-intro
 debrelease --dput mentors
+
+ -- Sylvain Beucler <beuc at debian.org>, Sun,  9 Apr 2017 17:59:24 +0200
diff --git a/debian/changelog b/debian/changelog
index 04e078a..7735efd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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 at 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 --git a/debian/control b/debian/control
index e319db1..2b6a1da 100644
--- a/debian/control
+++ b/debian/control
@@ -4,14 +4,14 @@ Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Sylvain Beucler <beuc at 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
@@ -19,7 +19,7 @@ Description: old-school first person shooter game
  .
  To achieve it, the player not only has to defend himself against the
  enemies, but (s)he also has to solve many riddles, such as switching
- apropriate buttons in order to open some door, move some walls, etc.
+ appropriate buttons in order to open some door, move some walls, etc.
  . 
  It's a conversion of a first person shooter Amiga game originally
  released in mid 1990's, first in Poland and then in other countries.
diff --git a/debian/cytadela-data.docs b/debian/cytadela.docs
similarity index 100%
rename from debian/cytadela-data.docs
rename to debian/cytadela.docs
diff --git a/debian/cytadela.maintscript b/debian/cytadela.maintscript
new file mode 100644
index 0000000..acbf66b
--- /dev/null
+++ b/debian/cytadela.maintscript
@@ -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 --git a/debian/rules b/debian/rules
index 748db23..64391dd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,11 +32,7 @@ override_dh_install:
 	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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/cytadela.git