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

[Fathi Boudra]

Author: fboudra-guest
Date: 2007-06-12 12:25:55 +0000 (Tue, 12 Jun 2007)
New Revision: 6468

Added:
   kde-extras/icecream/trunk/debian/patches/11_gcc4.3_support_bug417230.diff
Removed:
   kde-extras/icecream/trunk/debian/patches/Bug#41723-GCC4.3.diff
Modified:
   kde-extras/icecream/trunk/debian/changelog
   kde-extras/icecream/trunk/debian/control
   kde-extras/icecream/trunk/debian/patches/10_rename_scheduler.diff
   kde-extras/icecream/trunk/debian/rules
Log:
icecc-0.8.0-1
  * New upstream release.
  * Add [INTL:nl] Dutch po-debconf translation. (Closes: #423042)
  * Update clean target in rules to fix FTBFS if built twice in a row.
    (Closes: #424415)


Modified: kde-extras/icecream/trunk/debian/changelog
===================================================================
--- kde-extras/icecream/trunk/debian/changelog	2007-06-11 19:43:53 UTC (rev 6467)
+++ kde-extras/icecream/trunk/debian/changelog	2007-06-12 12:25:55 UTC (rev 6468)
@@ -1,15 +1,17 @@
-icecc (0.7.14-6) UNRELEASED; urgency=low
+icecc (0.8.0-1) unstable; urgency=low
 
-  * NOT RELEASED YET
-  * [INTL:nl] Dutch po-debconf translation (Closes: #423042)
+  * New upstream release.
+  * Add [INTL:nl] Dutch po-debconf translation. (Closes: #423042)
+  * Update clean target in rules to fix FTBFS if built twice in a row.
+    (Closes: #424415)
 
- -- Mark Purcell <msp at debian.org>  Wed, 09 May 2007 20:28:59 +0100
+ -- Fathi Boudra <fboudra at free.fr>  Tue, 12 Jun 2007 12:01:53 +0200
 
 icecc (0.7.14-5) unstable; urgency=low
 
   * Include gcc4.3 patch from Martin. (Closes: #417230)
   * Add get-orig-source: target
-  * Add debcon translations
+  * Add debconf translations
     - [INTL:de] initial German debconf translation (Closes: #413407)
     - [INTL:pt] Portuguese translation for debconf messages
     (Closes: #414917)

Modified: kde-extras/icecream/trunk/debian/control
===================================================================
--- kde-extras/icecream/trunk/debian/control	2007-06-11 19:43:53 UTC (rev 6467)
+++ kde-extras/icecream/trunk/debian/control	2007-06-12 12:25:55 UTC (rev 6468)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org> 
 Uploaders: Fathi Boudra <fboudra at free.fr>, Mark Purcell <msp at debian.org>
-Build-Depends: cdbs, debhelper (>= 5), automake1.9, libtool, docbook2x
+Build-Depends: cdbs, debhelper (>= 5), automake, libtool, docbook2x
 Standards-Version: 3.7.2
 
 Package: icecc

Modified: kde-extras/icecream/trunk/debian/patches/10_rename_scheduler.diff
===================================================================
--- kde-extras/icecream/trunk/debian/patches/10_rename_scheduler.diff	2007-06-11 19:43:53 UTC (rev 6467)
+++ kde-extras/icecream/trunk/debian/patches/10_rename_scheduler.diff	2007-06-12 12:25:55 UTC (rev 6468)
@@ -1,8 +1,8 @@
-diff -Nur icecc-0.7.7/services/Makefile.am icecc-0.7.7.new/services/Makefile.am
---- icecc-0.7.7/services/Makefile.am	2006-07-08 19:45:22.000000000 +0200
-+++ icecc-0.7.7.new/services/Makefile.am	2006-08-28 12:29:56.000000000 +0200
-@@ -10,9 +10,9 @@
- ice_HEADERS = job.h comm.h
+diff -Nur icecc-0.8.0/services/Makefile.am icecc-0.8.0.new/services/Makefile.am
+--- icecc-0.8.0/services/Makefile.am	2007-06-12 12:32:10.000000000 +0200
++++ icecc-0.8.0.new/services/Makefile.am	2007-06-12 13:43:24.000000000 +0200
+@@ -11,9 +11,9 @@
+ noinst_HEADERS = bench.h exitcode.h getifaddrs.h logging.h tempfile.h platform.h
  icedir = $(includedir)/icecc
  
 -sbin_PROGRAMS = scheduler

Added: kde-extras/icecream/trunk/debian/patches/11_gcc4.3_support_bug417230.diff
===================================================================
--- kde-extras/icecream/trunk/debian/patches/11_gcc4.3_support_bug417230.diff	                        (rev 0)
+++ kde-extras/icecream/trunk/debian/patches/11_gcc4.3_support_bug417230.diff	2007-06-12 12:25:55 UTC (rev 6468)
@@ -0,0 +1,11 @@
+diff -Nur icecc-0.8.0/services/logging.h icecc-0.8.0.new/services/logging.h
+--- icecc-0.8.0/services/logging.h	2007-06-12 12:32:10.000000000 +0200
++++ icecc-0.8.0.new/services/logging.h	2007-06-12 13:45:04.000000000 +0200
+@@ -21,6 +21,7 @@
+ #ifndef _LOGGING_H
+ #define _LOGGING_H
+ 
++#include <cstdlib>
+ #include <sys/time.h>
+ #include <stdlib.h>
+ #include <unistd.h>

Deleted: kde-extras/icecream/trunk/debian/patches/Bug#41723-GCC4.3.diff

Modified: kde-extras/icecream/trunk/debian/rules
===================================================================
--- kde-extras/icecream/trunk/debian/rules	2007-06-11 19:43:53 UTC (rev 6467)
+++ kde-extras/icecream/trunk/debian/rules	2007-06-12 12:25:55 UTC (rev 6468)
@@ -20,8 +20,14 @@
 
 clean::
 	rm -f *.1
+	rm -f aclocal.m4 config.guess config.h.in config.sub configure depcomp \
+		install-sh ltmain.sh missing
+	rm -f services/icecc-scheduler
+	rm -rf autom4te.cache
+	find . -type f -name 'Makefile.in' | xargs rm -f
 
 get-orig-source:
 	@@dh_testdir
 	@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
 	@@dpatch-get-origtargz ../tarballs
+