[Pkg-privacy-commits] [libotr] 147/225: Imported Debian patch 3.2.0-3

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository libotr.

commit 96bfa0836b424563c9b43fa4c52b00d580c517a3
Author: Thibaut VARENE <varenet at debian.org>
Date:   Mon Oct 31 20:44:01 2011 +0100

    Imported Debian patch 3.2.0-3
---
 debian/changelog           | 6 ++++++
 debian/control             | 9 +++++----
 debian/libotr2-dev.install | 1 +
 debian/rules               | 6 ++++--
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 48aa5f4..394ac6b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libotr (3.2.0-3) unstable; urgency=low
+
+  * Ship libotr.pc (Closes: #590035)
+
+ -- Thibaut VARENE <varenet at debian.org>  Mon, 31 Oct 2011 20:44:01 +0100
+
 libotr (3.2.0-2.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff --git a/debian/control b/debian/control
index b57f920..1dd2356 100644
--- a/debian/control
+++ b/debian/control
@@ -3,12 +3,12 @@ Section: libs
 Priority: optional
 Maintainer: Thibaut VARENE <varenet at debian.org>
 Build-Depends: debhelper (>= 4.0.0), libgpg-error-dev (>= 1.0), libgcrypt11-dev (>= 1.2.0), autotools-dev
-Standards-Version: 3.8.3
+Standards-Version: 3.9.2
 
 Package: libotr2
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: libotr2-bin (>= ${binary:Version})
 Replaces: libotr0
 Description: Off-the-Record Messaging library
@@ -32,7 +32,7 @@ Description: Off-the-Record Messaging library
 Package: libotr2-bin
 Section: misc
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: libotr1-bin
 Replaces: libotr1-bin
 Description: toolkit for Off-the-Record Messaging library
@@ -58,7 +58,8 @@ Description: toolkit for Off-the-Record Messaging library
 Package: libotr2-dev
 Section: libdevel
 Architecture: any
-Depends: libotr2 (= ${binary:Version}), libgcrypt11-dev, ${shlibs:Depends}
+Depends: libotr2 (= ${binary:Version}), libgcrypt11-dev, ${shlibs:Depends}, ${misc:Depends}
+Suggests: pkg-config
 Conflicts: libotr-dev, libotr1-dev
 Replaces: libotr-dev, libotr0-dev, libotr1-dev
 Description: Off-the-Record Messaging library development files
diff --git a/debian/libotr2-dev.install b/debian/libotr2-dev.install
index 589899f..f95fc4f 100644
--- a/debian/libotr2-dev.install
+++ b/debian/libotr2-dev.install
@@ -3,3 +3,4 @@ debian/tmp/usr/lib/lib*.a usr/lib
 debian/tmp/usr/lib/lib*.la usr/lib
 debian/tmp/usr/lib/lib*.so usr/lib
 debian/tmp/usr/share/aclocal/* usr/share/aclocal
+debian/tmp/usr/lib/pkgconfig/libotr.pc usr/lib/pkgconfig
diff --git a/debian/rules b/debian/rules
index 595b1a4..50b2922 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,7 +34,9 @@ configure-stamp:
 	touch configure-stamp
 
 
-build: build-stamp
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep: build-stamp
 
 build-stamp: configure-stamp 
 	dh_testdir
@@ -57,7 +59,7 @@ clean:
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k 
+	dh_prep
 	dh_installdirs
 
 	# Add here commands to install the package

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/libotr.git