[Pkg-electronics-commits] [SCM] Packaging for Pcb branch, master, updated. 0968f76a9606e4c6bf4e8d32f8cbc45253562a12

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

The following commit has been merged in the master branch:
commit 89893258d688e17f0a39ae97bb5ad84749f5086d
Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at users.sourceforge.net>
Date:   Mon Nov 9 07:08:43 2009 +0200

    * debian/rules: use --link-doc option in dh_installdocs to link pcb-*
      documentation directories.
    * Removed debian/pcb.links & usr/share/doc/* symlinks from
      pcb-(gtk|lesstif).links
    * debian/control: Bump debhelper dependancy to 7.4.3~ for dh_installdocs
      --link-doc support.

diff --git a/debian/changelog b/debian/changelog
index 9b203ee..58f8adc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,7 @@ pcb (20091103-1) unstable; urgency=low
   * New upstream release. (Closes: #520909, #294278)
   * debian/control:
     + Bumped Standards-Version to 3.8.3, no changes needed.
-    + Build-Depend on debhelper (>= 7.0.50~) to support target overrides.
+    + Build-Depend on debhelper (>= 7.4.3~).
     + Build-Depend on quilt (>= 0.46-7~) to support dh7 addon.
     + Update version of tcl/tk dependencies to 8.5
     + Add ${misc:Depends} to binary packages' dependencies.
@@ -19,7 +19,7 @@ pcb (20091103-1) unstable; urgency=low
     + Install DVI version of refcard since the PDF version is messed up.
     + Add --enable-dependency-tracking option to CONFIGURE_OPTS to make
       out-of-source building work.
-  * Added pcb-common.docs, pcb.links, pcb-gtk.links, pcb-lesstif.links,
+  * Added pcb-common.docs, pcb-gtk.links, pcb-lesstif.links,
     debian/pcb-common.examples, debian/pcb-common.install,
     debian/README.source, debian/source.lintian-overrides,
     debian/pcb-gtk.lintian-overrides, debian/pcb-lesstif.lintian-overrides,
diff --git a/debian/control b/debian/control
index 48cbe05..aade0f2 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: electronics
 Priority: optional
 Maintainer: Debian Electronics Team <pkg-electronics-devel at lists.alioth.debian.org>
 Uploaders: Hamish Moffatt <hamish at debian.org>, Wesley J. Landaker <wjl at icecavern.net>, Ramakrishnan Muthukrishnan <rkrishnan at debian.org>, أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at users.sourceforge.net>
-Build-Depends: debhelper (>= 7.0.50~), bison, flex, libgtk2.0-dev, libglib2.0-dev, tk8.5, libgd2-xpm-dev | libgd2-dev, libdbus-1-dev, lesstif2-dev, libxmu-dev, libxml-parser-perl, quilt (>= 0.46-7~)
+Build-Depends: debhelper (>= 7.4.3~), bison, flex, libgtk2.0-dev, libglib2.0-dev, tk8.5, libgd2-xpm-dev | libgd2-dev, libdbus-1-dev, lesstif2-dev, libxmu-dev, libxml-parser-perl, quilt (>= 0.46-7~)
 Standards-Version: 3.8.3
 Homepage: http://pcb.gpleda.org/
 Vcs-Git: git://git.debian.org/git/pkg-electronics/pcb.git
diff --git a/debian/pcb-gtk.links b/debian/pcb-gtk.links
index 79a5766..f789395 100644
--- a/debian/pcb-gtk.links
+++ b/debian/pcb-gtk.links
@@ -1,2 +1 @@
-usr/share/doc/pcb-common usr/share/doc/pcb-gtk
 usr/share/man/man1/pcb.1.gz usr/share/man/man1/pcb-gtk.1.gz
diff --git a/debian/pcb-lesstif.links b/debian/pcb-lesstif.links
index 8901817..3cb7f3d 100644
--- a/debian/pcb-lesstif.links
+++ b/debian/pcb-lesstif.links
@@ -1,2 +1 @@
-usr/share/doc/pcb-common usr/share/doc/pcb-lesstif
 usr/share/man/man1/pcb.1.gz usr/share/man/man1/pcb-lesstif.1.gz
diff --git a/debian/pcb.links b/debian/pcb.links
deleted file mode 100644
index d3dec56..0000000
--- a/debian/pcb.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/doc/pcb-common usr/share/doc/pcb
diff --git a/debian/rules b/debian/rules
index cfdb722..560f1df 100755
--- a/debian/rules
+++ b/debian/rules
@@ -56,8 +56,9 @@ override_dh_installchangelogs:
 	dh_installchangelogs -p$(package)-common
 
 override_dh_installdocs:
-	# Only install docs in $(package)-common
-	dh_installdocs -p$(package)-common
+	# Only install docs in $(package)-common & link other packages' docs to
+	# $(package)-common:
+	dh_installdocs --link-doc=$(package)-common
 
 override_dh_compress:
 	# exclude example files from compression

-- 
Packaging for Pcb