[Pkg-electronics-commits] [SCM] Packaging for gEDA branch, master, updated. 9fac4f9d7ecd2c377d1baad11ba4c68fc675d08e

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

The following commit has been merged in the master branch:
commit a7228ca65572df610fa05f94e91928a443166143
Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at users.sourceforge.net>
Date:   Thu Nov 19 18:24:15 2009 +0200

    * Uncomment removal of /usr/bin/sch2eaglepos.sh from geda-gnetlist since
    it is already installed in the examples dir.
    * Make override_dh_installdocs look cleaner

diff --git a/debian/rules b/debian/rules
index 5bd9578..371f486 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,8 +36,8 @@ override_dh_auto_install:
 
 override_dh_install:
 	dh_install
-	# Apparently Debian doesn't package this one
-	#rm debian/geda-gnetlist/usr/bin/sch2eaglepos.sh
+	# This script is already installed in examples dir:
+	rm debian/geda-gnetlist/usr/bin/sch2eaglepos.sh
 
 	# Work around install locations in geda-utils
 	cd debian/geda-utils/usr/bin && mv gnet_hier_verilog.sh gnet_hier_verilog
@@ -46,6 +46,7 @@ override_dh_install:
 override_dh_installdocs:
 	dh_installdocs -N$(LIBPKG) -N$(COMMONPKG) -N$(DEVPKG) -Ngeda -Ngeda-doc
 	dh_installdocs -pgeda -pgeda-doc --link-doc=geda-doc
+	dh_installdocs -p$(LIBPKG) -p$(COMMONPKG) -p$(DEVPKG) --link-doc=$(COMMONPKG)
 	# Work around install location in some geda- packages:
 	for p in geda-gnetlist geda-gschem geda-gsymcheck geda-utils geda-symbols geda-doc; do \
 		mv debian/$$p/usr/share/doc/geda-gaf/man/*  \
@@ -55,7 +56,6 @@ override_dh_installdocs:
 	   	debian/$$p/usr/share/doc/$$p/ ; \
 		rm -rf debian/$$p/usr/share/doc/geda-gaf ; \
 	done
-	dh_installdocs -p$(LIBPKG) -p$(COMMONPKG) -p$(DEVPKG) --link-doc=$(COMMONPKG)
 
 override_dh_installchangelogs:
 	dh_installchangelogs libgeda/ChangeLog   -p $(COMMONPKG)

-- 
Packaging for gEDA