[Pkg-openldap-devel] [openldap] 02/07: Uploaded 2.1.30-7. Marked 2.1.30-6 as having been uploaded, etc.

Thu Oct 10 05:33:49 UTC 2013

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

tjaalton-guest pushed a commit to annotated tag 2.1.30-10
in repository openldap.

commit c3702ebb69837c3f29a084cbda9ff133325c97b6
Author: Stephen Frost <sfrost at debian.org>
Date:   Sat May 14 03:00:06 2005 +0000

    Uploaded 2.1.30-7.
    Marked 2.1.30-6 as having been uploaded, etc.
    
      * Stephen Frost <sfrost at debian.org>
        + debian/move_files: make libldap a symlink to libldap_r, as carrying
          two versions of this library around is more trouble than it's worth,
          and can cause glorious segfaults down the line
          (closes: #306258, #302296, #306546)
        + debian/move_files: Comment out moves for things we no longer build here
          (slapd, libslapd2-dev, ldap-utils).  Makes rebuilding cleaner.
        + debian/control: Remove libslapd2-dev; doesn't make any sense without the
          slapd to go along with.
        + debian/control: Add Steve Langasek as Uploader.
        + debian/move_files: Disable check_completeness since it doesn't make
          sense anymore (we don't *want* to use all the files).
        + debian/rules: comment-out and remove binary-indep, since we no longer
          have any arch: all packages in here.
---
 debian/changelog  |   58 +++++++++++++++++++++++++++++++++++------------------
 debian/control    |   15 +-------------
 debian/move_files |   51 +++++++++++++++++++++++++---------------------
 debian/rules      |   34 +++++++++++++++----------------
 4 files changed, 85 insertions(+), 73 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 49cbf57..aed8ecf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,22 +1,42 @@
-openldap2 (2.1.30-6) experimental; urgency=low
-
-  * Update configure stuff using libtoolize, aclocal-1.4 and autoconf2.50
-    to update libtool for kfreebsd-gnu and friends (closes: #266688).
-  * Readd ntlm.c from the NTLM patch which got lost somewhere inbetween, 
-    ouch. Forgot to svn add it...
-  * debian/move_files: Move the ucdata files into the slapd package (which
-    is no longer build) as libldap2 (where they used to be) does not use
-    them (closes: #298270).
-  * Apply patch from #278875 to allow building against OpenSSL if 
-    requested by user (closes: #278875). Run autoconf to recreate configure.
-  * debian/check_config: Make check more robust for different autoconf
-    versions.
-  * debian/rules: Remove automatic invocation of autoheader and autoconf
-    as they failed here.
-  * debian/slapd.init: Add --oknodo to start-stop-daemon invocations to
-    make the script idempotent (bug #298741), patch by Bill Allombert.
-
- --
+openldap2 (2.1.30-7) unstable; urgency=high
+
+  * Stephen Frost <sfrost at debian.org>
+    + debian/move_files: make libldap a symlink to libldap_r, as carrying
+      two versions of this library around is more trouble than it's worth,
+      and can cause glorious segfaults down the line 
+      (closes: #306258, #302296, #306546)
+    + debian/move_files: Comment out moves for things we no longer build here
+      (slapd, libslapd2-dev, ldap-utils).  Makes rebuilding cleaner.
+    + debian/control: Remove libslapd2-dev; doesn't make any sense without the
+      slapd to go along with.
+    + debian/control: Add Steve Langasek as Uploader.
+    + debian/move_files: Disable check_completeness since it doesn't make
+      sense anymore (we don't *want* to use all the files).
+    + debian/rules: comment-out and remove binary-indep, since we no longer
+      have any arch: all packages in here.
+
+ -- Stephen Frost <sfrost at debian.org>  Fri, 13 May 2005 19:06:21 -0400
+
+openldap2 (2.1.30-6) unstable; urgency=high
+
+  * Torsten Landschoff <torsten at debian.org>
+    + Update configure stuff using libtoolize, aclocal-1.4 and autoconf2.50
+      to update libtool for kfreebsd-gnu and friends (closes: #266688).
+    + Readd ntlm.c from the NTLM patch which got lost somewhere inbetween, 
+      ouch. Forgot to svn add it...
+    + debian/move_files: Move the ucdata files into the slapd package (which
+      is no longer build) as libldap2 (where they used to be) does not use
+      them (closes: #298270).
+    + Apply patch from #278875 to allow building against OpenSSL if 
+      requested by user (closes: #278875). Run autoconf to recreate configure.
+    + debian/check_config: Make check more robust for different autoconf
+      versions.
+    + debian/rules: Remove automatic invocation of autoheader and autoconf
+      as they failed here.
+    + debian/slapd.init: Add --oknodo to start-stop-daemon invocations to
+      make the script idempotent (bug #298741), patch by Bill Allombert.
+
+ -- Torsten Landschoff <torsten at debian.org>  Wed, 23 Feb 2005 00:08:40 +0100
 
 openldap2 (2.1.30-5) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index 35847ea..191abe3 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: openldap2
 Section: net
 Priority: optional
 Maintainer: Torsten Landschoff <torsten at debian.org>
-Uploaders: Roland Bauerschmidt <rb at debian.org>, Stephen Frost <sfrost at debian.org>
+Uploaders: Roland Bauerschmidt <rb at debian.org>, Stephen Frost <sfrost at debian.org>, Steve Langasek <vorlon at debian.org>
 Build-Depends: libdb4.2-dev, libwrap0-dev, libiodbc2-dev, libsasl2-dev (>= 2.1.3-1), dpkg-dev (>= 1.7.1), libncurses5-dev, autoconf2.13, debconf-utils, libgnutls11-dev, libgcrypt11-dev, debhelper (>= 4.1.16), libltdl3-dev (>= 1.4.3), libslp-dev, po-debconf
 Build-Conflicts: libbind-dev, bind-dev
 Standards-Version: 3.6.1
@@ -31,16 +31,3 @@ Description: OpenLDAP development libraries
  This package allows development of LDAP applications using the OpenLDAP
  libraries. It includes headers, libraries and links to allow static and
  dynamic linking.
-
-Package: libslapd2-dev
-Section: libdevel
-Priority: extra
-Architecture: all
-Depends: libldap2 (= ${Source-Version})
-Description: OpenLDAP slapd back-end development headers
- This package allows development of back-ends for the OpenLDAP slapd.
- It includes headers used when developing a back-end for slapd.
- These headers are, per upstream, *not* intended to be used outside of
- their build system so you are on your own with them.  Things can and
- probably will break, feel free to file bugs about them but don't expect
- them to be fixed.
diff --git a/debian/move_files b/debian/move_files
index a3eb5b7..4a7e5d4 100644
--- a/debian/move_files
+++ b/debian/move_files
@@ -40,40 +40,45 @@ echo -n "Removing static backend archives... "
 rm debian/tmp/usr/lib/ldap/back_*.a
 echo done
 
-echo -n "Installing: slapd"
-target=slapd
-install_stuff usr/sbin
-install_stuff usr/lib/ldap
-install_stuff usr/share/man/man5/slapd*
-install_stuff usr/share/man/man8
-install_stuff etc/ldap/schema
-install_stuff usr/share/ldap/ucdata
-rm -f debian/tmp/etc/ldap/slapd.conf
-mkdir -p debian/slapd/usr/share/slapd
-install -m644 debian/slapd.conf debian/slapd/usr/share/slapd/slapd.conf
-install -m755 debian/fix_ldif debian/slapd/usr/share/slapd/fix_ldif
-install -m755 debian/ldiftopasswd debian/slapd/usr/share/slapd/ldiftopasswd
+#echo -n "Installing: slapd"
+#target=slapd
+#install_stuff usr/sbin
+#install_stuff usr/lib/ldap
+#install_stuff usr/share/man/man5/slapd*
+#install_stuff usr/share/man/man8
+#install_stuff etc/ldap/schema
+#install_stuff usr/share/ldap/ucdata
+#rm -f debian/tmp/etc/ldap/slapd.conf
+#mkdir -p debian/slapd/usr/share/slapd
+#install -m644 debian/slapd.conf debian/slapd/usr/share/slapd/slapd.conf
+#install -m755 debian/fix_ldif debian/slapd/usr/share/slapd/fix_ldif
+#install -m755 debian/ldiftopasswd debian/slapd/usr/share/slapd/ldiftopasswd
 
-target=ldap-utils
-echo -n " $target"
-# slappasswd is useful even without the server
-install -m755 -d debian/$target/usr/sbin
-mv debian/slapd/usr/sbin/slappasswd debian/$target/usr/sbin/
-install_stuff usr/bin
-install_stuff usr/share/man/man1
-install_stuff usr/share/man/man5/ldif*
+#target=ldap-utils
+#echo -n " $target"
+## slappasswd is useful even without the server
+#install -m755 -d debian/$target/usr/sbin
+#mv debian/slapd/usr/sbin/slappasswd debian/$target/usr/sbin/
+#install_stuff usr/bin
+#install_stuff usr/share/man/man1
+#install_stuff usr/share/man/man5/ldif*
 
 target=libldap2
-echo -n " $target"
+echo -n "Installing: $target"
 install_stuff etc/ldap/ldap*.conf
 install_stuff usr/share/man/man5/ldap.conf*
+( cd debian/tmp/usr/lib && \
+  	  ln -sf libldap_r.so.? libldap.so.? && \
+  	  ln -sf libldap_r.so.?.?.??? libldap.so.?.?.???
+)
 install_stuff usr/lib/*.so.*
 
 target=libldap2-dev
 echo -n " $target"
 install_stuff usr/include
+ln -sf libldap_r.a debian/tmp/usr/lib/libldap.a
 install_stuff usr/lib/*.so usr/lib/*.a
 install_stuff usr/share/man/man3
 echo "."
 
-check_completeness
+#check_completeness
diff --git a/debian/rules b/debian/rules
index b91a374..e73ec14 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,23 +45,23 @@ install-stamp: build-stamp
 	touch $@
 
 
-binary: binary-arch binary-indep
-
-binary-indep: 
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-
-	dh_installdirs -i
-	sh debian/copy_slapd_dev_files
-	dh_installchangelogs -i
-	dh_installdocs -i
-	dh_installdebconf -i
-	dh_installdeb -i
-	dh_compress -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
+binary: binary-arch
+
+#binary-indep: 
+#	dh_testdir
+#	dh_testroot
+#	dh_clean -k
+#
+#	dh_installdirs -i
+#	# sh debian/copy_slapd_dev_files
+#	dh_installchangelogs -i
+#	dh_installdocs -i
+#	dh_installdebconf -i
+#	dh_installdeb -i
+#	dh_compress -i
+#	dh_gencontrol -i
+#	dh_md5sums -i
+#	dh_builddeb -i
 
 binary-arch: install-stamp
 	dh_testdir

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

