Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock

Please unblock package cytadela


It fixes binary-indep-only builds that the previous upload broke.
Also it better implements the symlink_to_dir migration.


diff -Nru cytadela-1.1.0/debian/changelog cytadela-1.1.0/debian/changelog
--- cytadela-1.1.0/debian/changelog       2017-04-09 18:01:11.000000000 +0200
+++ cytadela-1.1.0/debian/changelog       2017-04-11 19:37:18.000000000 +0200
@@ -1,3 +1,10 @@
+cytadela (1.1.0-4) unstable; urgency=medium
+
+  * Fix binary-indep build (Closes: #860113)
+  * Fix symlink_to_dir migration
+
+ -- Sylvain Beucler <b...@debian.org>  Tue, 11 Apr 2017 19:37:18 +0200
+
 cytadela (1.1.0-3) unstable; urgency=medium
 
   * Drop --link-doc from dh_installdocs as it breaks binNMU (Closes: #859349)
diff -Nru cytadela-1.1.0/debian/cytadela-dbg.maintscript 
cytadela-1.1.0/debian/cytadela-dbg.maintscript
--- cytadela-1.1.0/debian/cytadela-dbg.maintscript       1970-01-01 
01:00:00.000000000 +0100
+++ cytadela-1.1.0/debian/cytadela-dbg.maintscript       2017-04-11 
19:37:18.000000000 +0200
@@ -0,0 +1 @@
+symlink_to_dir /usr/share/doc/cytadela-dbg cytadela-data 1.1.0-4~~
diff -Nru cytadela-1.1.0/debian/cytadela.maintscript 
cytadela-1.1.0/debian/cytadela.maintscript
--- cytadela-1.1.0/debian/cytadela.maintscript       2017-04-09 
18:01:16.000000000 +0200
+++ cytadela-1.1.0/debian/cytadela.maintscript       2017-04-11 
19:37:18.000000000 +0200
@@ -1,2 +1 @@
-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~~
+symlink_to_dir /usr/share/doc/cytadela cytadela-data 1.1.0-4~~
diff -Nru cytadela-1.1.0/debian/README.source 
cytadela-1.1.0/debian/README.source
--- cytadela-1.1.0/debian/README.source       2017-04-09 17:59:34.000000000 
+0200
+++ cytadela-1.1.0/debian/README.source       2017-04-11 19:26:00.000000000 
+0200
@@ -18,7 +18,9 @@
 git checkout master
 git-import-orig --pristine-tar ../cytadela_$VERSION.orig.tar.gz
 # - Fix stuff...
-# - git-buildpackage --git-ignore-new ...
+#gbp buildpackage --git-builder="pdebuild --buildresult ../" --git-ignore-new
+#gbp buildpackage --git-builder="pdebuild --buildresult ../ -- --binary-arch" 
--git-ignore-new
+#gbp buildpackage --git-builder="pdebuild --buildresult ../ -- --binary-indep" 
--git-ignore-new
 git commit -am "New upstream release - v$VERSION"
 KEYID=...
 gbp buildpackage \
@@ -30,4 +32,4 @@
 # http://mentors.debian.net/cgi-bin/maintainer-intro
 debrelease --dput mentors
 
- -- Sylvain Beucler <b...@debian.org>, Sun,  9 Apr 2017 17:59:24 +0200
+ -- Sylvain Beucler <b...@debian.org>, Tue, 11 Apr 2017 19:19:17 +0200
diff -Nru cytadela-1.1.0/debian/rules cytadela-1.1.0/debian/rules
--- cytadela-1.1.0/debian/rules       2017-04-09 18:01:16.000000000 +0200
+++ cytadela-1.1.0/debian/rules       2017-04-11 19:37:18.000000000 +0200
@@ -33,6 +33,9 @@
 
 override_dh_installdocs:
        dh_installdocs
-       # lintian extra-license-file
+       # lintian extra-license-file - only if cytadela is built
+       # (i.e. not for binary-indep/cytadela-data builds)
+ifneq ($(filter cytadela, $(shell dh_listpackages)), )
       rm debian/cytadela/usr/share/doc/cytadela/COPYING
       rm debian/cytadela/usr/share/doc/cytadela/GNUFDL
+endif


unblock cytadela/1.1.0-4


-- 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-2-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 via email to