diff --git a/lam-packaging/buildPackages b/lam-packaging/buildPackages index f46faf03..4b56005f 100755 --- a/lam-packaging/buildPackages +++ b/lam-packaging/buildPackages @@ -26,28 +26,28 @@ fi function minify { local dir="$1" echo "Minify JS files in $dir" + local outFile=$dir/100_lam.${VERSION}.min.js local files=`ls $dir/*.js` + local jsFiles="" for file in $files; do - closure-compiler --charset UTF-8 --js $file --js_output_file ${file}-MIN - rm $file - mv ${file}-MIN $file - # add final new line to supress Debian warnings - echo "" >> $file + jsFiles="$jsFiles --js $file" done + closure-compiler --charset UTF-8 $jsFiles --js_output_file $outFile + rm $files + # add final new line to supress Debian warnings + echo "" >> $outFile } # minifies the CSS files function minifyCSS { local dir="$1" echo "Minify CSS files in $dir" + local outFile=$dir/100_lam.${VERSION}.min.css local files=`ls $dir/*.css` - for file in $files; do - cleancss -o ${file}-MIN $file - rm $file - mv ${file}-MIN $file - # add final new line to supress Debian warnings - echo "" >> $file - done + cat $files | cleancss -o $outFile + rm $files + # add final new line to supress Debian warnings + echo "" >> $outFile } echo "Getting files..." diff --git a/lam-packaging/debian/changelog b/lam-packaging/debian/changelog index 61d317a5..1608cda4 100644 --- a/lam-packaging/debian/changelog +++ b/lam-packaging/debian/changelog @@ -1,3 +1,9 @@ +ldap-account-manager (6.3.DEV-1) unstable; urgency=medium + + * new upstream release + + -- Roland Gruber Wed, 13 Dec 2017 16:47:31 +0200 + ldap-account-manager (6.2.1-1) unstable; urgency=medium * new upstream release diff --git a/lam-packaging/debian/minify b/lam-packaging/debian/minify index 7eae9cb4..e95646fe 100755 --- a/lam-packaging/debian/minify +++ b/lam-packaging/debian/minify @@ -1,22 +1,24 @@ #!/bin/bash set -e - -files=`ls templates/lib/*.js` -for file in $files; do - closure-compiler --charset UTF-8 --js $file --js_output_file ${file}-MIN - rm $file - mv ${file}-MIN $file +outFile=templates/lib/100_lam.${SOURCE_DATE_EPOCH}.min.js +if [ ! -e $outFile ]; then + files=`ls templates/lib/*.js` + jsFiles="" + for file in $files; do + jsFiles="$jsFiles --js $file" + done + closure-compiler --charset UTF-8 $jsFiles --js_output_file $outFile + rm $files # add final new line to supress Debian warnings - echo "" >> $file -done + echo "" >> $outFile +fi files=`ls style/*.css` -for file in $files; do - cleancss -o ${file}-MIN $file - rm $file - mv ${file}-MIN $file +outFile=style/100_lam.${SOURCE_DATE_EPOCH}.min.css +if [ ! -e $outFile ]; then + cat $files | cleancss -o ${outFile} + rm $files # add final new line to supress Debian warnings - echo "" >> $file -done - + echo "" >> $outFile +fi diff --git a/lam/HISTORY b/lam/HISTORY index f45ab248..992640df 100644 --- a/lam/HISTORY +++ b/lam/HISTORY @@ -1,3 +1,10 @@ +March 2018 6.3 + - Server profile: added option if referential integrity overlay is active to sip cleanup actions + - LAM Pro: + -> Support custom structural object classes with new custom type + -> Support dynamic lists + + 04.02.2018 6.2.1 - Fixed bugs: -> Login page not working when no server profile exists (44) diff --git a/lam/VERSION b/lam/VERSION index 024b066c..06dde738 100644 --- a/lam/VERSION +++ b/lam/VERSION @@ -1 +1 @@ -6.2.1 +6.3.DEV diff --git a/lam/config/templates/pdf/default.customType.xml b/lam/config/templates/pdf/default.customType.xml new file mode 100644 index 00000000..94c297b5 --- /dev/null +++ b/lam/config/templates/pdf/default.customType.xml @@ -0,0 +1,4 @@ + +
+
+ diff --git a/lam/config/templates/profiles/default.customType b/lam/config/templates/profiles/default.customType new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/lam/config/templates/profiles/default.customType @@ -0,0 +1 @@ + diff --git a/lam/copyright b/lam/copyright index 222c1ce3..1e09f8c8 100644 --- a/lam/copyright +++ b/lam/copyright @@ -15,9 +15,11 @@ time. * lib/modules/aliasEntry.inc * lib/modules/automount.inc * lib/modules/bindDLZ.inc +* lib/modules/customBaseType.inc * lib/modules/customFields.inc * lib/modules/customScripts.inc * lib/modules/device.inc +* lib/modules/dynamicList.inc * lib/modules/groupOfNames.inc * lib/modules/groupOfNamesUser.inc * lib/modules/groupOfUniqueNames.inc @@ -48,8 +50,9 @@ time. * lib/modules/zarafaServer.inc * lib/modules/zarafaUser.inc * lib/types/alias.inc -* lib/types/bind.inc * lib/types/automountType.inc +* lib/types/bind.inc +* lib/types/customType.inc * lib/types/gon.inc * lib/types/nisObjectType.inc * lib/types/nsview.inc diff --git a/lam/docs/devel/upgrade.htm b/lam/docs/devel/upgrade.htm index 57045dbc..22f80820 100644 --- a/lam/docs/devel/upgrade.htm +++ b/lam/docs/devel/upgrade.htm @@ -60,6 +60,19 @@ This is a list of API changes for all LAM releases.
+

6.2 -> 6.3

+ +

6.1 -> 6.2

+

6.0 -> 6.1