[debian-edu-commits] debian-edu/pkg-team/ 12/13: Imported Debian patch 0.2-3

[Mike Gabriel]

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

sunweaver pushed a commit to branch master
in repository ldap2bind.

commit 005a7ebd9611e2c2e23ec81b19330987fc415ab1
Author: Cajus Pollmeier <cajus at debian.org>
Date:   Wed Jul 25 08:11:03 2012 +0200

    Imported Debian patch 0.2-3
---
 debian/changelog                                         |  6 ++++++
 debian/control                                           |  2 +-
 debian/install                                           |  2 --
 .../{debian-changes-0.2-2 => fix-default-location}       | 16 +++++-----------
 debian/patches/series                                    |  2 +-
 5 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 42e909e..9262d19 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ldap2zone (0.2-3) unstable; urgency=low
+
+  * Fixed installation of default file
+
+ -- Cajus Pollmeier <cajus at debian.org>  Wed, 25 Jul 2012 08:11:03 +0200
+
 ldap2zone (0.2-2) unstable; urgency=low
 
   * Made script log using logger by a patch contributed by
diff --git a/debian/control b/debian/control
index c2d3816..d93deba 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: GOsa packages maintainers group <gosa-pkg at oss.gonicus.de>
 Uploaders: Cajus Pollmeier <cajus at debian.org>, Benoit Mortier <benoit.mortier at opensides.be>
 Standards-Version: 3.9.2
-Build-Depends: debhelper (>= 7.0.0), libldap2-dev, ldap-utils
+Build-Depends: debhelper (>= 7.0.50~), libldap2-dev, ldap-utils
 Homepage: https://oss.gonicus.de/labs/gosa
 Vcs-Browser: https://oss.gonicus.de/repositories/goto/trunk/ldap2zone
 Vcs-Svn: https://oss.gonicus.de/repositories/goto/trunk/ldap2zone
diff --git a/debian/install b/debian/install
index d7a9545..2dcd381 100644
--- a/debian/install
+++ b/debian/install
@@ -1,4 +1,2 @@
 ldap2zone		/usr/sbin
 ldap2bind		/usr/sbin
-debian/default		/etc/default/ldap2zone
-
diff --git a/debian/patches/debian-changes-0.2-2 b/debian/patches/fix-default-location
similarity index 62%
rename from debian/patches/debian-changes-0.2-2
rename to debian/patches/fix-default-location
index 78056b5..4e82f54 100644
--- a/debian/patches/debian-changes-0.2-2
+++ b/debian/patches/fix-default-location
@@ -1,14 +1,8 @@
-Description: Upstream changes introduced in version 0.2-2
- This patch has been created by dpkg-source during the package build.
- Here's the last changelog entry, hopefully it gives details on why
- those changes were made:
+Description: Fixed location of default file
  .
- ldap2zone (0.2-2) unstable; urgency=low
+ ldap2zone (0.2-3) unstable; urgency=low
  .
-   * Made script log using logger by a patch contributed by
-     Petter Reinholdtsen
- .
- The person named in the Author field signed this changelog entry.
+   * Fixed installation of default file
 Author: Cajus Pollmeier <cajus at debian.org>
 
 ---
@@ -31,9 +25,9 @@ Last-Update: <YYYY-MM-DD>
  	result=$($rndc reload $domain 2>&1)
  	if [ $? -ne 0 ]; then
 -		printf "Reloading the zone '$domain' failed: $result\n" 1>&2
-+		logger -t ldap2bind "Reloading the zone '$domain' failed: $result\n"
++                logger -t ldap2bind "Reloading the zone '$domain' failed: $result\n"
  	else
 -		printf "Reloading the zone '$domain' was successful\n" 1>&2
-+		logger -t ldap2bind "Reloading the zone '$domain' was successful\n"
++                logger -t ldap2bind "Reloading the zone '$domain' was successful\n"
  	fi
  done
diff --git a/debian/patches/series b/debian/patches/series
index 7e98235..a829c93 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-debian-changes-0.2-2
+fix-default-location

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