[SCM] FreeCAD packaging branch, master, updated. upstream/0.8.2237-44-g194d0dc

[Teemu Ikonen]

The following commit has been merged in the master branch:
commit 632bd1630da86ab76dd88a76de2117499a7b4225
Author: Teemu Ikonen <tpikonen at gmail.com>
Date:   Mon Nov 16 15:32:22 2009 +0100

    rules: Add freecad-doc package
    
    Add override to dh_compress.
    
    Changes to rules from upstream (Werner Mayer):
        Add freecad-doc package.

diff --git a/debian/rules b/debian/rules
index bc746b4..2bcc37a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,7 +31,7 @@ config.status: configure
 --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
 --prefix=/usr/lib/freecad --mandir=/usr/share/man \
 --infodir=/usr/share/info --datadir=/usr/share/freecad \
---includedir=/usr/include/freecad \
+--includedir=/usr/include/freecad --docdir=/usr/share/doc/freecad \
 CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
 
 build: build-stamp
@@ -62,8 +62,8 @@ install-stamp:
 	rm -rf debian/tmp/freecad/usr/lib/freecad/Mod/_TEMPLATE_
 	rm -rf debian/tmp/freecad/usr/lib/freecad/Mod/TemplatePyMod
 	# install the core system
-	dh_install -pfreecad debian/tmp/freecad/usr/share/* usr/share/
-	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/share usr/lib/freecad
+	dh_install -pfreecad debian/tmp/freecad/usr/share/freecad/* usr/share/freecad/
+	#dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/share usr/lib/freecad
 	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/bin usr/lib/freecad
 	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/lib/FreeCAD.so usr/lib/freecad/lib
 	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/lib/lib*.so.* usr/lib/freecad/lib
@@ -91,10 +91,16 @@ install-stamp:
 	$(foreach MODULE,$(MODULES), \
 	dh_install -pfreecad-dev debian/tmp/freecad/usr/lib/freecad/Mod/$(MODULE)/lib*.la usr/lib/freecad/Mod/$(MODULE); \
 	dh_install -pfreecad-dev debian/tmp/freecad/usr/lib/freecad/Mod/$(MODULE)/lib*.so usr/lib/freecad/Mod/$(MODULE);)
+
+	# install the help system
+	dh_install -pfreecad-doc debian/tmp/freecad/usr/share/doc/* usr/share/doc/
 	touch install-stamp
 
+override_dh_compress:
+	dh_compress -X.qch -X.qhc
+
 binary-indep: build install
-	# We have nothing to do by default.
+	dh binary-indep
 
 binary-arch: build install
 	dh binary-arch

-- 
FreeCAD packaging