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

Fathi Boudra fabo at alioth.debian.org
Thu Apr 9 11:16:55 UTC 2009 

Author: fabo
Date: 2009-04-09 11:16:55 +0000 (Thu, 09 Apr 2009)
New Revision: 14326

Added:
   kde-extras/icecream/trunk/debian/patches/series
Removed:
   kde-extras/icecream/trunk/debian/patches/11_gcc4.3_support_bug417230.diff
Modified:
   kde-extras/icecream/trunk/debian/changelog
   kde-extras/icecream/trunk/debian/compat
   kde-extras/icecream/trunk/debian/control
   kde-extras/icecream/trunk/debian/patches/10_rename_scheduler.diff
   kde-extras/icecream/trunk/debian/patches/12_fix_crosstool_distribution_bug494692.diff
   kde-extras/icecream/trunk/debian/patches/13_fix_nonblocking_sockets_for_icemon_bug503152.diff
   kde-extras/icecream/trunk/debian/rules
   kde-extras/icecream/trunk/debian/watch
Log:
Merge my changes for icecc 0.9.3 upload.


Modified: kde-extras/icecream/trunk/debian/changelog
===================================================================
--- kde-extras/icecream/trunk/debian/changelog	2009-04-09 09:56:08 UTC (rev 14325)
+++ kde-extras/icecream/trunk/debian/changelog	2009-04-09 11:16:55 UTC (rev 14326)
@@ -1,14 +1,16 @@
-icecc (0.9.3-2) UNRELEASED; urgency=low
-
-  * NOT RELEASED YET
-
- -- Mark Purcell <msp at debian.org>  Thu, 09 Apr 2009 19:51:24 +1000
-
 icecc (0.9.3-1) unstable; urgency=low
 
-  * New upstream release
+  * New upstream release.
+  * Remove patches:
+    - 11_gcc4.3_support_bug417230.diff. Not needed.
+    - 12_fix_crosstool_distribution_bug494692.diff
+    - 13_fix_nonblocking_sockets_for_icemon_bug503152.diff
+    - 14_gcc4.4_support_bug505118.diff. Merged upstream.
+  * Bump compat/debhelper to 7. No changes needed.
+  * Bump Standards-Version to 3.8.1.
+  * Switch to quilt patch system. Add build-dependency to quilt.
 
- -- Mark Purcell <msp at debian.org>  Thu, 09 Apr 2009 19:47:49 +1000
+ -- Fathi Boudra <fabo at debian.org>  Thu, 09 Apr 2009 10:18:31 +0200
 
 icecc (0.9.2-1) unstable; urgency=low
 

Modified: kde-extras/icecream/trunk/debian/compat
===================================================================
--- kde-extras/icecream/trunk/debian/compat	2009-04-09 09:56:08 UTC (rev 14325)
+++ kde-extras/icecream/trunk/debian/compat	2009-04-09 11:16:55 UTC (rev 14326)
@@ -1 +1 @@
-5
+7

Modified: kde-extras/icecream/trunk/debian/control
===================================================================
--- kde-extras/icecream/trunk/debian/control	2009-04-09 09:56:08 UTC (rev 14325)
+++ kde-extras/icecream/trunk/debian/control	2009-04-09 11:16:55 UTC (rev 14326)
@@ -3,15 +3,16 @@
 Priority: optional
 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: cdbs, debhelper (>= 5), automake, libtool, docbook2x
+Build-Depends: cdbs, debhelper (>= 7), quilt, automake, libtool, docbook2x
 Homepage: http://en.opensuse.org/Icecream
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
 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
 
 Package: icecc
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, lsb-base, c++-compiler | c-compiler, dpkg (>= 1.9.0) 
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, lsb-base,
+ c++-compiler | c-compiler, dpkg (>= 1.9.0)
 Suggests: icecc-monitor
 Description: distributed compiler (client and server)
  icecc is a distributed compile system. It allows parallel compiling by

Modified: kde-extras/icecream/trunk/debian/patches/10_rename_scheduler.diff
===================================================================
--- kde-extras/icecream/trunk/debian/patches/10_rename_scheduler.diff	2009-04-09 09:56:08 UTC (rev 14325)
+++ kde-extras/icecream/trunk/debian/patches/10_rename_scheduler.diff	2009-04-09 11:16:55 UTC (rev 14326)
@@ -1,6 +1,6 @@
 --- a/services/Makefile.am
 +++ b/services/Makefile.am
-@@ -11,9 +11,9 @@
+@@ -11,9 +11,9 @@ ice_HEADERS = job.h comm.h
  noinst_HEADERS = bench.h exitcode.h getifaddrs.h logging.h tempfile.h platform.h
  icedir = $(includedir)/icecc
  

Modified: kde-extras/icecream/trunk/debian/patches/12_fix_crosstool_distribution_bug494692.diff
===================================================================
--- kde-extras/icecream/trunk/debian/patches/12_fix_crosstool_distribution_bug494692.diff	2009-04-09 09:56:08 UTC (rev 14325)
+++ kde-extras/icecream/trunk/debian/patches/12_fix_crosstool_distribution_bug494692.diff	2009-04-09 11:16:55 UTC (rev 14326)
@@ -1,6 +1,6 @@
 --- a/daemon/environment.cpp
 +++ b/daemon/environment.cpp
-@@ -312,7 +312,7 @@
+@@ -324,7 +324,7 @@ pid_t start_install_environment( const s
          return 0;
      }
  

Modified: kde-extras/icecream/trunk/debian/patches/13_fix_nonblocking_sockets_for_icemon_bug503152.diff
===================================================================
--- kde-extras/icecream/trunk/debian/patches/13_fix_nonblocking_sockets_for_icemon_bug503152.diff	2009-04-09 09:56:08 UTC (rev 14325)
+++ kde-extras/icecream/trunk/debian/patches/13_fix_nonblocking_sockets_for_icemon_bug503152.diff	2009-04-09 11:16:55 UTC (rev 14326)
@@ -1,6 +1,6 @@
 --- a/services/comm.cpp
 +++ b/services/comm.cpp
-@@ -1160,14 +1160,21 @@
+@@ -1160,14 +1160,21 @@ DiscoverSched::try_get_scheduler ()
  
    if (ask_fd >= 0)
      {

Added: kde-extras/icecream/trunk/debian/patches/series
===================================================================
--- kde-extras/icecream/trunk/debian/patches/series	                        (rev 0)
+++ kde-extras/icecream/trunk/debian/patches/series	2009-04-09 11:16:55 UTC (rev 14326)
@@ -0,0 +1,3 @@
+10_rename_scheduler.diff
+# Disabled 12_fix_crosstool_distribution_bug494692.diff
+# Disabled 13_fix_nonblocking_sockets_for_icemon_bug503152.diff

Modified: kde-extras/icecream/trunk/debian/rules
===================================================================
--- kde-extras/icecream/trunk/debian/rules	2009-04-09 09:56:08 UTC (rev 14325)
+++ kde-extras/icecream/trunk/debian/rules	2009-04-09 11:16:55 UTC (rev 14326)
@@ -1,8 +1,8 @@
 #!/usr/bin/make -f
- 
+
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp
 DEB_INSTALL_MANPAGES_icecc := icecc.1 icecc-create-env.1 icecc-scheduler.1 iceccd.1

Modified: kde-extras/icecream/trunk/debian/watch
===================================================================
--- kde-extras/icecream/trunk/debian/watch	2009-04-09 09:56:08 UTC (rev 14325)
+++ kde-extras/icecream/trunk/debian/watch	2009-04-09 11:16:55 UTC (rev 14326)
@@ -1,2 +1,2 @@
 version=3
-opts=pasv ftp://ftp.suse.com/pub/projects/icecream/icecc-(.*)\.tar\.bz2 debian svn-upgrade
+ftp://ftp.suse.com/pub/projects/icecream/icecc-(.*)\.tar\.bz2 debian svn-upgrade

More information about the pkg-kde-commits mailing list