Merge pull request urcu#1 in VC/userspace-rcu from ~LBOCCASS/userspac…

…e-rcu:pkg-config-and-debhelper-9 to master * commit 'aa41eb8cade46dabfc2fcaf78959109d38a5a4f8': Change maintainer to [email protected] Install in arch-specific /usr/lib, comply with debhelper 9 Install pkg-config .pc files
bluca · Mar 23, 2015 · d11ffc9 · d11ffc9
2 parents 9b5a44e + aa41eb8
commit d11ffc9
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/debian/control b/debian/control
@@ -1,8 +1,8 @@
 Source: liburcu
 Priority: extra
-Maintainer: Vyatta Package Maintainers <maintainers@vyatta.com>
-Build-Depends: debhelper (>= 7.0.50~), dpkg-dev (>= 1.13.2), dh-autoreconf, gawk
-Standards-Version: 3.9.3
+Maintainer: Brocade Support <support@brocade.com>
+Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.13.2), dh-autoreconf, gawk
+Standards-Version: 3.9.6
 Section: libs
 Vcs-Git: git://git.debian.org/git/collab-maint/liburcu.git
 Vcs-Browser: http://git.debian.org/?p=collab-maint/liburcu.git;a=summary
@@ -11,6 +11,8 @@ Homepage: http://lttng.org/urcu
 Package: liburcu-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, liburcu3 (= ${binary:Version})
 Description: userspace RCU (read-copy-update) library - development files
  This data synchronization library provides read-side access which scales
@@ -24,6 +26,8 @@ Description: userspace RCU (read-copy-update) library - development files
 
 Package: liburcu3
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: liburcu2, liburcu1
 Description: userspace RCU (read-copy-update) library
@@ -36,6 +40,7 @@ Description: userspace RCU (read-copy-update) library
 Package: liburcu-dbg
 Architecture: any
 Priority: extra
+Depends: ${misc:Depends}, liburcu3 (= ${binary:Version})
 Section: debug
 Description: userspace RCU (read-copy-update) debugging symbols
  Debug symbols for Userspace RCU
diff --git a/debian/liburcu-dev.install b/debian/liburcu-dev.install
@@ -1,3 +1,4 @@
 usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.so
+usr/lib/*/lib*.a
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig
diff --git a/debian/liburcu3.install b/debian/liburcu3.install
@@ -1 +1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*
diff --git a/debian/rules b/debian/rules
@@ -14,9 +14,6 @@ endif
 %:
 	dh $@ --with autoreconf
 
-override_dh_auto_configure:
-	./configure --prefix=/usr
-
 override_dh_strip:
 	dh_strip --dbg-package=liburcu-dbg