[Pkg-fedora-ds-maintainers] 389-ds-base: Changes to 'master'

[Timo Aaltonen]

 debian/changelog                  |    6 +++
 debian/patches/series             |    1 
 debian/patches/use-perl-move.diff |   62 --------------------------------------
 3 files changed, 6 insertions(+), 63 deletions(-)

New commits:
commit c1c5c858f7e71cbdf337c702a5b4c051b6d989a0
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Wed Mar 30 08:39:09 2016 +0300

    releasing package 389-ds-base version 1.3.4.8-4

diff --git a/debian/changelog b/debian/changelog
index c1ba583..ab7f8f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-389-ds-base (1.3.4.8-4) UNRELEASED; urgency=medium
+389-ds-base (1.3.4.8-4) unstable; urgency=medium
 
   * use-perl-move.diff: Dropped, 'rename' is more reliable.
 
- -- Timo Aaltonen <tjaalton at debian.org>  Wed, 30 Mar 2016 08:38:15 +0300
+ -- Timo Aaltonen <tjaalton at debian.org>  Wed, 30 Mar 2016 08:38:24 +0300
 
 389-ds-base (1.3.4.8-3) unstable; urgency=medium
 

commit d0fa33deca34960f49ab4fcfcdbb4f82f6cc63ae
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Wed Mar 30 08:38:23 2016 +0300

    use-perl-move.diff: Dropped, 'rename' is more reliable.

diff --git a/debian/changelog b/debian/changelog
index 24b6758..c1ba583 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+389-ds-base (1.3.4.8-4) UNRELEASED; urgency=medium
+
+  * use-perl-move.diff: Dropped, 'rename' is more reliable.
+
+ -- Timo Aaltonen <tjaalton at debian.org>  Wed, 30 Mar 2016 08:38:15 +0300
+
 389-ds-base (1.3.4.8-3) unstable; urgency=medium
 
   * use-perl-move.diff: Fix 60upgradeschemafiles.pl to use File::Copy.
diff --git a/debian/patches/series b/debian/patches/series
index 55f8505..f2b5082 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,4 +8,3 @@ fix-obsolete-target.diff
 fix-saslpath.diff
 reproducible-build.diff
 fix-systemctl-path.diff
-use-perl-move.diff
diff --git a/debian/patches/use-perl-move.diff b/debian/patches/use-perl-move.diff
deleted file mode 100644
index 3d70ab8..0000000
--- a/debian/patches/use-perl-move.diff
+++ /dev/null
@@ -1,62 +0,0 @@
---- a/ldap/admin/src/scripts/60upgradeconfigfiles.pl
-+++ b/ldap/admin/src/scripts/60upgradeconfigfiles.pl
-@@ -31,7 +31,7 @@ sub runinst {
-         next if (! -f $oldname); # does not exist - skip - already (re)moved
-         my $newname = "$bakdir/$file";
-         $! = 0; # clear
--        rename $oldname, $newname;
-+        move $oldname, $newname;
-         if ($!) {
-             push @errs, ["error_renaming_config", $oldname, $newname, $!];
-         }
-@@ -57,7 +57,7 @@ sub runinst {
-             next if (! -f $oldname); # does not exist - not backed up
-             my $newname = $inf->{slapd}->{config_dir} . "/" . $file;
-             next if (-f $newname); # not removed
--            rename $oldname, $newname;
-+            move $oldname, $newname;
-         }
-         return @errs;
-     }
---- a/ldap/admin/src/scripts/60upgradeschemafiles.pl
-+++ b/ldap/admin/src/scripts/60upgradeschemafiles.pl
-@@ -1,4 +1,4 @@
--
-+use File::Copy;
- use Mozilla::LDAP::LDIF;
- use DSCreate qw(installSchema);
- 
-@@ -39,7 +39,7 @@ sub runinst {
-         next if (! -f $oldname); # does not exist - skip - already (re)moved
-         my $newname = "$bakdir/$file";
-         $! = 0; # clear
--        rename $oldname, $newname;
-+        move $oldname, $newname;
-         if ($!) {
-             push @errs, ["error_renaming_schema", $oldname, $newname, $!];
-         }
-@@ -140,7 +140,7 @@ sub runinst {
- 
-     # Backup the original 99user.ldif
-     $! = 0; # clear
--    rename $inf->{slapd}->{schema_dir} . "/99user.ldif", "$bakdir/99user.ldif";
-+    move $inf->{slapd}->{schema_dir} . "/99user.ldif", "$bakdir/99user.ldif";
-     if ($!) {
-         push @errs, ["error_renaming_schema", $inf->{slapd}->{schema_dir} . "/99user.ldif", "$bakdir/99user.ldif", $!];
-     }
-@@ -171,13 +171,13 @@ sub runinst {
-             next if (! -f $oldname); # does not exist - not backed up
-             my $newname = $inf->{slapd}->{schema_dir} . "/" . $file;
-             next if (-f $newname); # not removed
--            rename $oldname, $newname;
-+            move $oldname, $newname;
-         }
- 
-         # Restore 99user.ldif. We overwrite whatever is there since
-         # it is possible that we have modified it.
-         if (-f "$bakdir/99user.ldif") {
--                rename "$bakdir/99user.ldif", $inf->{slapd}->{schema_dir} . "/99user.ldif";
-+                move "$bakdir/99user.ldif", $inf->{slapd}->{schema_dir} . "/99user.ldif";
-         }
- 
-         return @errs;