[tango] 07/08: move into rules the install directives

[Frédéric-Emmanuel Picca]

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

picca pushed a commit to branch master
in repository tango.

commit 59cf8f84af12edd7321c0d5187edb0cf4f5f6a9c
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Sun Feb 28 15:57:01 2016 +0100

    move into rules the install directives
---
 debian/liblog4tango-dev.install    |  3 ---
 debian/liblog4tango5-doc.install   |  2 --
 debian/liblog4tango5v5.install     |  1 -
 debian/libtango-dev.install        |  4 ----
 debian/libtango-tools.install      |  1 -
 debian/libtango9-doc.install       |  2 --
 debian/libtango9.install           |  1 -
 debian/rules                       | 45 ++++++++++++++++++++++++++++++++++++++
 debian/tango-accesscontrol.install |  1 -
 debian/tango-common.install        |  1 -
 debian/tango-db.install            |  3 ---
 debian/tango-starter.install       |  1 -
 debian/tango-test.install          |  1 -
 13 files changed, 45 insertions(+), 21 deletions(-)

diff --git a/debian/liblog4tango-dev.install b/debian/liblog4tango-dev.install
deleted file mode 100644
index 039c264..0000000
--- a/debian/liblog4tango-dev.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/include/tango/log4tango
-usr/lib/*/liblog4tango*.so
-usr/lib/*/pkgconfig/log4tango.pc
diff --git a/debian/liblog4tango5-doc.install b/debian/liblog4tango5-doc.install
deleted file mode 100644
index d7d6302..0000000
--- a/debian/liblog4tango5-doc.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/share/doc/log4tango/log4tango-*/api usr/share/doc/liblog4tango5-doc/html
-usr/share/man/man3
\ No newline at end of file
diff --git a/debian/liblog4tango5v5.install b/debian/liblog4tango5v5.install
deleted file mode 100644
index f6509be..0000000
--- a/debian/liblog4tango5v5.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/liblog4tango.so.*
diff --git a/debian/libtango-dev.install b/debian/libtango-dev.install
deleted file mode 100644
index 75ce419..0000000
--- a/debian/libtango-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/include/tango/*.*
-usr/include/tango/idl
-usr/lib/*/libtango*.so
-usr/lib/*/pkgconfig/tango.pc
diff --git a/debian/libtango-tools.install b/debian/libtango-tools.install
deleted file mode 100644
index 82ecbb6..0000000
--- a/debian/libtango-tools.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin/tango_admin usr/lib/tango
diff --git a/debian/libtango9-doc.install b/debian/libtango9-doc.install
deleted file mode 100644
index f757b38..0000000
--- a/debian/libtango9-doc.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/share/doc/tango/tango.pdf usr/share/doc/libtango9-doc
-usr/share/tango/idl usr/share/doc/libtango9-doc
\ No newline at end of file
diff --git a/debian/libtango9.install b/debian/libtango9.install
deleted file mode 100644
index 922e600..0000000
--- a/debian/libtango9.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libtango.so.*
diff --git a/debian/rules b/debian/rules
index ef5cff0..ab7254c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -57,6 +57,51 @@ override_dh_auto_install-indep:
 	$(MAKE) -C doc install
 
 override_dh_install:
+	# liblog4tango5v5
+	dh_install -p liblog4tango5v5 usr/lib/*/liblog4tango.so.*
+
+	# liblog4tango-dev
+	dh_install -p liblog4tango-dev usr/include/tango/log4tango
+	dh_install -p liblog4tango-dev usr/lib/*/liblog4tango*.so
+	dh_install -p liblog4tango-dev usr/lib/*/pkgconfig/log4tango.pc
+
+	# liblog4tango5-doc
+	dh_install -p liblog4tango5-doc usr/share/doc/log4tango/log4tango-*/api usr/share/doc/liblog4tango5-doc/html
+	dh_install -p liblog4tango5-doc usr/share/man/man3
+
+	# libtango9
+	dh_install -p libtango9 usr/lib/*/libtango.so.*
+
+	# libtango-dev
+	dh_install -p libtango-dev usr/include/tango/*.*
+	dh_install -p libtango-dev usr/include/tango/idl
+	dh_install -p libtango-dev usr/lib/*/libtango*.so
+	dh_install -p libtango-dev usr/lib/*/pkgconfig/tango.pc
+
+	# libtango9-doc
+	dh_install -p libtango9-doc usr/share/doc/tango/tango.pdf usr/share/doc/libtango9-doc
+	dh_install -p libtango9-doc usr/share/tango/idl usr/share/doc/libtango9-doc
+
+	# libtango-tools
+	dh_install -p libtango-tools usr/bin/tango_admin usr/lib/tango
+
+	# tango-common
+	dh_install -p tango-common var/lib/tango
+
+	# tango-db
+	dh_install -p tango-db usr/bin/DataBaseds usr/lib/tango
+	dh_install -p tango-db usr/share/tango-db
+	dh_install -p tango-db usr/share/dbconfig-common
+
+	# tango-starter
+	dh_install -p tango-starter usr/bin/Starter usr/lib/tango
+
+	# tango-accesscontrol
+	dh_install -p tango-accesscontrol usr/bin/TangoAccessControl usr/lib/tango
+
+	# tango-test
+	dh_install -p tango-test usr/bin/TangoTest usr/lib/tango
+
 	dh_install --list-missing -X.la
 
 override_dh_strip:
diff --git a/debian/tango-accesscontrol.install b/debian/tango-accesscontrol.install
deleted file mode 100644
index a542dd1..0000000
--- a/debian/tango-accesscontrol.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin/TangoAccessControl usr/lib/tango
diff --git a/debian/tango-common.install b/debian/tango-common.install
deleted file mode 100644
index 5070357..0000000
--- a/debian/tango-common.install
+++ /dev/null
@@ -1 +0,0 @@
-var/lib/tango
diff --git a/debian/tango-db.install b/debian/tango-db.install
deleted file mode 100644
index 6cf0512..0000000
--- a/debian/tango-db.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/bin/DataBaseds usr/lib/tango
-usr/share/tango-db
-usr/share/dbconfig-common
diff --git a/debian/tango-starter.install b/debian/tango-starter.install
deleted file mode 100644
index 3242729..0000000
--- a/debian/tango-starter.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin/Starter usr/lib/tango
diff --git a/debian/tango-test.install b/debian/tango-test.install
deleted file mode 100644
index a5df589..0000000
--- a/debian/tango-test.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin/TangoTest usr/lib/tango

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/tango.git