[Pkg-telepathy-commits] [SCM] folks packaging branch branch, debian-experimental, updated. debian/0.9.1-2-16-g2c356e0

Laurent Bigonville bigon at bigon.be
Sat Jun 8 14:37:24 UTC 2013 

The following commit has been merged in the debian-experimental branch:
commit 426cfb10cbbdca89e7ffee1d129d92281a7eefb2
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Fri Jun 7 17:12:31 2013 +0200

    Convert to multiarch policy, bump debhelper compatibility to 9 and get the hardening flags for free

diff --git a/debian/changelog b/debian/changelog
index f351ad6..dd64baf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ folks (0.9.1-3) UNRELEASED; urgency=low
     - Use canonical URL for the VCS fields
     - Add missing separator in libfolks-dev Depends field
     - Bump Standards-Version to 3.9.4 (no further changes)
+  * Convert to multiarch policy, bump debhelper compatibility to 9 and get the
+    hardening flags for free
 
  -- Emilio Pozuelo Monfort <pochu at debian.org>  Tue, 28 May 2013 21:27:31 +0200
 
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 0c82f91..d97c930 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Maintainer: Debian Telepathy maintainers <pkg-telepathy-maintainers at lists.alioth
 Uploaders: Laurent Bigonville <bigon at debian.org>,
            Sjoerd Simons <sjoerd at debian.org>,
            Emilio Pozuelo Monfort <pochu at debian.org>
-Build-Depends: debhelper (>= 7.0.50~),
+Build-Depends: debhelper (>= 9),
                dh-autoreconf (>= 4),
                autotools-dev,
                intltool (>= 0.50),
@@ -36,6 +36,8 @@ Depends: ${shlibs:Depends},
          folks-common (= ${source:Version})
 Recommends: libfolks-eds25,
 Breaks: libfolks-eds25 (<< 0.8.0-2~), libfolks-telepathy25 (<< 0.8.0-2~)
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Description: library to aggregates people into metacontacts
  libfolks is a library that aggregates people from multiple sources
  (eg, Telepathy connection managers and eventually evolution data server,
@@ -62,6 +64,7 @@ Priority: extra
 Architecture: any
 Depends: libfolks25 (= ${binary:Version}),
          ${misc:Depends}
+Multi-Arch: same
 Description: library to aggregates people into metacontact - debugging symbols
  libfolks is a library that aggregates people from multiple sources
  (eg, Telepathy connection managers and eventually evolution data server,
@@ -72,6 +75,7 @@ Description: library to aggregates people into metacontact - debugging symbols
 Package: folks-common
 Architecture: all
 Depends: ${misc:Depends}
+Multi-Arch: foreign
 Description: library to aggregates people into metacontacts (common files)
  libfolks is a library that aggregates people from multiple sources
  (eg, Telepathy connection managers and eventually evolution data server,
@@ -99,6 +103,8 @@ Depends: ${shlibs:Depends},
          ${misc:Depends},
          libfolks25 (= ${binary:Version})
 Recommends: folks-common (= ${source:Version})
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Description: Telepathy backend for libfolks
  libfolks is a library that aggregates people from multiple sources
  (eg, Telepathy connection managers and eventually evolution data server,
@@ -128,6 +134,8 @@ Depends: ${shlibs:Depends},
          libfolks25 (= ${binary:Version}),
          evolution-data-server (>= 3.2.0)
 Recommends: folks-common (= ${source:Version})
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Description: Evolution-data-server backend for libfolks
  libfolks is a library that aggregates people from multiple sources
  (eg, Telepathy connection managers and eventually evolution data server,
@@ -157,6 +165,7 @@ Priority: extra
 Architecture: any
 Depends: libfolks-eds25 (= ${binary:Version}),
          ${misc:Depends}
+Multi-Arch: same
 Description: Evolution-data-server backend for libfolks - debugging symbols
  libfolks is a library that aggregates people from multiple sources
  (eg, Telepathy connection managers and eventually evolution data server,
@@ -170,6 +179,7 @@ Priority: extra
 Architecture: any
 Depends: libfolks-telepathy25 (= ${binary:Version}),
          ${misc:Depends}
+Multi-Arch: same
 Description: Telepathy backend for libfolks - debugging symbols
  libfolks is a library that aggregates people from multiple sources
  (eg, Telepathy connection managers and eventually evolution data server,
diff --git a/debian/gir1.2-folks-0.6.install b/debian/gir1.2-folks-0.6.install
index b0c5cee..19f78b2 100644
--- a/debian/gir1.2-folks-0.6.install
+++ b/debian/gir1.2-folks-0.6.install
@@ -1 +1 @@
-usr/lib/girepository-1.0/Folks-0.6.typelib
+usr/lib/*/girepository-1.0/Folks-0.6.typelib usr/lib/girepository-1.0/
diff --git a/debian/libfolks-dev.install b/debian/libfolks-dev.install
index 0c80d24..4fb89d6 100644
--- a/debian/libfolks-dev.install
+++ b/debian/libfolks-dev.install
@@ -1,5 +1,5 @@
-usr/lib/libfolks.so
+usr/lib/*/libfolks.so
 usr/include/folks/folks.h
-usr/lib/pkgconfig/folks.pc
+usr/lib/*/pkgconfig/folks.pc
 usr/share/vala/vapi/folks.*
 usr/share/gir-1.0/Folks-0.6.gir
diff --git a/debian/libfolks-eds-dev.install b/debian/libfolks-eds-dev.install
index 2326030..0561e69 100644
--- a/debian/libfolks-eds-dev.install
+++ b/debian/libfolks-eds-dev.install
@@ -1,4 +1,4 @@
-usr/lib/libfolks-eds.so
+usr/lib/*/libfolks-eds.so
 usr/include/folks/folks-eds.h
-usr/lib/pkgconfig/folks-eds.pc
+usr/lib/*/pkgconfig/folks-eds.pc
 usr/share/vala/vapi/folks-eds.*
diff --git a/debian/libfolks-eds25.install b/debian/libfolks-eds25.install
index a5d8251..2eceea9 100644
--- a/debian/libfolks-eds25.install
+++ b/debian/libfolks-eds25.install
@@ -1,2 +1,2 @@
-usr/lib/libfolks-eds.so.*
-usr/lib/folks/*/backends/eds/*.so
+usr/lib/*/libfolks-eds.so.*
+usr/lib/*/folks/*/backends/eds/*.so
diff --git a/debian/libfolks-telepathy-dev.install b/debian/libfolks-telepathy-dev.install
index ed62d73..c11d931 100644
--- a/debian/libfolks-telepathy-dev.install
+++ b/debian/libfolks-telepathy-dev.install
@@ -1,4 +1,4 @@
-usr/lib/libfolks-telepathy.so
+usr/lib/*/libfolks-telepathy.so
 usr/include/folks/folks-telepathy.h
-usr/lib/pkgconfig/folks-telepathy.pc
+usr/lib/*/pkgconfig/folks-telepathy.pc
 usr/share/vala/vapi/folks-telepathy.*
diff --git a/debian/libfolks-telepathy25.install b/debian/libfolks-telepathy25.install
index 9fffa41..f88e307 100644
--- a/debian/libfolks-telepathy25.install
+++ b/debian/libfolks-telepathy25.install
@@ -1,2 +1,2 @@
-usr/lib/libfolks-telepathy.so.*
-usr/lib/folks/*/backends/telepathy/*.so
+usr/lib/*/libfolks-telepathy.so.*
+usr/lib/*/folks/*/backends/telepathy/*.so
diff --git a/debian/libfolks25.install b/debian/libfolks25.install
index 71799a7..a98e1ed 100644
--- a/debian/libfolks25.install
+++ b/debian/libfolks25.install
@@ -1,2 +1,2 @@
-usr/lib/libfolks.so.*
-usr/lib/folks/*/backends/key-file/*.so
+usr/lib/*/libfolks.so.*
+usr/lib/*/folks/*/backends/key-file/*.so

-- 
folks packaging branch

More information about the Pkg-telepathy-commits mailing list