rev 18929 - in kde-extras/icecream/trunk/debian: . patches

[Fathi Boudra]

Author: fabo
Date: 2011-09-14 13:06:27 +0000 (Wed, 14 Sep 2011)
New Revision: 18929

Modified:
   kde-extras/icecream/trunk/debian/changelog
   kde-extras/icecream/trunk/debian/control
   kde-extras/icecream/trunk/debian/icecc.default
   kde-extras/icecream/trunk/debian/icecc.init
   kde-extras/icecream/trunk/debian/libicecc-dev.install
   kde-extras/icecream/trunk/debian/patches/10_rename_scheduler.diff
Log:
 * New upstream release.
   - remote compilation fails with missing g++ plugin (Closes: #630504)
 * Bump Standards-Version to 3.9.1 (no changes needed).
 * Use dpkg wildcards for kfreebsd architecture. (Closes: #634317)
 * Apply patch from Aloisio Almeida to resolve broken logging
   when iceccd is launched from its initscript. (Closes: #635564)
 * Remove libicecc.la file.


Modified: kde-extras/icecream/trunk/debian/changelog
===================================================================
--- kde-extras/icecream/trunk/debian/changelog	2011-09-14 12:53:09 UTC (rev 18928)
+++ kde-extras/icecream/trunk/debian/changelog	2011-09-14 13:06:27 UTC (rev 18929)
@@ -1,3 +1,15 @@
+icecc (0.9.7-1) unstable; urgency=low
+
+  * New upstream release.
+    - remote compilation fails with missing g++ plugin (Closes: #630504)
+  * Bump Standards-Version to 3.9.1 (no changes needed).
+  * Use dpkg wildcards for kfreebsd architecture. (Closes: #634317)
+  * Apply patch from Aloisio Almeida to resolve broken logging when iceccd is
+    launched from its initscript. (Closes: #635564)
+  * Remove libicecc.la file.
+
+ -- Fathi Boudra <fabo at debian.org>  Thu, 28 Jul 2011 15:06:47 +0300
+
 icecc (0.9.6-1) unstable; urgency=low
 
   * New upstream release.

Modified: kde-extras/icecream/trunk/debian/control
===================================================================
--- kde-extras/icecream/trunk/debian/control	2011-09-14 12:53:09 UTC (rev 18928)
+++ kde-extras/icecream/trunk/debian/control	2011-09-14 13:06:27 UTC (rev 18929)
@@ -4,9 +4,9 @@
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org> 
 Uploaders: Fathi Boudra <fabo at debian.org>, Mark Purcell <msp at debian.org>
 Build-Depends: debhelper (>= 7.4.15), autoconf, automake, libtool, docbook2x,
- libdevstat-dev [kfreebsd-i386 kfreebsd-amd64]
+ libdevstat-dev [kfreebsd-any]
 Homepage: http://en.opensuse.org/Icecream
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/icecream/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/icecream/?op=log
 

Modified: kde-extras/icecream/trunk/debian/icecc.default
===================================================================
--- kde-extras/icecream/trunk/debian/icecc.default	2011-09-14 12:53:09 UTC (rev 18928)
+++ kde-extras/icecream/trunk/debian/icecc.default	2011-09-14 13:06:27 UTC (rev 18929)
@@ -5,18 +5,21 @@
 # should icecc be started on boot?
 #
 # START_ICECC="true"
+
 START_ICECC="true"
 
 #
 # Nice level of running compilers
 #
 # ICECC_NICE_LEVEL="5"
+
 ICECC_NICE_LEVEL="5"
 
 #
 # icecc daemon log file
 #
-# ICECC_LOG_FILE="/var/log/iceccd.log"
+# ICECC_LOG_FILE="/var/log/iceccd"
+
 ICECC_LOG_FILE="/var/log/iceccd.log"
 
 #
@@ -25,6 +28,7 @@
 # for whatever reason.
 #
 # ICECC_NETNAME=""
+
 ICECC_NETNAME=""
 
 # 
@@ -32,6 +36,7 @@
 # default this depends on the number of (virtual) CPUs installed. 
 #
 # ICECC_MAX_JOBS=""
+
 ICECC_MAX_JOBS=""
 
 #
@@ -40,18 +45,21 @@
 # path if your /tmp is small - but the user icecc has to write to it.
 # 
 # ICECC_BASEDIR="/var/cache/icecc"
+
 ICECC_BASEDIR="/var/cache/icecc"
 
 #
 # Start also the scheduler?
 #
 # START_ICECC_SCHEDULER="false"
+
 START_ICECC_SCHEDULER="false"
 
 #
 # icecc scheduler log file
 #
-# ICECC_SCHEDULER_LOG_FILE="/var/log/icecc_scheduler.log"
+# ICECC_SCHEDULER_LOG_FILE="/var/log/icecc_scheduler"
+
 ICECC_SCHEDULER_LOG_FILE="/var/log/icecc_scheduler.log"
 
 #
@@ -59,4 +67,5 @@
 # of a firewall) you can specify it.
 #
 # ICECC_SCHEDULER_HOST=""
+
 ICECC_SCHEDULER_HOST=""

Modified: kde-extras/icecream/trunk/debian/icecc.init
===================================================================
--- kde-extras/icecream/trunk/debian/icecc.init	2011-09-14 12:53:09 UTC (rev 18928)
+++ kde-extras/icecream/trunk/debian/icecc.init	2011-09-14 13:06:27 UTC (rev 18929)
@@ -51,7 +51,7 @@
 	fi
 
 	start-stop-daemon --start --quiet --exec $DAEMON -- \
-	-d "$logfile" $nice $scheduler $netname -u icecc $basedir $maxjobs
+	-d $logfile $nice $scheduler $netname -u icecc $basedir $maxjobs
 }
 
 stop_icecc_daemon() {

Modified: kde-extras/icecream/trunk/debian/libicecc-dev.install
===================================================================
--- kde-extras/icecream/trunk/debian/libicecc-dev.install	2011-09-14 12:53:09 UTC (rev 18928)
+++ kde-extras/icecream/trunk/debian/libicecc-dev.install	2011-09-14 13:06:27 UTC (rev 18929)
@@ -1,5 +1,4 @@
 usr/include/icecc/comm.h
 usr/include/icecc/job.h
 usr/lib/libicecc.a
-usr/lib/libicecc.la
 usr/lib/pkgconfig/icecc.pc

Modified: kde-extras/icecream/trunk/debian/patches/10_rename_scheduler.diff
===================================================================
--- kde-extras/icecream/trunk/debian/patches/10_rename_scheduler.diff	2011-09-14 12:53:09 UTC (rev 18928)
+++ kde-extras/icecream/trunk/debian/patches/10_rename_scheduler.diff	2011-09-14 13:06:27 UTC (rev 18929)
@@ -1,5 +1,9 @@
 Description: Rename scheduler binary to icecc-scheduler
 Author: Fathi Boudra <fabo at debian.org>
+---
+ services/Makefile.am |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
 --- a/services/Makefile.am
 +++ b/services/Makefile.am
 @@ -11,9 +11,9 @@ ice_HEADERS = job.h comm.h