[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:36 UTC 2013


The following commit has been merged in the master branch:
commit 2c7dc8b1022ddb55274800c6393c164f11a875ad
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Sat Aug 18 09:53:52 2012 +0200

    multi-archify tango

diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index 5f78d46..5c099f4 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.
 Uploaders: Picca Frédéric-Emmanuel <picca at debian.org>
 Section: science
 Priority: extra
-Build-Depends: debhelper (>= 8),
+Build-Depends: debhelper (>= 9),
                dh-autoreconf,
                doxygen,
                libcos4-dev,
@@ -18,6 +18,8 @@ Homepage: http://www.tango-controls.org
 Package: liblog4tango4
 Architecture: any
 Section: libs
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          ${shlibs:Depends}
 Description: logging for TANGO - shared library
@@ -72,6 +74,8 @@ Description: logging for TANGO - documentation
 Package: libtango8
 Architecture: any
 Section: libs
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          tango-common
@@ -174,6 +178,7 @@ Description: TANGO distributed control system - common executable files
 Package: tango-common
 Architecture: all
 Section: net
+Multi-Arch: foreign
 Depends: ${misc:Depends},
          adduser
 Description: TANGO distributed control system - common files
diff --git a/debian/liblog4tango4-dev.install b/debian/liblog4tango4-dev.install
index dc33921..039c264 100644
--- a/debian/liblog4tango4-dev.install
+++ b/debian/liblog4tango4-dev.install
@@ -1,3 +1,3 @@
 usr/include/tango/log4tango
-usr/lib/liblog4tango*.so
-usr/lib/pkgconfig/log4tango.pc
+usr/lib/*/liblog4tango*.so
+usr/lib/*/pkgconfig/log4tango.pc
diff --git a/debian/liblog4tango4.install b/debian/liblog4tango4.install
index 8377c43..f6509be 100644
--- a/debian/liblog4tango4.install
+++ b/debian/liblog4tango4.install
@@ -1 +1 @@
-usr/lib/liblog4tango.so.*
+usr/lib/*/liblog4tango.so.*
diff --git a/debian/libtango8-dev.install b/debian/libtango8-dev.install
index 1f6ec94..7d8c51a 100644
--- a/debian/libtango8-dev.install
+++ b/debian/libtango8-dev.install
@@ -1,4 +1,4 @@
 usr/include/tango/*.h
 usr/include/tango/idl
-usr/lib/libtango*.so
-usr/lib/pkgconfig/tango.pc
+usr/lib/*/libtango*.so
+usr/lib/*/pkgconfig/tango.pc
diff --git a/debian/libtango8.install b/debian/libtango8.install
index edf5db8..922e600 100644
--- a/debian/libtango8.install
+++ b/debian/libtango8.install
@@ -1 +1 @@
-usr/lib/libtango.so.*
+usr/lib/*/libtango.so.*

-- 
TANGO distributed control system.



More information about the debian-science-commits mailing list