[debian-edu-commits] debian-edu/pkg-team/ 05/06: Unify file name scheme in patch files.

[Mike Gabriel]

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

sunweaver pushed a commit to branch master
in repository gosa.

commit f89a4b434185020bc6389da5f6156bb4055ee5df
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Jul 1 14:24:27 2014 +0200

    Unify file name scheme in patch files.
---
 debian/patches/1001_fix-mass-ldapimport.patch  |  4 ++--
 debian/patches/1002_trim-decrypt.patch         |  6 +++---
 debian/patches/2006_sasl-password-change.patch | 12 ++++++------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/debian/patches/1001_fix-mass-ldapimport.patch b/debian/patches/1001_fix-mass-ldapimport.patch
index 9574dae..2c810a4 100644
--- a/debian/patches/1001_fix-mass-ldapimport.patch
+++ b/debian/patches/1001_fix-mass-ldapimport.patch
@@ -1,7 +1,7 @@
 Index: addons/ldapmanager/class_csvimport.inc
 ===================================================================
---- gosa/ldapmanager/addons/ldapmanager/class_csvimport.inc      (revisjon 21231)
-+++ gosa/ldapmanager/addons/ldapmanager/class_csvimport.inc      (arbeidskopi)
+--- a/ldapmanager/addons/ldapmanager/class_csvimport.inc      (revisjon 21231)
++++ b/ldapmanager/addons/ldapmanager/class_csvimport.inc      (arbeidskopi)
 @@ -175,17 +175,25 @@
  
  
diff --git a/debian/patches/1002_trim-decrypt.patch b/debian/patches/1002_trim-decrypt.patch
index 22ed4dc..4abd332 100644
--- a/debian/patches/1002_trim-decrypt.patch
+++ b/debian/patches/1002_trim-decrypt.patch
@@ -14,10 +14,10 @@ Abstract:
  So the decryption of the LDAP password which has been encrypted by
  running gosa-encrypt-passwords does not seem to work.
 
-Index: gosa-2.7.4+reloaded1/gosa-core/include/functions.inc
+Index: gosa-core/include/functions.inc
 ===================================================================
---- gosa-2.7.4+reloaded1.orig/gosa-core/include/functions.inc
-+++ gosa-2.7.4+reloaded1/gosa-core/include/functions.inc
+--- a/gosa-core/include/functions.inc
++++ b/gosa-core/include/functions.inc
 @@ -3334,7 +3334,7 @@ function cred_decrypt($input,$password)
    $size = mcrypt_get_iv_size(MCRYPT_RIJNDAEL_128, MCRYPT_MODE_CBC);
    $iv = mcrypt_create_iv($size, MCRYPT_DEV_RANDOM);
diff --git a/debian/patches/2006_sasl-password-change.patch b/debian/patches/2006_sasl-password-change.patch
index 6311dbb..ba88a6c 100644
--- a/debian/patches/2006_sasl-password-change.patch
+++ b/debian/patches/2006_sasl-password-change.patch
@@ -1,6 +1,6 @@
-diff -ur gosa.orig/include/password-methods/class_password-methods-sasl.inc gosa/include/password-methods/class_password-methods-sasl.inc
---- ./gosa-core/include/password-methods/class_password-methods-sasl.inc	2012-05-02 11:49:53.000000000 +0200
-+++ ./gosa-core/include/password-methods/class_password-methods-sasl.inc	2013-11-24 14:32:29.354960467 +0100
+diff -ur a/gosa-core/include/password-methods/class_password-methods-sasl.inc b/gosa-core/include/password-methods/class_password-methods-sasl.inc
+--- a/gosa-core/include/password-methods/class_password-methods-sasl.inc	2012-05-02 11:49:53.000000000 +0200
++++ b/gosa-core/include/password-methods/class_password-methods-sasl.inc	2013-11-24 14:32:29.354960467 +0100
 @@ -42,8 +42,6 @@
      if($ldap->count() == 1){
          $attrs = $ldap->fetch();
@@ -10,9 +10,9 @@ diff -ur gosa.orig/include/password-methods/class_password-methods-sasl.inc gosa
      }
    }
  
-diff -ur gosa.orig/plugins/admin/users/class_userManagement.inc gosa/plugins/admin/users/class_userManagement.inc
---- ./gosa-core/plugins/admin/users/class_userManagement.inc	2012-05-04 17:08:16.000000000 +0200
-+++ ./gosa-core/plugins/admin/users/class_userManagement.inc	2013-11-24 14:38:46.563804917 +0100
+diff -ur a/gosa-core/plugins/admin/users/class_userManagement.inc b/gosa-core/plugins/admin/users/class_userManagement.inc
+--- a/gosa-core/plugins/admin/users/class_userManagement.inc	2012-05-04 17:08:16.000000000 +0200
++++ b/gosa-core/plugins/admin/users/class_userManagement.inc	2013-11-24 14:38:46.563804917 +0100
 @@ -279,18 +279,6 @@
              $this->proposalSelected = ($this->proposal != "");
              $this->dn = array_pop($this->pwd_change_queue);

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