[Pkg-cyrus-sasl2-commits] r496 - in /cyrus-sasl-2.1/trunk/debian: changelog patches/0014_avoid_pic_overwrite.dpatch

[fabbe at users.alioth.debian.org]

Author: fabbe
Date: Mon Jun  8 16:33:42 2009
New Revision: 496

URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/?sc=1&rev=496
Log:
Apply 0014_avoid_pic_overwrite to lib/Makefile.am, too.

Modified:
    cyrus-sasl-2.1/trunk/debian/changelog
    cyrus-sasl-2.1/trunk/debian/patches/0014_avoid_pic_overwrite.dpatch

Modified: cyrus-sasl-2.1/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/debian/changelog?rev=496&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/changelog (original)
+++ cyrus-sasl-2.1/trunk/debian/changelog Mon Jun  8 16:33:42 2009
@@ -4,8 +4,10 @@
   * debian/control: Change Vcs-* fields to point to trunk.
   * debian/rules: Remove build-indep-stamp and build-arch-stamp when cleaning
     up (from Ubuntu) (Closes: #516538).
-
- -- Fabian Fagerholm <fabbe at debian.org>  Mon, 08 Jun 2009 19:31:13 +0300
+  * debian/patches/0014_avoid_pic_overwrite.dpatch: Also apply to
+    lib/Makefile.am. Thanks to Amadeu A. Barbosa Jr. (Closes: #502910)
+
+ -- Fabian Fagerholm <fabbe at debian.org>  Mon, 08 Jun 2009 19:32:22 +0300
 
 cyrus-sasl2 (2.1.23.dfsg1-1) unstable; urgency=high
 

Modified: cyrus-sasl-2.1/trunk/debian/patches/0014_avoid_pic_overwrite.dpatch
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/debian/patches/0014_avoid_pic_overwrite.dpatch?rev=496&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/patches/0014_avoid_pic_overwrite.dpatch (original)
+++ cyrus-sasl-2.1/trunk/debian/patches/0014_avoid_pic_overwrite.dpatch Mon Jun  8 16:33:42 2009
@@ -10,9 +10,21 @@
 ## DP: the correct locations.
 
 @DPATCH@
+diff -urNad trunk~/lib/Makefile.am trunk/lib/Makefile.am
+--- trunk~/lib/Makefile.am	2009-06-08 19:19:23.000000000 +0300
++++ trunk/lib/Makefile.am	2009-06-08 19:19:38.000000000 +0300
+@@ -76,7 +76,7 @@
+ 
+ libsasl2.a: libsasl2.la $(SASL_STATIC_OBJS)
+ 	@echo adding static plugins and dependencies
+-	$(AR) cru .libs/$@ $(SASL_STATIC_OBJS)
++	$(AR) cru $@ $(SASL_STATIC_OBJS)
+ 	@for i in ./libsasl2.la ../sasldb/libsasldb.la ../plugins/lib*.la; do \
+ 	if test ! -f $$i; then continue; fi; . $$i; \
+ 	for j in $$dependency_libs foo; do \
 diff -urNad trunk~/sasldb/Makefile.am trunk/sasldb/Makefile.am
---- trunk~/sasldb/Makefile.am	2006-05-29 22:52:46.000000000 +0300
-+++ trunk/sasldb/Makefile.am	2006-11-09 12:36:36.000000000 +0200
+--- trunk~/sasldb/Makefile.am	2009-05-24 18:16:21.000000000 +0300
++++ trunk/sasldb/Makefile.am	2009-06-08 19:19:24.000000000 +0300
 @@ -63,6 +63,6 @@
  EXTRA_libsasldb_a_SOURCES =