rev 4547 - in kde-extras/ksystemlog/trunk/debian: . patches

[Fathi Boudra]

Author: fboudra-guest
Date: 2006-09-21 16:03:35 +0000 (Thu, 21 Sep 2006)
New Revision: 4547

Added:
   kde-extras/ksystemlog/trunk/debian/patches/12_kdepot.diff
   kde-extras/ksystemlog/trunk/debian/patches/13_logfiles.diff
Modified:
   kde-extras/ksystemlog/trunk/debian/changelog
Log:
merge patches from ubuntu

Modified: kde-extras/ksystemlog/trunk/debian/changelog
===================================================================
--- kde-extras/ksystemlog/trunk/debian/changelog	2006-09-21 15:50:46 UTC (rev 4546)
+++ kde-extras/ksystemlog/trunk/debian/changelog	2006-09-21 16:03:35 UTC (rev 4547)
@@ -1,3 +1,11 @@
+ksystemlog (0.3.2-2) unstable; urgency=low
+
+  * merged patches from ubuntu:
+   * add kdepot
+   * use Debian's default log locations
+
+ -- Fathi Boudra <fboudra at free.fr>  Thu, 21 Sep 2006 18:01:31 +0200
+
 ksystemlog (0.3.2-1) unstable; urgency=low
 
   * Initial release (Closes: #381050)

Added: kde-extras/ksystemlog/trunk/debian/patches/12_kdepot.diff
===================================================================
--- kde-extras/ksystemlog/trunk/debian/patches/12_kdepot.diff	                        (rev 0)
+++ kde-extras/ksystemlog/trunk/debian/patches/12_kdepot.diff	2006-09-21 16:03:35 UTC (rev 4547)
@@ -0,0 +1,11 @@
+--- a/admin/cvs.sh	2005-05-07 02:36:09.000000000 +0000
++++ b/admin/cvs.sh	2005-12-07 18:15:12.000000000 +0000
+@@ -517,7 +517,7 @@
+    perl -e '$mes=0; while (<STDIN>) { next if (/^(if|else|endif)\s/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
+ 
+    $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" \
+-	XGETTEXT="${XGETTEXT:-xgettext} -C -ki18n -ktr2i18n -kI18N_NOOP -ktranslate -kaliasLocale -x ${includedir:-${KDEDIR:-/usr/local/kde}/include}/kde.pot" \
++	XGETTEXT="${XGETTEXT:-xgettext} -C -ki18n -ktr2i18n -kI18N_NOOP -ktranslate -kaliasLocale -x /usr/include/kde/kde.pot" \
+ 	messages 
+    exit_code=$?
+    if test "$exit_code" != 0; then

Added: kde-extras/ksystemlog/trunk/debian/patches/13_logfiles.diff
===================================================================
--- kde-extras/ksystemlog/trunk/debian/patches/13_logfiles.diff	                        (rev 0)
+++ kde-extras/ksystemlog/trunk/debian/patches/13_logfiles.diff	2006-09-21 16:03:35 UTC (rev 4547)
@@ -0,0 +1,61 @@
+--- ksystemlog/ksystemlog/src/config/ksystemlog.kcfg	2005-07-28 18:37:39.000000000 +0000
++++ ksystemlog/ksystemlog/src/config/ksystemlog.kcfg	2005-07-28 18:47:00.253446504 +0000
+@@ -59,7 +59,7 @@
+ 		<!-- System config entries -->
+ 		<entry name="SystemPaths" type="StringList">
+ 			<label>The System log files paths.</label>
+-			<default>/var/log/messages</default>
++			<default>/var/log/syslog</default>
+ 		</entry>
+ 		<entry name="SystemLevels" type="IntList">
+ 			<label>The System log files levels.</label>
+@@ -70,7 +70,7 @@
+ 		<!-- Kernel config entries -->
+ 		<entry name="KernelPaths" type="StringList">
+ 			<label>The Kernel log files paths.</label>
+-			<default>/var/log/kernel/info,/var/log/kernel/warnings,/var/log/kernel/errors</default>
++			<default>/var/log/kern.log</default>
+ 		</entry>
+ 		<entry name="KernelLevels" type="IntList">
+ 			<label>The Kernel log files levels.</label>
+@@ -80,7 +80,7 @@
+ 		<!-- Cron config entries -->
+ 		<entry name="CronPaths" type="StringList">
+ 			<label>The Cron log files paths.</label>
+-			<default>/var/log/cron/info,/var/log/cron/warnings,/var/log/cron/errors</default>
++			<default>/var/log/cron.log</default>
+ 		</entry>
+ 		<entry name="CronLevels" type="IntList">
+ 			<label>The Cron log files levels.</label>
+@@ -90,7 +90,7 @@
+ 		<!-- Daemon config entries -->
+ 		<entry name="DaemonPaths" type="StringList">
+ 			<label>The Daemon log files paths.</label>
+-			<default>/var/log/daemons/info,/var/log/daemons/warnings,/var/log/daemons/errors</default>
++			<default>/var/log/daemon.log</default>
+ 		</entry>
+ 		<entry name="DaemonLevels" type="IntList">
+ 			<label>The Daemon log files levels.</label>
+@@ -118,19 +118,19 @@
+ 		<!-- Apache config entries -->
+ 		<entry name="ApachePaths" type="StringList">
+ 			<label>The Apache log files paths.</label>
+-			<default>/var/log/httpd/error_log,/var/log/httpd/ssl_error_log</default>
++			<default>/var/log/apache/error.log</default>
+ 		</entry>
+ 		
+ 		<!-- Apache Access config entries -->
+ 		<entry name="ApacheAccessPaths" type="StringList">
+ 			<label>The Apache Access log files paths.</label>
+-			<default>/var/log/httpd/access_log,/var/log/httpd/ssl_access_log</default>
++			<default>/var/log/apache/access.log</default>
+ 		</entry>
+ 		
+ 		<!-- Postfix config entries -->
+ 		<entry name="PostfixPaths" type="StringList">
+ 			<label>The Postfix log files paths.</label>
+-			<default>/var/log/mail/info,/var/log/mail/warnings,/var/log/mail/errors</default>
++			<default>/var/log/mail.info,/var/log/mail.warn,/var/log/mail.err</default>
+ 		</entry>
+ 		<entry name="PostfixLevels" type="IntList">
+ 			<label>The Postfix log files levels.</label>