[SCM] tango branch, master, updated. debian/8.0.5+dfsg-1-1-g1dd4c13

Picca Frédéric-Emma?==?UTF-8?Q?nuel picca at debian.org
Tue May 7 07:14:32 UTC 2013


The following commit has been merged in the master branch:
commit 6637fb60dd9a6e6943580b29649f9c1ff8f2445b
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Mon May 28 18:31:34 2012 +0200

    fix installation for the tango8 reorganisation

diff --git a/debian/liblog4tango4-doc.install b/debian/liblog4tango4-doc.install
index ae2eec6..cf2f6bf 100644
--- a/debian/liblog4tango4-doc.install
+++ b/debian/liblog4tango4-doc.install
@@ -1 +1 @@
-usr/share/doc/log4tango/log4tango-4.0.3/api usr/share/doc/liblog4tango4-doc/html
+usr/share/doc/log4tango/log4tango-*/api usr/share/doc/liblog4tango4-doc/html
diff --git a/debian/libtango7-doc.install b/debian/libtango7-doc.install
deleted file mode 100644
index d93b0e7..0000000
--- a/debian/libtango7-doc.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/doc/tango/tango.pdf usr/share/doc/libtango7-doc
diff --git a/debian/libtango7-dev.install b/debian/libtango8-dev.install
similarity index 100%
rename from debian/libtango7-dev.install
rename to debian/libtango8-dev.install
diff --git a/debian/libtango8-doc.install b/debian/libtango8-doc.install
new file mode 100644
index 0000000..eaddc5e
--- /dev/null
+++ b/debian/libtango8-doc.install
@@ -0,0 +1 @@
+usr/share/doc/tango/tango.pdf usr/share/doc/libtango8-doc
diff --git a/debian/libtango7.install b/debian/libtango8.install
similarity index 100%
rename from debian/libtango7.install
rename to debian/libtango8.install
diff --git a/debian/rules b/debian/rules
index d643d6c..e17dc3c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,13 +36,13 @@ override_dh_auto_install:
 	install -p -m 600 $(CURDIR)/$(BUILDROOT)/cppserver/database/my.cnf debian/tmp/usr/share/tango-db/my.cnf
 
 override_dh_strip:
-	dh_strip -plibtango7 --dbg-package=libtango7-dbg
+	dh_strip -plibtango8 --dbg-package=libtango8-dbg
 	dh_strip -pliblog4tango4 --dbg-package=liblog4tango4-dbg
 	dh_strip -ptango-db --dbg-package=tango-db-dbg
 	dh_strip -ptango-starter --dbg-package=tango-starter-dbg
 	dh_strip -ptango-accesscontrol --dbg-package=tango-accesscontrol-dbg
 	dh_strip -ptango-test --dbg-package=tango-test-dbg
-	dh_strip -a -Nlibtango7 -Nliblog4tango4 -Ntango-db -Ntango-starter -Ntango-accesscontrol -Ntango-test
+	dh_strip -a -Nlibtango8 -Nliblog4tango4 -Ntango-db -Ntango-starter -Ntango-accesscontrol -Ntango-test
 
 override_dh_installinit:
 	# the tango-accesscontrol device must be started after the tango-db.
diff --git a/debian/todo b/debian/todo
index 72a62a8..70635ee 100644
--- a/debian/todo
+++ b/debian/todo
@@ -23,3 +23,11 @@ index e0231d5..3d0ea84 100644
 +
  pkgconfigdir = $(libdir)/pkgconfig
  pkgconfig_DATA = log4tango.pc		
+
+- what about the configure check for zeromq but require zmq.hpp ?
+
+- what about Alessio patches for precise.
+
+- what about the upgrade tango db etc...
+
+- doxygen -u pour upgrader le fichier de configuration
\ No newline at end of file

-- 
TANGO distributed control system.



More information about the debian-science-commits mailing list