[Pkg-openldap-devel] r1169 - in openldap/trunk/debian: . po

vorlon at alioth.debian.org vorlon at alioth.debian.org
Mon Jul 7 04:40:22 UTC 2008 

Author: vorlon
Date: 2008-07-07 04:40:22 +0000 (Mon, 07 Jul 2008)
New Revision: 1169

Modified:
   openldap/trunk/debian/changelog
   openldap/trunk/debian/control
   openldap/trunk/debian/po/cs.po
   openldap/trunk/debian/po/da.po
   openldap/trunk/debian/po/de.po
   openldap/trunk/debian/po/es.po
   openldap/trunk/debian/po/eu.po
   openldap/trunk/debian/po/fi.po
   openldap/trunk/debian/po/fr.po
   openldap/trunk/debian/po/gl.po
   openldap/trunk/debian/po/it.po
   openldap/trunk/debian/po/ja.po
   openldap/trunk/debian/po/nl.po
   openldap/trunk/debian/po/pt.po
   openldap/trunk/debian/po/pt_BR.po
   openldap/trunk/debian/po/ru.po
   openldap/trunk/debian/po/templates.pot
   openldap/trunk/debian/po/vi.po
   openldap/trunk/debian/rules
   openldap/trunk/debian/slapd.README.Debian
Log:
Reclaim the 'openldap' source package name for openldap 2.4.10



Modified: openldap/trunk/debian/changelog
===================================================================
--- openldap/trunk/debian/changelog	2008-07-07 01:21:59 UTC (rev 1168)
+++ openldap/trunk/debian/changelog	2008-07-07 04:40:22 UTC (rev 1169)
@@ -1,11 +1,14 @@
-openldap2.3 (2.4.10-2) UNRELEASED; urgency=low
+openldap (2.4.10-2) UNRELEASED; urgency=low
 
   * Support DEB_BUILD_OPTIONS=nocheck to disable running the test suite at
     build time
   * Hack around glibc behavior when resolving localhost, by exporting
     RESOLV_MULTI=off when invoking the test suite
-  * Kill off non-DFSG-compliant schema files that snuck back into the archive
-    due to my bad merge of 2.4.10.
+  * Reclaim the 'openldap' source package name; openldap2.3 has been a
+    misnomer for some time, causing undue confusion, so switch to a
+    permanent source package name that we won't need to change again later.
+    - Along the way, kill off non-DFSG-compliant schema files that snuck
+      back into the archive due to my bad merge of 2.4.10.
 
  -- Steve Langasek <vorlon at debian.org>  Mon, 30 Jun 2008 13:13:58 -0700
 

Modified: openldap/trunk/debian/control
===================================================================
--- openldap/trunk/debian/control	2008-07-07 01:21:59 UTC (rev 1168)
+++ openldap/trunk/debian/control	2008-07-07 04:40:22 UTC (rev 1169)
@@ -1,4 +1,4 @@
-Source: openldap2.3
+Source: openldap
 Section: net
 Priority: optional
 Maintainer: Debian OpenLDAP Maintainers <pkg-openldap-devel at lists.alioth.debian.org>

Modified: openldap/trunk/debian/po/cs.po
===================================================================
--- openldap/trunk/debian/po/cs.po	2008-07-07 01:21:59 UTC (rev 1168)
+++ openldap/trunk/debian/po/cs.po	2008-07-07 04:40:22 UTC (rev 1169)
@@ -13,8 +13,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: openldap2.3\n"
-"Report-Msgid-Bugs-To: openldap2.3 at packages.debian.org\n"
+"Project-Id-Version: openldap\n"
+"Report-Msgid-Bugs-To: openldap at packages.debian.org\n"
 "POT-Creation-Date: 2008-02-09 10:32-0800\n"
 "PO-Revision-Date: 2008-05-08 11:22+0200\n"
 "Last-Translator: Miroslav Kure <kurem at debian.cz>\n"

Modified: openldap/trunk/debian/po/da.po
===================================================================
--- openldap/trunk/debian/po/da.po	2008-07-07 01:21:59 UTC (rev 1168)
+++ openldap/trunk/debian/po/da.po	2008-07-07 04:40:22 UTC (rev 1169)
@@ -14,7 +14,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: openldap2 debconf\n"
-"Report-Msgid-Bugs-To: openldap2.3 at packages.debian.org\n"
+"Report-Msgid-Bugs-To: openldap at packages.debian.org\n"
 "POT-Creation-Date: 2008-02-09 10:32-0800\n"
 "PO-Revision-Date: 2006-05-13 10:30+0200\n"
 "Last-Translator: Claus Hindsgaul <claus.hindsgaul at gmail.com>\n"

Modified: openldap/trunk/debian/po/de.po
===================================================================
--- openldap/trunk/debian/po/de.po	2008-07-07 01:21:59 UTC (rev 1168)
+++ openldap/trunk/debian/po/de.po	2008-07-07 04:40:22 UTC (rev 1169)
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: openldap2.3 2.4.7-5\n"
-"Report-Msgid-Bugs-To: openldap2.3 at packages.debian.org\n"
+"Project-Id-Version: openldap 2.4.7-5\n"
+"Report-Msgid-Bugs-To: openldap at packages.debian.org\n"
 "POT-Creation-Date: 2008-02-09 10:32-0800\n"
 "PO-Revision-Date: 2008-02-14 20:32+0100\n"
 "Last-Translator: Helge Kreutzmann <debian at helgefjell.de>\n"

Modified: openldap/trunk/debian/po/es.po
===================================================================
--- openldap/trunk/debian/po/es.po	2008-07-07 01:21:59 UTC (rev 1168)
+++ openldap/trunk/debian/po/es.po	2008-07-07 04:40:22 UTC (rev 1169)
@@ -32,7 +32,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: openldap 2.3.30\n"
-"Report-Msgid-Bugs-To: openldap2.3 at packages.debian.org\n"
+"Report-Msgid-Bugs-To: openldap at packages.debian.org\n"
 "POT-Creation-Date: 2008-02-09 10:32-0800\n"
 "PO-Revision-Date: 2008-01-13 00:52-0800\n"
 "Last-Translator: Steve Langasek <vorlon at debian.org>\n"

Modified: openldap/trunk/debian/po/eu.po
===================================================================
--- openldap/trunk/debian/po/eu.po	2008-07-07 01:21:59 UTC (rev 1168)
+++ openldap/trunk/debian/po/eu.po	2008-07-07 04:40:22 UTC (rev 1169)
@@ -1,12 +1,12 @@
-# translation of openldap2.3-eu.po to Euskara
+# translation of openldap-eu.po to Euskara
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Piarres Beobide <pi at beobide.net>, 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: openldap2.3-eu\n"
-"Report-Msgid-Bugs-To: openldap2.3 at packages.debian.org\n"
+"Project-Id-Version: openldap-eu\n"
+"Report-Msgid-Bugs-To: openldap at packages.debian.org\n"
 "POT-Creation-Date: 2008-02-09 10:32-0800\n"
 "PO-Revision-Date: 2008-05-08 16:41+0200\n"
 "Last-Translator: Piarres Beobide <pi at beobide.net>\n"

Modified: openldap/trunk/debian/po/fi.po
===================================================================
--- openldap/trunk/debian/po/fi.po	2008-07-07 01:21:59 UTC (rev 1168)
+++ openldap/trunk/debian/po/fi.po	2008-07-07 04:40:22 UTC (rev 1169)
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: openldap2.3\n"
-"Report-Msgid-Bugs-To: openldap2.3 at packages.debian.org\n"
+"Project-Id-Version: openldap\n"
+"Report-Msgid-Bugs-To: openldap at packages.debian.org\n"
 "POT-Creation-Date: 2008-02-09 10:32-0800\n"
 "PO-Revision-Date: 2008-04-09 20:55+0200\n"
 "Last-Translator: Esko Arajärvi <edu at iki.fi>\n"

Modified: openldap/trunk/debian/po/fr.po
===================================================================
--- openldap/trunk/debian/po/fr.po	2008-07-07 01:21:59 UTC (rev 1168)
+++ openldap/trunk/debian/po/fr.po	2008-07-07 04:40:22 UTC (rev 1169)
@@ -1,12 +1,12 @@
-# Translation of openldap2.3 debconf templates to French
+# Translation of openldap debconf templates to French
 # Copyright (C) 2006-2008 Christian Perrier <bubulle at debian.org>
-# This file is distributed under the same license as the openldap2.3 package.
+# This file is distributed under the same license as the openldap package.
 #
 # Christian Perrier <bubulle at debian.org>, 2006-2008.
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: openldap2.3 at packages.debian.org\n"
+"Report-Msgid-Bugs-To: openldap at packages.debian.org\n"
 "POT-Creation-Date: 2008-02-09 10:32-0800\n"
 "PO-Revision-Date: 2008-03-10 19:56+0100\n"
 "Last-Translator: Christian Perrier <bubulle at debian.org>\n"

Modified: openldap/trunk/debian/po/gl.po
===================================================================
--- openldap/trunk/debian/po/gl.po	2008-07-07 01:21:59 UTC (rev 1168)
+++ openldap/trunk/debian/po/gl.po	2008-07-07 04:40:22 UTC (rev 1169)
@@ -1,11 +1,11 @@
-# Galician translation of openldap2.3's debconf templates.
-# This file is distributed under the same license as the openldap2.3 package.
+# Galician translation of openldap's debconf templates.
+# This file is distributed under the same license as the openldap package.
 # Jacobo Tarrio <jtarrio at debian.org>, 2006.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: openldap2.3\n"
-"Report-Msgid-Bugs-To: openldap2.3 at packages.debian.org\n"
+"Project-Id-Version: openldap\n"
+"Report-Msgid-Bugs-To: openldap at packages.debian.org\n"
 "POT-Creation-Date: 2008-02-09 10:32-0800\n"
 "PO-Revision-Date: 2008-05-08 20:39+0100\n"
 "Last-Translator: Jacobo Tarrio <jtarrio at debian.org>\n"

Modified: openldap/trunk/debian/po/it.po
===================================================================
--- openldap/trunk/debian/po/it.po	2008-07-07 01:21:59 UTC (rev 1168)
+++ openldap/trunk/debian/po/it.po	2008-07-07 04:40:22 UTC (rev 1169)
@@ -1,12 +1,12 @@
-# Italian (it) translation of debconf templates for openldap2.3
+# Italian (it) translation of debconf templates for openldap
 # Copyright (C) 2006 Software in the Public Interest
-# This file is distributed under the same license as the openldap2.3 package.
+# This file is distributed under the same license as the openldap package.
 # Luca Monducci <luca.mo at tiscali.it>, 2007-2008.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: openldap2.3 2.4.7 italian debconf templates\n"
-"Report-Msgid-Bugs-To: openldap2.3 at packages.debian.org\n"
+"Project-Id-Version: openldap 2.4.7 italian debconf templates\n"
+"Report-Msgid-Bugs-To: openldap at packages.debian.org\n"
 "POT-Creation-Date: 2008-02-09 10:32-0800\n"
 "PO-Revision-Date: 2008-04-22 21:55+0200\n"
 "Last-Translator: Luca Monducci <luca.mo at tiscali.it>\n"

Modified: openldap/trunk/debian/po/ja.po
===================================================================
--- openldap/trunk/debian/po/ja.po	2008-07-07 01:21:59 UTC (rev 1168)
+++ openldap/trunk/debian/po/ja.po	2008-07-07 04:40:22 UTC (rev 1169)
@@ -13,8 +13,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: openldap2.3\n"
-"Report-Msgid-Bugs-To: openldap2.3 at packages.debian.org\n"
+"Project-Id-Version: openldap\n"
+"Report-Msgid-Bugs-To: openldap at packages.debian.org\n"
 "POT-Creation-Date: 2008-02-09 10:32-0800\n"
 "PO-Revision-Date: 2008-05-09 11:50+0900\n"
 "Last-Translator: Kenshi Muto <kmuto at debian.org>\n"

Modified: openldap/trunk/debian/po/nl.po
===================================================================
--- openldap/trunk/debian/po/nl.po	2008-07-07 01:21:59 UTC (rev 1168)
+++ openldap/trunk/debian/po/nl.po	2008-07-07 04:40:22 UTC (rev 1169)
@@ -14,7 +14,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: openldap2\n"
-"Report-Msgid-Bugs-To: openldap2.3 at packages.debian.org\n"
+"Report-Msgid-Bugs-To: openldap at packages.debian.org\n"
 "POT-Creation-Date: 2008-02-09 10:32-0800\n"
 "PO-Revision-Date: 2008-05-08 12:42+0100\n"
 "Last-Translator: Bart Cornelis <cobaco at skolelinux.no>\n"

Modified: openldap/trunk/debian/po/pt.po
===================================================================
--- openldap/trunk/debian/po/pt.po	2008-07-07 01:21:59 UTC (rev 1168)
+++ openldap/trunk/debian/po/pt.po	2008-07-07 04:40:22 UTC (rev 1169)
@@ -1,13 +1,13 @@
-# Portuguese translation for openldap2.3 debconf messages.
+# Portuguese translation for openldap debconf messages.
 # Copyright (C) Tiago Fernandes <tjg.fernandes at gmail.com>, 2006
-# This file is distributed under the same license as the Openldap2.3 package.
+# This file is distributed under the same license as the openldap package.
 # Tiago Fernandes <tjg.fernandes at gmail.com>, 2006-2008.
 #
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: openldap2.3 2.3.38-2\n"
-"Report-Msgid-Bugs-To: openldap2.3 at packages.debian.org\n"
+"Project-Id-Version: openldap 2.3.38-2\n"
+"Report-Msgid-Bugs-To: openldap at packages.debian.org\n"
 "POT-Creation-Date: 2008-02-09 10:32-0800\n"
 "PO-Revision-Date: 2008-05-12 21:10+0100\n"
 "Last-Translator: Tiago Fernandes <tjg.fernandes at gmail.com>\n"

Modified: openldap/trunk/debian/po/pt_BR.po
===================================================================
--- openldap/trunk/debian/po/pt_BR.po	2008-07-07 01:21:59 UTC (rev 1168)
+++ openldap/trunk/debian/po/pt_BR.po	2008-07-07 04:40:22 UTC (rev 1169)
@@ -8,8 +8,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: openldap2.3 2.4.7-3\n"
-"Report-Msgid-Bugs-To: openldap2.3 at packages.debian.org\n"
+"Project-Id-Version: openldap 2.4.7-3\n"
+"Report-Msgid-Bugs-To: openldap at packages.debian.org\n"
 "POT-Creation-Date: 2008-02-09 10:32-0800\n"
 "PO-Revision-Date: 2008-05-08 10:00-0300\n"
 "Last-Translator: Eder L. Marques (frolic) <frolic at debian-ce.org>\n"

Modified: openldap/trunk/debian/po/ru.po
===================================================================
--- openldap/trunk/debian/po/ru.po	2008-07-07 01:21:59 UTC (rev 1168)
+++ openldap/trunk/debian/po/ru.po	2008-07-07 04:40:22 UTC (rev 1169)
@@ -13,8 +13,8 @@
 # Yuri Kozlov <kozlov.y at gmail.com>, 2007, 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: openldap2.3 2.4.7-6.4\n"
-"Report-Msgid-Bugs-To: openldap2.3 at packages.debian.org\n"
+"Project-Id-Version: openldap 2.4.7-6.4\n"
+"Report-Msgid-Bugs-To: openldap at packages.debian.org\n"
 "POT-Creation-Date: 2008-02-09 10:32-0800\n"
 "PO-Revision-Date: 2008-05-11 08:49+0400\n"
 "Last-Translator: Yuri Kozlov <kozlov.y at gmail.com>\n"

Modified: openldap/trunk/debian/po/templates.pot
===================================================================
--- openldap/trunk/debian/po/templates.pot	2008-07-07 01:21:59 UTC (rev 1168)
+++ openldap/trunk/debian/po/templates.pot	2008-07-07 04:40:22 UTC (rev 1169)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: openldap2.3 at packages.debian.org\n"
+"Report-Msgid-Bugs-To: openldap at packages.debian.org\n"
 "POT-Creation-Date: 2008-02-09 10:32-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"

Modified: openldap/trunk/debian/po/vi.po
===================================================================
--- openldap/trunk/debian/po/vi.po	2008-07-07 01:21:59 UTC (rev 1168)
+++ openldap/trunk/debian/po/vi.po	2008-07-07 04:40:22 UTC (rev 1169)
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: openldap2.3 2.4.7-6.4\n"
-"Report-Msgid-Bugs-To: openldap2.3 at packages.debian.org\n"
+"Project-Id-Version: openldap 2.4.7-6.4\n"
+"Report-Msgid-Bugs-To: openldap at packages.debian.org\n"
 "POT-Creation-Date: 2008-02-09 10:32-0800\n"
 "PO-Revision-Date: 2008-05-09 00:24+0930\n"
 "Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"

Modified: openldap/trunk/debian/rules
===================================================================
--- openldap/trunk/debian/rules	2008-07-07 01:21:59 UTC (rev 1168)
+++ openldap/trunk/debian/rules	2008-07-07 04:40:22 UTC (rev 1169)
@@ -61,10 +61,10 @@
 	    file=`basename "$$schema"`; \
 	    rm openldap-$(VERSION)/servers/slapd/schema/$$file; \
 	done
-	mv openldap-$(VERSION) openldap2.3_$(VERSION).orig
-	tar cf openldap2.3_$(VERSION).orig.tar openldap2.3_$(VERSION).orig
-	rm -r openldap2.3_$(VERSION).orig
-	gzip -9 openldap2.3_$(VERSION).orig.tar
+	mv openldap-$(VERSION) openldap_$(VERSION).orig
+	tar cf openldap_$(VERSION).orig.tar openldap_$(VERSION).orig
+	rm -r openldap_$(VERSION).orig
+	gzip -9 openldap_$(VERSION).orig.tar
 
 configure: configure-stamp
 configure-stamp: $(QUILT_STAMPFN)

Modified: openldap/trunk/debian/slapd.README.Debian
===================================================================
--- openldap/trunk/debian/slapd.README.Debian	2008-07-07 01:21:59 UTC (rev 1168)
+++ openldap/trunk/debian/slapd.README.Debian	2008-07-07 04:40:22 UTC (rev 1169)
@@ -182,6 +182,6 @@
   For the exact patches applied to the upstream source and references to
   the relevant upstream ITS numbers, Debian bugs, and upstream
   synchronization status, see the debian/patches directory in the
-  openldap2.3 source package.
+  openldap source package.
 
  -- Russ Allbery <rra at debian.org>, Thu, 14 Feb 2008 18:47:07 -0800

More information about the Pkg-openldap-devel mailing list