[Pkg-samba-maint] r4079 - in trunk/samba/debian: . patches

[bubulle at alioth.debian.org]

Author: bubulle
Date: 2012-05-09 20:24:44 +0000 (Wed, 09 May 2012)
New Revision: 4079

Added:
   trunk/samba/debian/patches/fix-samba.ldif-syntax.patch
Removed:
   trunk/samba/debian/patches/fix-samba.ldip-syntax.patch
Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/patches/series
Log:
Rename fix-samba.ldip-syntax.patch to fix-samba.ldif-syntax.patch

Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2012-05-09 19:51:24 UTC (rev 4078)
+++ trunk/samba/debian/changelog	2012-05-09 20:24:44 UTC (rev 4079)
@@ -32,6 +32,7 @@
   * Build-Conflict with python-ldb and python-ldb-dev to avoid build
     failures when some versions of these packages are locally installed.
     Closes: #657314
+  * Rename fix-samba.ldip-syntax.patch to fix-samba.ldif-syntax.patch
 
  -- Christian Perrier <bubulle at debian.org>  Mon, 07 May 2012 22:16:32 +0200
 

Copied: trunk/samba/debian/patches/fix-samba.ldif-syntax.patch (from rev 4073, trunk/samba/debian/patches/fix-samba.ldip-syntax.patch)
===================================================================
--- trunk/samba/debian/patches/fix-samba.ldif-syntax.patch	                        (rev 0)
+++ trunk/samba/debian/patches/fix-samba.ldif-syntax.patch	2012-05-09 20:24:44 UTC (rev 4079)
@@ -0,0 +1,18 @@
+Description: Fix example samba.ldif
+Author: Christian Perrier <bubulle at debian.org>
+Forwarded: https://bugzilla.samba.org/show_bug.cgi?id=8789
+Bug-Debian: http://bugs.debian.org/659963
+
+Index: samba/examples/LDAP/samba.ldif
+===================================================================
+--- samba.orig/examples/LDAP/samba.ldif
++++ samba/examples/LDAP/samba.ldif
+@@ -153,7 +153,7 @@
+  21.1.27 SINGLE-VALUE )
+ olcAttributeTypes: {50}( 1.3.6.1.4.1.7165.2.1.73 NAME 'sambaTrustPartner' DESC
+   'Fully qualified name of the domain with which a trust exists' EQUALITY case
+-  IgnoreMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} )
++ IgnoreMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} )
+ olcAttributeTypes: {51}( 1.3.6.1.4.1.7165.2.1.74 NAME 'sambaFlatName' DESC 'Ne
+  tBIOS name of a domain' EQUALITY caseIgnoreMatch SYNTAX 1.3.6.1.4.1.1466.115.
+  121.1.15{128} )

Deleted: trunk/samba/debian/patches/fix-samba.ldip-syntax.patch
===================================================================
--- trunk/samba/debian/patches/fix-samba.ldip-syntax.patch	2012-05-09 19:51:24 UTC (rev 4078)
+++ trunk/samba/debian/patches/fix-samba.ldip-syntax.patch	2012-05-09 20:24:44 UTC (rev 4079)
@@ -1,19 +0,0 @@
-Description: Fix example samba.ldif
-Author: Christian Perrier <bubulle at debian.org>
-Bug: https://bugzilla.samba.org/show_bug.cgi?id=8789
-Forwarded: yes
-Bug-Debian: http://bugs.debian.org/659963
-
-Index: samba/examples/LDAP/samba.ldif
-===================================================================
---- samba.orig/examples/LDAP/samba.ldif
-+++ samba/examples/LDAP/samba.ldif
-@@ -153,7 +153,7 @@
-  21.1.27 SINGLE-VALUE )
- olcAttributeTypes: {50}( 1.3.6.1.4.1.7165.2.1.73 NAME 'sambaTrustPartner' DESC
-   'Fully qualified name of the domain with which a trust exists' EQUALITY case
--  IgnoreMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} )
-+ IgnoreMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} )
- olcAttributeTypes: {51}( 1.3.6.1.4.1.7165.2.1.74 NAME 'sambaFlatName' DESC 'Ne
-  tBIOS name of a domain' EQUALITY caseIgnoreMatch SYNTAX 1.3.6.1.4.1.1466.115.
-  121.1.15{128} )

Modified: trunk/samba/debian/patches/series
===================================================================
--- trunk/samba/debian/patches/series	2012-05-09 19:51:24 UTC (rev 4078)
+++ trunk/samba/debian/patches/series	2012-05-09 20:24:44 UTC (rev 4079)
@@ -13,7 +13,7 @@
 dont-build-VFS-examples.patch
 bug_221618_precise-64bit-prototype.patch
 initialize_password_db-null-deref
-fix-samba.ldip-syntax.patch
+fix-samba.ldif-syntax.patch
 bug_598313_upstream_7499-nss_wins-dont-clobber-daemons-logs.patch
 bug_387266_upstream_4104_mention-kerberos-in-smbspool-manpage.patch
 bug_604768_upstream_7826_drop-using-samba-link.patch