More cleanup for unstable setups

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@13166 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-core/Changelog b/gosa-core/Changelog
index 8187ff6bcb394be3f88179e81606f4eb1daf1aff..13621fc2bf2bd78b20b11246a1e88f2df9d184e2 100644 (file)
--- a/gosa-core/Changelog
+++ b/gosa-core/Changelog
@@ -14,6 +14,10 @@ GOsa2 changelog
   - Added local delivery flag to group mail
   - Fixed problem with sudoers creation
   - Fixed accidentally remove of non GOsa user accounts
+  - Simplified FAI management
+  - Fixed detection issues with password methods
+  - Fixed issues with user templates and storing password methods
+  - Removed forced dependency on GOsa-SI
 
 * gosa 2.6
   - Redesign of ACL handling

diff --git a/gosa-core/dh-make-gosa b/gosa-core/dh-make-gosa
index 5dddf8e44331a24f241addd929155573e1a43fa8..e1a826234eb0b2be34509d6b1c2f86f12bd5a688 100755 (executable)
--- a/gosa-core/dh-make-gosa
+++ b/gosa-core/dh-make-gosa
@@ -216,13 +216,16 @@ if [ -d html ]; then
 fi
 
 # Fix copyright
+sed -i '/^### OR ###/,/^########/d' debian/copyright
 sed -i '/^#/d;/^.*likewise for another author.*$/d' debian/copyright
 year=$(date +%Y)
-sed -i "s/.Copyright (C) YYYY Name OfAuthor./Copyright (C) $year $PL_AUTHOR/g" debian/copyright
+sed -i "s/.Copyright (C) YYYY Name OfAuthor./Copyright \(C) $year $PL_AUTHOR/g" debian/copyright
+sed -i "s/<Copyright (C) YYYY Firtname Lastname>/Copyright \(C) $year $PL_AUTHOR/g" debian/copyright
 sed -i "s/.url:\/\/example.com./http:\/\/www.gosa-project.org/g" debian/copyright
 sed -i "/.put author's name and email here.\
 /d" debian/copyright
 sed -i '/^Upstream/,/^$/d' debian/copyright
+sed -i 's/ C)/ (C)/g' debian/copyright
 
 # Adapt control
 sed -i "s#^Section: unknown#Section: $SECTION#g" debian/control

diff --git a/gosa-core/update-locale b/gosa-core/update-locale
index 033ba84a3fcbb35167e3731820ff4aec61e171e7..8c38ab65d7ba86cddf238ae4572ac3ed644cfb23 100755 (executable)
--- a/gosa-core/update-locale
+++ b/gosa-core/update-locale
@@ -46,10 +46,10 @@ generate_po() {
     DICT=""
     [ -r $DICT_FILE_ALL ] && DICT="-C $DICT_FILE_ALL"
     [ ${#DICT} -eq 0 ] && [ -r $DICT_FILE_CORE ] && DICT="-C $DICT_FILE_CORE"
-    msgmerge $DICT $f/messages.po locale/${l_path}messages.po --output-file=$f/messages.po.tmp &> /dev/null
+    msgmerge $DICT $f/messages.po locale/${l_path}messages.po --output-file=$f/messages.po.tmp
 
     # Filter out duplicates
-    msguniq $f/messages.po.tmp --output-file=$f/messages.po.new &> /dev/null
+    msguniq $f/messages.po.tmp --output-file=$f/messages.po.new
     rm $f/messages.po.tmp
 
     # Do an extra check for dummy dir 'locale/en/LC_MESSAGES'