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

[roberto at users.alioth.debian.org]

Author: roberto
Date: Sun Sep 13 01:32:19 2009
New Revision: 500

URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/?sc=1&rev=500
Log:
Restore that changes that follow the NMU.

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

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=500&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/changelog (original)
+++ cyrus-sasl-2.1/trunk/debian/changelog Sun Sep 13 01:32:19 2009
@@ -1,3 +1,14 @@
+cyrus-sasl2 (2.1.23.dfsg1-2) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * 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).
+  * 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.1) unstable; urgency=medium
 
   * Build-Depend also on mysqlclient-dev. Closes: #542904

Modified: cyrus-sasl-2.1/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/debian/control?rev=500&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/control (original)
+++ cyrus-sasl-2.1/trunk/debian/control Sun Sep 13 01:32:19 2009
@@ -6,8 +6,8 @@
 Standards-Version: 3.8.0.0
 Build-Depends: debhelper (>= 5.0.0), dpatch, autotools-dev, automake1.9, autoconf, libtool, libdb4.7-dev, libpam0g-dev (>= 0.76-22), libssl-dev (>= 0.9.7e-3), libmysqlclient-dev | libmysqlclient15-dev (>= 5.0.20), libopie-dev (>= 2.32-10), libpq-dev (>= 8.1.3-4), libkrb5-dev, libsqlite0-dev (>= 2.8.16), libldap2-dev (>= 2.1.30-8), chrpath, groff-base, debconf (>= 0.5) | debconf-2.0, po-debconf, docbook-to-man
 Build-Conflicts: heimdal-dev
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-cyrus-sasl2/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/
 Homepage: http://asg.web.cmu.edu/sasl/sasl-library.html
 
 Package: sasl2-bin

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=500&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 Sun Sep 13 01:32:19 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 =
  

Modified: cyrus-sasl-2.1/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/debian/rules?rev=500&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/rules (original)
+++ cyrus-sasl-2.1/trunk/debian/rules Sun Sep 13 01:32:19 2009
@@ -102,7 +102,7 @@
 clean-patched:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp 
+	rm -f build-stamp build-indep-stamp build-arch-stamp
 
 	rm -f $(CURDIR)/sample/sample-client \
 		$(CURDIR)/sample/sample-server \