← Back to branch summary

~ubuntu-branches/ubuntu/trusty/apr-util/trusty-proposed

« back to all changes in this revision

Viewing changes to debian/patches/014_apu_config_dont_list_indep_libs.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Ryan Niebur, Ryan Niebur, Stefan Fritsch
  • Date: 2009-03-26 22:25:48 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20090326222548-w6n07bfofjy0823w
Tags: 1.3.4+dfsg-1
http://bugs.debian.org/519818
http://bugs.debian.org/508145
http://bugs.debian.org/515352
[ Ryan Niebur ]
* New upstream version
* add me to Uploaders
* add repack.sh
* update to libdb4.7-dev (Closes: #519818)
* Debian policy 3.8.1
* remove *.dirs, they're not needed
* lintian overrides for the symbols file depending on different
  packages, we have those "unusual circumstances" :)
  - debhelper 6 (needed for dh_lintian)
* remove build/apr_common.m4 in the clean target, it gets modified
  during build and is automatically generated
* switch the libaprutil1-dbg package to the debug section
* don't output ldap libs by default from apu-config
* upload to unstable this time

[ Stefan Fritsch ]
* Fix description for libaprutil1-dbg (closes: #508145).
* Recognize DEB_BUILD_OPTIONS=nocheck in addition to notest (closes: #515352).
* Make dpkg-shlibdeps automatically generate the needed dependencies for
  programs that use apr_ldap_init() or apr_dbd_init().
  For dbd, we will genreate an ORed dependency on all libaprutil1-dbd-*
  packages, using libaprutil1-dbd-mysql as default.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/014_apu_config_dont_list_indep_libs.dpatch
4
4
## DP: Prevent recursive linking of dependent libraries by apr-util users.
5
5
 
6
6
@DPATCH@
7
 
Index: apr-util.pc.in
8
 
--- a/apr-util.pc.in
9
 
+++ b/apr-util.pc.in
 
7
diff -urNad apr-util~/apr-util.pc.in apr-util/apr-util.pc.in
 
8
--- apr-util~/apr-util.pc.in    2008-06-27 15:36:07.000000000 -0700
 
9
+++ apr-util/apr-util.pc.in     2008-06-27 16:03:17.000000000 -0700
10
10
@@ -8,6 +8,7 @@
11
11
 Description: Companion library for APR
12
12
 Version: @APRUTIL_DOTTED_VERSION@
13
13
 # assume that apr-util requires libapr of same major version
14
14
-Requires: apr-@APRUTIL_MAJOR_VERSION@
15
 
-Libs: -L${libdir} -l@APRUTIL_LIBNAME@ @APRUTIL_EXPORT_LIBS@
 
15
-Libs: -L${libdir} -l@APRUTIL_LIBNAME@ @LDADD_ldap@ @APRUTIL_EXPORT_LIBS@
16
16
+Requires.private: apr-@APRUTIL_MAJOR_VERSION@
17
 
+Libs: -L${libdir} -l@APRUTIL_LIBNAME@
 
17
+Libs: -L${libdir} -l@APRUTIL_LIBNAME@ @LDADD_ldap@
18
18
+Libs.private: @APRUTIL_EXPORT_LIBS@
19
19
 Cflags: -I${includedir}
20
 
Index: apu-config.in
21
 
--- a/apu-config.in
22
 
+++ b/apu-config.in
 
20
diff -urNad apr-util~/apu-config.in apr-util/apu-config.in
 
21
--- apr-util~/apu-config.in     2008-05-23 14:27:59.000000000 -0700
 
22
+++ apr-util/apu-config.in      2008-06-27 16:30:04.000000000 -0700
23
23
@@ -27,7 +27,7 @@
24
24
 libdir="@libdir@"
25
25
 includedir="@includedir@"
28
28
+LIBS=
29
29
 INCLUDES="@APRUTIL_INCLUDES@"
30
30
 LDFLAGS="@APRUTIL_LDFLAGS@"
31
 
 
 
31
 LDAP_LIBS="@LDADD_ldap@"