[SCM] tango branch, master, updated. debian/8.0.5+dfsg-3-13-g3aeb0c6

[Picca Frédéric-Emmanuel]

The following commit has been merged in the master branch:
commit 3aeb0c6a9fe8e0789c4f9943bb973149d6f157c9
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Tue Jul 9 22:03:31 2013 +0200

    bump the liblog4tango so version number

diff --git a/debian/changelog b/debian/changelog
index 39c2d2c..baa45b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,11 @@ tango (8.1.2a+dfsg-1) unstable; urgency=low
 
   * Imported Upstream version 8.1.2a+dfsg
   * update repack.local to remove the jzmq part
+  * debian/control
+    - add new binary packages:
+      + liblog4tango5, liblog4tango5-dev, liblog4tango5-dbg
+    - remove binary packages:
+      + liblog4tango4, liblog4tango4-dev, liblog4tango4-dbg
   * debian/patches
     - deleted
       * 0004-upstream-fix-p805_1.patch
diff --git a/debian/control b/debian/control
index 37e235c..357f792 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Vcs-Browser: http://git.debian.org/?p=debian-science/packages/tango.git
 Vcs-Git: git://git.debian.org/git/debian-science/packages/tango.git
 Homepage: http://www.tango-controls.org
 
-Package: liblog4tango4
+Package: liblog4tango5
 Architecture: any
 Multi-Arch: same
 Section: libs
@@ -29,29 +29,30 @@ Description: logging for TANGO - shared library
  their API as is reasonable.
  .
  This package contains the files necessary for running applications that
- use the log4tango4 library.
+ use the log4tango5 library.
 
-Package: liblog4tango4-dev
+Package: liblog4tango5-dev
 Architecture: any
 Multi-Arch: same
 Section: libdevel
 Depends: ${misc:Depends},
-         liblog4tango4 (= ${binary:Version})
+         liblog4tango5 (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
+Conflicts: liblog4tango4-dev
 Description: logging for TANGO - development library
  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
  C++ library (http://jakarta.apache.org/log4j/), staying as close to
  their API as is reasonable.
  .
- This package contains the log4tango4 development files.
+ This package contains the log4tango5 development files.
 
-Package: liblog4tango4-dbg
+Package: liblog4tango5-dbg
 Architecture: any
 Multi-Arch: same
 Section: debug
 Depends: ${misc:Depends},
-         liblog4tango4 (= ${binary:Version})
+         liblog4tango5 (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
 Description: logging for TANGO - debug library
  Log for TANGO is a library of C++ classes for flexible logging to files,
@@ -59,9 +60,9 @@ Description: logging for TANGO - debug library
  C++ library (http://jakarta.apache.org/log4j/), staying as close to
  their API as is reasonable.
  .
- This package contains the debugging symbol for liblog4tango4.
+ This package contains the debugging symbol for liblog4tango5.
 
-Package: liblog4tango4-doc
+Package: liblog4tango5-doc
 Architecture: all
 Section: doc
 Depends: ${misc:Depends},
@@ -72,7 +73,7 @@ Description: logging for TANGO - documentation
  C++ library (http://jakarta.apache.org/log4j/), staying as close to
  their API as is reasonable.
  .
- This package contains the documentation of the log4tango4 library.
+ This package contains the documentation of the log4tango5 library.
 
 Package: libtango8
 Architecture: any
@@ -105,7 +106,7 @@ Multi-Arch: same
 Section: libdevel
 Depends: ${misc:Depends},
          libcos4-dev,
-         liblog4tango4-dev,
+         liblog4tango5-dev,
          libtango8 (= ${binary:Version}),
          libzmq3-dev
 Pre-Depends: ${misc:Pre-Depends}
diff --git a/debian/liblog4tango4-dev.install b/debian/liblog4tango5-dev.install
similarity index 100%
rename from debian/liblog4tango4-dev.install
rename to debian/liblog4tango5-dev.install
diff --git a/debian/liblog4tango4-doc.install b/debian/liblog4tango5-doc.install
similarity index 83%
rename from debian/liblog4tango4-doc.install
rename to debian/liblog4tango5-doc.install
index cf2f6bf..d002aff 100644
--- a/debian/liblog4tango4-doc.install
+++ b/debian/liblog4tango5-doc.install
@@ -1 +1 @@
-usr/share/doc/log4tango/log4tango-*/api usr/share/doc/liblog4tango4-doc/html
+usr/share/doc/log4tango/log4tango-*/api usr/share/doc/liblog4tango5-doc/html
diff --git a/debian/liblog4tango4-doc.links b/debian/liblog4tango5-doc.links
similarity index 71%
rename from debian/liblog4tango4-doc.links
rename to debian/liblog4tango5-doc.links
index ba57f46..c06ed76 100644
--- a/debian/liblog4tango4-doc.links
+++ b/debian/liblog4tango5-doc.links
@@ -1 +1 @@
-/usr/share/javascript/jquery/jquery.js /usr/share/doc/liblog4tango4-doc/html/api/jquery.js
\ No newline at end of file
+/usr/share/javascript/jquery/jquery.js /usr/share/doc/liblog4tango5-doc/html/api/jquery.js
\ No newline at end of file
diff --git a/debian/liblog4tango4.install b/debian/liblog4tango5.install
similarity index 100%
rename from debian/liblog4tango4.install
rename to debian/liblog4tango5.install
diff --git a/debian/rules b/debian/rules
index a71e2ff..591d2d3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,12 +35,12 @@ override_dh_auto_install:
 
 override_dh_strip:
 	dh_strip -plibtango8 --dbg-package=libtango8-dbg
-	dh_strip -pliblog4tango4 --dbg-package=liblog4tango4-dbg
+	dh_strip -pliblog4tango5 --dbg-package=liblog4tango5-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 -Nlibtango8 -Nliblog4tango4 -Ntango-db -Ntango-starter -Ntango-accesscontrol -Ntango-test
+	dh_strip -a -Nlibtango8 -Nliblog4tango5 -Ntango-db -Ntango-starter -Ntango-accesscontrol -Ntango-test
 
 override_dh_installinit:
 	# the tango-accesscontrol device must be started after the tango-db.

-- 
TANGO distributed control system.