[tango] 05/07: rename -doc packages

[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 671b43a5abc0fa91e753cf317417d696a77dc261
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Sat Mar 12 11:17:35 2016 +0100

    rename -doc packages
---
 debian/changelog                                           |  7 ++++---
 debian/control                                             |  6 ++++--
 debian/{liblog4tango5-doc.links => liblog4tango-doc.links} |  2 +-
 debian/rules                                               | 12 ++++++------
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a17b62e..1bbed81 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,10 +5,11 @@ tango (9.2.1+dfsg-1~exp1) experimental; urgency=medium
   * debian/control
     - Update Vcs-Git
     - Add new binary packages:
-      + liblog4tango-dev, libtango9, libtango-dev
+      + liblog4tango-dev, liblog4tango-doc,
+        libtango9, libtango-dev, libtango-doc
     - remove binary packages:
-      + liblog4tango5-dev, liblog4tango5-dbg,
-        libtango8v5, libtango8-dev, libtango8v5-dbg,
+      + liblog4tango5-dev, liblog4tango5-doc, liblog4tango5-dbg,
+        libtango8v5, libtango8-dev, libtango8-doc, libtango8v5-dbg,
         tango-db-dbg, tango-accesscontrol-dbg,
         tango-starter-dbg, tango-test-dbg
     - BuildDepends:
diff --git a/debian/control b/debian/control
index d479ffd..f1239ea 100644
--- a/debian/control
+++ b/debian/control
@@ -56,11 +56,13 @@ Description: logging for TANGO - development library
  .
  This package contains the log4tango5 development files.
 
-Package: liblog4tango5-doc
+Package: liblog4tango-doc
 Architecture: all
 Section: doc
 Depends: ${misc:Depends},
          libjs-jquery
+Conflicts: liblog4tango5-doc
+Replaces: liblog4tango5-doc
 Description: logging for TANGO - documentation
  Log for TANGO is a library of C++ classes for flexible logging to files,
  syslog and other destinations. It is modeled after the Log for
@@ -120,7 +122,7 @@ Description: TANGO distributed control system - development library
  .
  This package contains the tango9 development files.
 
-Package: libtango9-doc
+Package: libtango-doc
 Architecture: all
 Section: doc
 Depends: ${misc:Depends}
diff --git a/debian/liblog4tango5-doc.links b/debian/liblog4tango-doc.links
similarity index 71%
rename from debian/liblog4tango5-doc.links
rename to debian/liblog4tango-doc.links
index c06ed76..b034ea7 100644
--- a/debian/liblog4tango5-doc.links
+++ b/debian/liblog4tango-doc.links
@@ -1 +1 @@
-/usr/share/javascript/jquery/jquery.js /usr/share/doc/liblog4tango5-doc/html/api/jquery.js
\ No newline at end of file
+/usr/share/javascript/jquery/jquery.js /usr/share/doc/liblog4tango-doc/html/api/jquery.js
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index 59fef63..0a63073 100755
--- a/debian/rules
+++ b/debian/rules
@@ -65,9 +65,9 @@ override_dh_install:
 	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
+	# liblog4tango-doc
+	dh_install -p liblog4tango-doc usr/share/doc/log4tango/log4tango-*/api usr/share/doc/liblog4tango-doc/html
+	dh_install -p liblog4tango-doc usr/share/man/man3
 
 	# libtango9
 	dh_install -p libtango9 usr/lib/*/libtango.so.*
@@ -78,9 +78,9 @@ override_dh_install:
 	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-doc
+	dh_install -p libtango-doc usr/share/doc/tango/tango.pdf usr/share/doc/libtango-doc
+	dh_install -p libtango-doc usr/share/tango/idl usr/share/doc/libtango-doc
 
 	# libtango-tools
 	dh_install -p libtango-tools usr/bin/tango_admin usr/lib/tango

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