[pkg-kolab] r1356 - kolab-cyrus-imapd/scripts

[Mathieu Parent]

Author: sathieu
Date: 2009-10-04 15:08:07 +0000 (Sun, 04 Oct 2009)
New Revision: 1356

Modified:
   kolab-cyrus-imapd/scripts/kolab-cyrus-merge
Log:
More verbose when merging


Modified: kolab-cyrus-imapd/scripts/kolab-cyrus-merge
===================================================================
--- kolab-cyrus-imapd/scripts/kolab-cyrus-merge	2009-10-04 13:00:53 UTC (rev 1355)
+++ kolab-cyrus-imapd/scripts/kolab-cyrus-merge	2009-10-04 15:08:07 UTC (rev 1356)
@@ -74,7 +74,7 @@
 fi
 
 if [ ! "$(command -v merge)" ]; then
-    error "merge is not installed (package rcs)"
+	error "merge is not installed (package rcs)"
 fi
 
 cp -a $cyrus_new_dir $kolab_new_dir
@@ -97,6 +97,7 @@
 	patches/00list patches/01-fix_Makefile.in.dpatch patches/45-kolab2-annotations.dpatch patches/61-64bit-quota.dpatch patches/65-sieveshell-enhancements.dpatch \
 	po/POTFILES.in
 do
+	echo "Merging debian/$file"
 	$MERGE $kolab_new_dir/debian/$file $cyrus_old_dir/debian/$file $kolab_old_dir/debian/$file || [ $? -eq 1 ]
 done
 
@@ -139,6 +140,7 @@
 				#continue
 			fi
 			if [ -e $kolab_old_dir/debian/$(basename $oldkfile) ]; then
+				echo Merging to debian/$(basename $oldkfile)
 				$MERGE $newkfile $cyrus_old_dir/debian/$(basename $oldcfile) $kolab_old_dir/debian/$(basename $oldkfile) || [ $? -eq 1 ]
 			else
 				rm $newkfile