[Pkg-samba-maint] r2856 - trunk/samba4/debian

[jelmer at alioth.debian.org]

Author: jelmer
Date: 2009-06-18 10:54:59 +0000 (Thu, 18 Jun 2009)
New Revision: 2856

Modified:
   trunk/samba4/debian/changelog
   trunk/samba4/debian/control
Log:
Removed libldb-samba4-{dev,0}, now using libldb{-dev,0} since there
are no longer any differences.

Modified: trunk/samba4/debian/changelog
===================================================================
--- trunk/samba4/debian/changelog	2009-06-18 04:10:23 UTC (rev 2855)
+++ trunk/samba4/debian/changelog	2009-06-18 10:54:59 UTC (rev 2856)
@@ -1,4 +1,4 @@
-samba4 (4.0.0~alpha8~git20090617-1) experimental; urgency=low
+samba4 (4.0.0~alpha8~git20090618-1) experimental; urgency=low
 
   * Support building against Python2.6.
   * Add missing dependency on tdb >= 1.1.3. (Closes: #517171)
@@ -15,8 +15,10 @@
     streams.
   * Document license for Active Directory schemas.
   * Fix init script to run samba rather than smbd. (Closes: #522646)
+  * Removed libldb-samba4-{dev,0}, now using libldb{-dev,0} since there
+    are no longer any differences.
 
- -- Jelmer Vernooij <jelmer at debian.org>  Sat, 13 Jun 2009 05:52:00 +0200
+ -- Jelmer Vernooij <jelmer at debian.org>  Thu, 18 Jun 2009 00:19:44 +0200
 
 samba4 (4.0.0~alpha7~20090225-1) experimental; urgency=low
 

Modified: trunk/samba4/debian/control
===================================================================
--- trunk/samba4/debian/control	2009-06-18 04:10:23 UTC (rev 2855)
+++ trunk/samba4/debian/control	2009-06-18 10:54:59 UTC (rev 2856)
@@ -5,8 +5,7 @@
 Uploaders: Steve Langasek <vorlon at debian.org>, Christian Perrier <bubulle at debian.org>, Noèl Köthe <noel at debian.org>, Steinar H. Gunderson <sesse at debian.org>, Jelmer Vernooij <jelmer at debian.org>
 Homepage: http://www.samba.org/
 Standards-Version: 3.8.1
-Build-Depends: debhelper (>> 5.0.0), libparse-yapp-perl, perl, docbook-xsl, docbook-xml, xsltproc, po-debconf, libgnutls-dev, libreadline5-dev, libpam0g-dev, libblkid-dev, libattr1-dev, flex, bison, tdb-dev (>= 1.1.4~), libtalloc-dev, libtevent-dev (>> 0.9.6~), perl-modules, python-dev, python-central (>= 0.5.6), quilt, libpopt-dev, pkg-config, samba-common (>= 2:3.4.0~pre2)
-Build-Conflicts: libldb-dev
+Build-Depends: debhelper (>> 5.0.0), libparse-yapp-perl, perl, docbook-xsl, docbook-xml, xsltproc, po-debconf, libgnutls-dev, libreadline5-dev, libpam0g-dev, libblkid-dev, libattr1-dev, flex, bison, tdb-dev (>= 1.1.4~), libtalloc-dev, libtevent-dev (>> 0.9.6~), perl-modules, python-dev, python-central (>= 0.5.6), quilt, libpopt-dev, pkg-config, samba-common (>= 2:3.4.0~pre2), libldb-dev (>= 0.9.5~)
 Vcs-Svn: svn://svn.debian.org/svn/pkg-samba/branches/samba4
 XS-Python-Version: current
 DM-Upload-Allowed: yes
@@ -125,7 +124,7 @@
 
 Package: samba4-dev
 Architecture: any
-Depends: libparse-pidl-perl, libc6-dev, libldb-samba4-dev, tdb-dev (>= 1.1.0), libtalloc-dev, ${misc:Depends}
+Depends: libparse-pidl-perl, libc6-dev, libldb-dev, tdb-dev (>= 1.1.0), libtalloc-dev, ${misc:Depends}
 Section: devel
 Description: tools for extending Samba
  The Samba software suite is a collection of programs that
@@ -158,39 +157,6 @@
  This package contains bundled test and utility binaries built specifically
  for Samba.
 
-Package: libldb-samba4-dev
-Section: libdevel
-Architecture: any
-Conflicts: libldb-dev
-Depends: ${shlibs:Depends}, pkg-config, libldb-samba4-0 (=${binary:Version}), ${misc:Depends}, libtalloc-dev, tdb-dev
-Description: LDAP-like embedded database - Samba 4 version
- ldb is a LDAP-like embedded database built on top of TDB.
- .
- What ldb does is provide a fast database with an LDAP-like API designed
- to be used within an application. In some ways it can be seen as a
- intermediate solution between key-value pair databases and a real LDAP
- database.
- .
- This package contains a build of the LDB library built specifically
- for Samba 4.
-
-Package: libldb-samba4-0
-Section: libs
-Architecture: any
-Conflicts: libldb0
-Provides: libldb0
-Depends: ${shlibs:Depends}, ${misc:Depends}, samba-common (>= 2:3.4.0~pre2-1)
-Description: LDAP-like embedded database - Samba 4 version
- ldb is a LDAP-like embedded database built on top of TDB.
- .
- What ldb does is provide a fast database with an LDAP-like API designed
- to be used within an application. In some ways it can be seen as a
- intermediate solution between key-value pair databases and a real LDAP
- database.
- .
- This package contains a build of the LDB library built specifically
- for Samba 4.
-
 Package: libgensec0
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, samba-common (>= 2:3.4.0~pre2-1)
@@ -440,7 +406,7 @@
 Section: python
 Provides: ${python:Provides}
 XB-Python-Version: ${python:Versions}
-Depends: ${python:Depends}, ${shlibs:Depends}, python-ldb-samba4, python-tdb, ${misc:Depends}
+Depends: ${python:Depends}, ${shlibs:Depends}, python-ldb, python-tdb, ${misc:Depends}
 Description: Python bindings for Samba
  The Samba software suite is a collection of programs that
  implements the SMB protocol for unix systems, allowing you to serve
@@ -454,23 +420,6 @@
  .
  This package contains Python bindings for most Samba 4 libraries.
 
-Package: python-ldb-samba4
-Architecture: any
-Section: python
-Provides: python-ldb, ${python:Provides}
-Conflicts: python-ldb
-XB-Python-Version: ${python:Versions}
-Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
-Description: Python bindings for LDB - Samba 4 version
- ldb is a LDAP-like embedded database built on top of TDB.
- .
- What ldb does is provide a fast database with an LDAP-like API designed
- to be used within an application. In some ways it can be seen as a
- intermediate solution between key-value pair databases and a real LDAP
- database.
- .
- This package contains Python bindings for the Samba 4 version of LDB.
-
 Package: libsamba-util-dev
 Architecture: any
 Section: libdevel