[Debian-ha-commits] [libqb] 11/15: Updated to remove jquery.js from proper directory

[Richard Winters]

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

devrik-guest pushed a commit to branch master
in repository libqb.

commit 526b3844c3167a3f9118d329180805182a533f72
Author: Richard B Winters <rik at mmogp.com>
Date:   Sun Apr 19 17:18:37 2015 -0400

    Updated to remove jquery.js from proper directory
    
     - Override dh_auto_configure for specifying docdir and enabling
       dependency checking
     - Updates to override_dh_auto_install to remove some manual placing
       of docs resolved by overriding dh_auto_configure
    
    Change-Id: I1b81e1e91a2b8fecf7272b222ae38da6a375666c
    Signed-off-by: Richard B Winters <rik at mmogp.com>
---
 debian/libqb-dev.install |  6 +++---
 debian/libqb0.install    |  2 +-
 debian/libqb0.links      |  2 +-
 debian/rules             | 17 ++++++++---------
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/debian/libqb-dev.install b/debian/libqb-dev.install
index 938320a..b935a4a 100644
--- a/debian/libqb-dev.install
+++ b/debian/libqb-dev.install
@@ -1,6 +1,6 @@
 usr/include/*
-usr/lib/*/lib*.a
-usr/lib/*/lib*.so
-usr/lib/*/pkgconfig/*
+usr/lib/lib*.a
+usr/lib/lib*.so
+usr/lib/pkgconfig/*
 usr/sbin/*
 usr/share/man/*
diff --git a/debian/libqb0.install b/debian/libqb0.install
index 45602de..8610b7c 100644
--- a/debian/libqb0.install
+++ b/debian/libqb0.install
@@ -1,3 +1,3 @@
-usr/lib/*/lib*.so.*
+usr/lib/lib*.so.*
 usr/share/doc/libqb0/*
 docs/html usr/share/doc/libqb0
diff --git a/debian/libqb0.links b/debian/libqb0.links
index 089fe9f..5e555a8 100644
--- a/debian/libqb0.links
+++ b/debian/libqb0.links
@@ -1 +1 @@
-/usr/share/javascript/jquery.js usr/share/doc/html/libqb0/html/jquery.js
+/usr/share/javascript/jquery.js usr/share/doc/libqb0/html/jquery.js
diff --git a/debian/rules b/debian/rules
index f3bdb6f..3d442be 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,23 +20,22 @@ export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs
 override_dh_autoreconf:
 	dh_autoreconf ./autogen.sh
 
+override_dh_auto_configure:
+	./configure  --sysconfdir=/etc --localstatedir=/var --docdir=/usr/share/doc/libqb0 \
+		--enable-dependency-tracking --disable-fatal-warnings
+
 override_dh_auto_build:
 	dh_auto_build
 	$(MAKE) doxygen
 	rm docs/html/*.md5
 
-DOC = debian/tmp/usr/share/doc/libqb
+DOC = debian/tmp/usr/share/doc/libqb0
 
 override_dh_auto_install:
 	dh_auto_install
-	rm -v debian/tmp/usr/lib/*/lib*.la
+	rm -v debian/tmp/usr/lib/lib*.la
 	rm "$(DOC)/COPYING" "$(DOC)/INSTALL"
-	mv "$(DOC)" "$(DOC)0"
-# remove embedded javascript library
-	rm -v debian/tmp/usr/share/doc/html/jquery.js
-# install symbolic link to jquery
-	ln -rs /usr/share/javascript/jquery.js \
-		$(CURDIR)/debian/tmp/usr/share/doc/html/jquery.js
-
+	rm -v docs/html/jquery.js
+	
 override_dh_strip:
 	dh_strip --dbg-package=libqb0-dbg

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/libqb.git