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

Tue May 7 07:14:38 UTC 2013

The following commit has been merged in the master branch:
commit 1f7218320218de445f9721bb624e7080f5a22f27
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Fri Dec 14 09:23:47 2012 +0100

    prepare the changelog for experimental release
    
    bump Standards-Version 3.9.4
    fix the Multi-arch binary packages

diff --git a/debian/changelog b/debian/changelog
index cde0906..5ee4fd6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,20 +1,31 @@
 tango (8.0.5+dfsg-1~exp1) UNRELEASED; urgency=low
 
   * Imported Upstream version 8.0.5+dfsg
-  * reorganize packages for tango8.
+  * Bump Standards-Version to 3.9.4 (nothing to do)
+  * switch to compat level 9
+  * debian/control
+    - Add new binary packages libtango8, libtango8-dev, libtango8-dbg
+    - Remove binary packages libtango7, libtango7-dev, libtango7-dbg
+    - Multiarchify:
+      * liblog4tango4, liblog4tango4-dev, liblog4tango4-dbg
+      * libtango8, libtango8-dev, libtango8-dbg
+      * tango-common
   * debian/patches
-    - 0001-debian-fix_database_scripts.patch (refreshed)
-    - 0002-debian-my.cnf.in.patch (refreshed)
-    - 0003-debian-notify_daemon.patch (refreshed)
-    - 0004-upstream-fix-bug3285674.patch (deleted)
-    - 0004-upstream-fix-p805_1.patch (new)
-    - 0005-upstream-fix-bug3213730.patch (deleted)
-    - 0005-fix-forwaded-upstream-add-LIBZMQ_LIBS-to-libtango.patch (new)
-    - 0006-feature-forwarded-upstream-pkg-config-small-fixes.patch (deleted)
-    - 0006-upstream-fix-p805_2.patch (new)
-    - 0007-upstream-fix-tango-db-start-during-init.patch (deleted)
-    - 0008-feature-add-jpegmmx-option-to-configure-script.patch (deleted)
-    - 0009-upstream-fix-bug3339975.patch (deleted)
+    - refreshed
+      * 0001-debian-fix_database_scripts.patch
+      * 0002-debian-my.cnf.in.patch
+      * 0003-debian-notify_daemon.patch
+    - deleted
+      * 0004-upstream-fix-bug3285674.patch
+      * 0005-upstream-fix-bug3213730.patch
+      * 0006-feature-forwarded-upstream-pkg-config-small-fixes.patch
+      * 0007-upstream-fix-tango-db-start-during-init.patch
+      * 0008-feature-add-jpegmmx-option-to-configure-script.patch
+      * 0009-upstream-fix-bug3339975.patch
+    - new
+      * 0004-upstream-fix-p805_1.patch
+      * 0005-fix-forwaded-upstream-add-LIBZMQ_LIBS-to-libtango.patch
+      * 0006-upstream-fix-p805_2.patch
 
  -- Picca Frédéric-Emmanuel <picca at debian.org>  Mon, 28 May 2012 09:38:26 +0200
 
diff --git a/debian/control b/debian/control
index 1faccc8..f074cc5 100644
--- a/debian/control
+++ b/debian/control
@@ -10,18 +10,18 @@ Build-Depends: debhelper (>= 9),
                libmysqlclient-dev,
                libzmq3-dev,
                po-debconf
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 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
 Architecture: any
-Section: libs
 Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
+Section: libs
 Depends: ${misc:Depends},
          ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends}
 Description: logging for TANGO - shared 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
@@ -33,9 +33,11 @@ Description: logging for TANGO - shared library
 
 Package: liblog4tango4-dev
 Architecture: any
+Multi-Arch: same
 Section: libdevel
 Depends: ${misc:Depends},
          liblog4tango4 (= ${binary:Version})
+Pre-Depends: ${misc:Pre-Depends}
 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
@@ -46,10 +48,12 @@ Description: logging for TANGO - development library
 
 Package: liblog4tango4-dbg
 Architecture: any
+Multi-Arch: same
 Section: debug
 Priority: extra
 Depends: ${misc:Depends},
          liblog4tango4 (= ${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,
  syslog and other destinations. It is modeled after the Log for
@@ -73,12 +77,12 @@ Description: logging for TANGO - documentation
 
 Package: libtango8
 Architecture: any
-Section: libs
 Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
+Section: libs
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          tango-common
+Pre-Depends: ${misc:Pre-Depends}
 Description: TANGO distributed control system - shared library
  TANGO is an object-oriented distributed control system using CORBA. In
  TANGO all objects are representations of devices, which can be on the
@@ -98,12 +102,14 @@ Description: TANGO distributed control system - shared library
 
 Package: libtango8-dev
 Architecture: any
+Multi-Arch: same
 Section: libdevel
 Depends: ${misc:Depends},
          libcos4-dev,
          liblog4tango4-dev,
          libtango8 (= ${binary:Version}),
          libzmq3-dev
+Pre-Depends: ${misc:Pre-Depends}
 Conflicts: libtango7-dev
 Description: TANGO distributed control system - development library
  TANGO is an object-oriented distributed control system using CORBA. In
@@ -124,10 +130,12 @@ Description: TANGO distributed control system - development library
 
 Package: libtango8-dbg
 Architecture: any
+Multi-Arch: same
 Section: debug
 Priority: extra
 Depends: ${misc:Depends},
          libtango8 (= ${binary:Version})
+Pre-Depends: ${misc:Pre-Depends}
 Description: TANGO distributed control system - debug library
  TANGO is an object-oriented distributed control system using CORBA. In
  TANGO all objects are representations of devices, which can be on the
@@ -178,8 +186,8 @@ Description: TANGO distributed control system - common executable files
 
 Package: tango-common
 Architecture: all
-Section: net
 Multi-Arch: foreign
+Section: net
 Depends: ${misc:Depends},
          adduser
 Description: TANGO distributed control system - common files

-- 
TANGO distributed control system.

