[Pkg-electronics-commits] [pcb] 04/05: Bump to compat level 10

[أحمد المحمودي (Ahmed El-Mahmoudy)]

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

aelmahmoudy-guest pushed a commit to branch master
in repository pcb.

commit 86dbffe9ad96317f8ab4d3686bd9618edd90fb8c
Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at users.sourceforge.net>
Date:   Sun Oct 1 03:46:48 2017 +0200

    Bump to compat level 10
    
    + Remove autotools-dev sequence
    + Disable dh_autoreconf as it fails the build
    + Link package documentation using pcb*.links, since
      dh_installdocs --linkdoc between different arch.
      packages is not supported in compat level 10
---
 debian/compat            |  2 +-
 debian/control           |  2 +-
 debian/pcb-gtk.links     |  1 +
 debian/pcb-lesstif.links |  1 +
 debian/pcb.links         |  1 +
 debian/rules             | 10 ++++++----
 6 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/debian/compat b/debian/compat
index ec63514..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/control b/debian/control
index c272f0a..79f764b 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Electronics Team <pkg-electronics-devel at lists.alioth.debian.org>
 Uploaders: Bdale Garbee <bdale at gag.com>,
             أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at users.sourceforge.net>
-Build-Depends: debhelper (>= 9), bison, flex, libgtkglext1-dev, tk, libgd-dev, libdbus-1-dev, libmotif-dev, libxmu-dev, libxml-parser-perl, intltool, imagemagick, gerbv, autotools-dev, ghostscript
+Build-Depends: debhelper (>= 10), bison, flex, libgtkglext1-dev, tk, libgd-dev, libdbus-1-dev, libmotif-dev, libxmu-dev, libxml-parser-perl, intltool, imagemagick, gerbv, ghostscript
 Standards-Version: 4.1.1
 Homepage: http://pcb.geda-project.org/
 Vcs-Git: https://anonscm.debian.org/git/pkg-electronics/pcb.git
diff --git a/debian/pcb-gtk.links b/debian/pcb-gtk.links
index f789395..5880608 100644
--- a/debian/pcb-gtk.links
+++ b/debian/pcb-gtk.links
@@ -1 +1,2 @@
 usr/share/man/man1/pcb.1.gz usr/share/man/man1/pcb-gtk.1.gz
+usr/share/doc/pcb-common usr/share/doc/pcb-gtk
diff --git a/debian/pcb-lesstif.links b/debian/pcb-lesstif.links
index 3cb7f3d..68758c6 100644
--- a/debian/pcb-lesstif.links
+++ b/debian/pcb-lesstif.links
@@ -1 +1,2 @@
 usr/share/man/man1/pcb.1.gz usr/share/man/man1/pcb-lesstif.1.gz
+usr/share/doc/pcb-common usr/share/doc/pcb-lesstif
diff --git a/debian/pcb.links b/debian/pcb.links
new file mode 100644
index 0000000..d3dec56
--- /dev/null
+++ b/debian/pcb.links
@@ -0,0 +1 @@
+usr/share/doc/pcb-common usr/share/doc/pcb
diff --git a/debian/rules b/debian/rules
index 095156b..3398747 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,10 @@ endif
 CONFIGURE_OPTS=--disable-rpath --enable-dbus --disable-update-desktop-database --disable-update-mime-database --enable-dependency-tracking --enable-coord64 LDFLAGS="$(LDFLAGS) -Wl,--as-needed"
 
 %:
-	dh $@ --with=autotools_dev
+	dh $@
+
+# Disable autoreconf as it fails the build:
+override_dh_autoreconf:
 
 # I configure build-gtk unconditionally (arch-dependent and arch-independent)
 # because I need a single configure invocation in both cases
@@ -82,9 +85,8 @@ override_dh_installchangelogs:
 	dh_installchangelogs -p$(package)-common
 
 override_dh_installdocs:
-	# Only install docs in $(package)-common & link other packages' docs to
-	# $(package)-common:
-	dh_installdocs --link-doc=$(package)-common
+	# Only install docs in $(package)-common:
+	dh_installdocs -p$(package)-common
 
 override_dh_compress:
 	# exclude example files from compression

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