Merge ~sudipmuk/ubuntu/+source/ldapscripts:merge-2.0.8-2-noble into ubuntu/+source/ldapscripts:debian/sid

[Sudip Mukherjee]

[Sudip Mukherjee (sudipmuk)]

The build can be seen at https://launchpad.net/~sudipmuk/+archive/ubuntu/ldapscripts/

[Dan Bungert (dbungert)]

In the discussion on the bug, it was decided that this should be synced instead of merged. I concur with that analysis.

[Graham Inggs (ginggs)]

Sync was sponsored.

review: Disapprove

[Andreas Hasenack (ahasenack)]

Marking this as rejected then, thanks.

Unmerged commits

34ba1ab... by Sudip Mukherjee on 2024-01-14

changelog

1268cc2... by Sudip Mukherjee on 2024-01-14

update-maintainer

9d463ef... by Sudip Mukherjee on 2024-01-14

reconstruct-changelog

f46cae7... by Sudip Mukherjee on 2024-01-14

merge-changelogs

d9743f2... by Sudip Mukherjee on 2024-01-14

debian/runtime.debian: replaced /etc/libnss-ldap.conf references by /etc/ldap.conf

Signed-off-by: Sudip Mukherjee <email address hidden>

diff --git a/debian/changelog b/debian/changelog
index d90832e..df66729 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ldapscripts (2.0.8-2ubuntu1) noble; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes: (LP: #2049311)
+    - debian/runtime.debian: replaced /etc/libnss-ldap.conf references by
+      /etc/ldap.conf.
+
+ -- Sudip Mukherjee <[e-mail]>  Sun, 14 Jan 2024 17:08:39 +0000
+
 ldapscripts (2.0.8-2) unstable; urgency=medium
 
   [ Debian Janitor ]
@@ -18,6 +26,20 @@ ldapscripts (2.0.8-2) unstable; urgency=medium
 
  -- Alexander GQ Gerasiov <[e-mail]>  Wed, 06 Jan 2021 20:07:50 +0300
 
+ldapscripts (2.0.8-1ubuntu2) impish; urgency=medium
+
+  * No-change rebuild due to OpenLDAP soname bump.
+
+ -- Sergio Durigan Junior <[e-mail]>  Mon, 21 Jun 2021 17:49:54 -0400
+
+ldapscripts (2.0.8-1ubuntu1) artful; urgency=medium
+
+  * Merge from Debian unstable.  Remaining changes:
+    - debian/runtime.debian: replaced /etc/libnss-ldap.conf references by
+      /etc/ldap.conf.
+
+ -- Bhavani Shankar <[e-mail]>  Wed, 02 Aug 2017 11:27:24 +0530
+
 ldapscripts (2.0.8-1) unstable; urgency=medium
 
   * New upstream version 2.0.8
@@ -25,6 +47,14 @@ ldapscripts (2.0.8-1) unstable; urgency=medium
 
  -- Alexander GQ Gerasiov <[e-mail]>  Thu, 27 Jul 2017 18:12:35 +0300
 
+ldapscripts (2.0.7-2ubuntu1) zesty; urgency=medium
+
+  * Merge from Debian unstable.  Remaining changes:
+    - debian/runtime.debian: replaced /etc/libnss-ldap.conf references by
+      /etc/ldap.conf.
+
+ -- Bhavani Shankar <[e-mail]>  Sun, 01 Jan 2017 12:24:40 +0530
+
 ldapscripts (2.0.7-2) unstable; urgency=medium
 
   * debian/rules: Fix typo. Thanks Chris Lamb <[e-mail]>.
@@ -44,6 +74,14 @@ ldapscripts (2.0.7-1) unstable; urgency=medium
 
  -- Alexander GQ Gerasiov <[e-mail]>  Wed, 20 Jul 2016 00:44:06 +0300
 
+ldapscripts (2.0.6-1ubuntu1) xenial; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - debian/runtime.debian: replaced /etc/libnss-ldap.conf references by
+      /etc/ldap.conf.
+
+ -- Bhavani Shankar <[e-mail]>  Sun, 03 Jan 2016 22:08:53 +0530
+
 ldapscripts (2.0.6-1) unstable; urgency=medium
 
   * Imported Upstream version 2.0.6 (Closes: #795927)
@@ -55,6 +93,14 @@ ldapscripts (2.0.6-1) unstable; urgency=medium
 
  -- Alexander GQ Gerasiov <[e-mail]>  Mon, 31 Aug 2015 17:19:08 +0300
 
+ldapscripts (2.0.5-1ubuntu1) trusty; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - debian/runtime.debian: replaced /etc/libnss-ldap.conf references by
+      /etc/ldap.conf, many thanks Ahmed El-Mahmoudy.
+
+ -- Bhavani Shankar <[e-mail]>  Sun, 24 Nov 2013 20:48:27 +0530
+
 ldapscripts (2.0.5-1) unstable; urgency=low
 
   * Imported Upstream version 2.0.5
@@ -71,6 +117,14 @@ ldapscripts (2.0.5-1) unstable; urgency=low
 
  -- Alexander GQ Gerasiov <[e-mail]>  Tue, 01 Oct 2013 22:21:54 +0400
 
+ldapscripts (2.0.1-2ubuntu1) raring; urgency=low
+
+  * Merge from Debian Unstable.   Remaining changes:
+    - debian/runtime.debian: replaced /etc/libnss-ldap.conf references by
+      /etc/ldap.conf, many thanks Ahmed El-Mahmoudy.
+
+ -- Vibhav Pant <[e-mail]>  Wed, 19 Dec 2012 21:07:08 +0530
+
 ldapscripts (2.0.1-2) unstable; urgency=low
 
   * Depend on nslcd instead of libnss-ldap, and us it's config.
@@ -81,6 +135,14 @@ ldapscripts (2.0.1-2) unstable; urgency=low
 
  -- Alexander GQ Gerasiov <[e-mail]>  Mon, 27 Aug 2012 04:38:33 +0400
 
+ldapscripts (2.0.1-1ubuntu1) precise; urgency=low
+
+  * Merge from Debian testing (LP: #922834).   Remaining changes:
+    - debian/runtime.debian: replaced /etc/libnss-ldap.conf references by
+      /etc/ldap.conf, many thanks Ahmed El-Mahmoudy.
+
+ -- Leo Iannacone <[e-mail]>  Fri, 27 Jan 2012 22:27:22 +0100
+
 ldapscripts (2.0.1-1) unstable; urgency=low
 
   * Imported Upstream version 2.0.1
@@ -91,6 +153,14 @@ ldapscripts (2.0.1-1) unstable; urgency=low
 
  -- Alexander GQ Gerasiov <[e-mail]>  Mon, 16 Jan 2012 02:21:44 +0400
 
+ldapscripts (1.10.0-1ubuntu1) oneiric; urgency=low
+
+  * Merge from debian unstable (LP: #777924).  Remaining changes:
+    - debian/runtime.debian: replaced /etc/libnss-ldap.conf references by
+      /etc/ldap.conf, many thanks Ahmed El-Mahmoudy.
+
+ -- Paolo Sammicheli <[e-mail]>  Tue, 22 Mar 2011 23:37:44 +0000
+
 ldapscripts (1.10.0-1) unstable; urgency=low
 
   * debian/control: Standards-version updated, no changes needed.
@@ -103,6 +173,14 @@ ldapscripts (1.10.0-1) unstable; urgency=low
 
  -- Alexander GQ Gerasiov <[e-mail]>  Mon, 21 Mar 2011 17:45:15 +0300
 
+ldapscripts (1.9.0-3ubuntu1) natty; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - debian/runtime.debian: replaced /etc/libnss-ldap.conf references by
+      /etc/ldap.conf, many thanks Ahmed El-Mahmoudy.
+
+ -- Lorenzo De Liso <[e-mail]>  Mon, 03 Jan 2011 16:29:57 +0100
+
 ldapscripts (1.9.0-3) unstable; urgency=low
 
   * Use pwgen as password generator by default. Closes: #592369.
diff --git a/debian/control b/debian/control
index d6520bb..876c5b9 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: ldapscripts
 Section: admin
 Priority: optional
-Maintainer: Alexander GQ Gerasiov <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Alexander GQ Gerasiov <[e-mail]>
 Homepage: http://ldapscripts.sourceforge.net/
 Standards-Version: 4.5.1
 Build-Depends: debhelper-compat (= 12)
diff --git a/debian/runtime.debian b/debian/runtime.debian
index 4d3c25d..6f8e73e 100644
--- a/debian/runtime.debian
+++ b/debian/runtime.debian
@@ -23,6 +23,7 @@ conffile='/etc/nslcd.conf'
 
 getfield() {
     local field="$1"
+    local conffile='/etc/ldap.conf'
     local value
     if [ -f "$conffile" ];then
 	value=$(awk "/^[ \t]*$field/ {sub(/^[ \t]*$field[ \t]*/,\"\"); sub(/[ \t]*(#.*)?\$/, \"\"); print \$0; exit}" "$conffile")