rev 17712 - in kde-extras/icecream/trunk/debian: . man patches source

Fathi Boudra fabo at alioth.debian.org
Thu Apr 22 08:20:10 UTC 2010 

Author: fabo
Date: 2010-04-22 08:20:09 +0000 (Thu, 22 Apr 2010)
New Revision: 17712

Added:
   kde-extras/icecream/trunk/debian/source/
   kde-extras/icecream/trunk/debian/source/format
Removed:
   kde-extras/icecream/trunk/debian/README.source
   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
Modified:
   kde-extras/icecream/trunk/debian/changelog
   kde-extras/icecream/trunk/debian/control
   kde-extras/icecream/trunk/debian/copyright
   kde-extras/icecream/trunk/debian/icecc.install
   kde-extras/icecream/trunk/debian/man/icecc-create-env.xml
   kde-extras/icecream/trunk/debian/man/icecc-scheduler.xml
   kde-extras/icecream/trunk/debian/man/icecc.xml
   kde-extras/icecream/trunk/debian/patches/10_rename_scheduler.diff
   kde-extras/icecream/trunk/debian/patches/20_fix_ftbfs_on_kfreebsd.diff
   kde-extras/icecream/trunk/debian/patches/series
   kde-extras/icecream/trunk/debian/rules
Log:
  * New upstream release:
    - Install an "icerun" symlink that will serialize
      commands through icecream's local daemon.
  * Fix typos in manpages.
  * Add DEP-3 headers to patches.
  * Update debian/control:
    - Remove quilt build dependency.
    - Bump Standards-Version to 3.8.4 (no changes needed).
    - Add dependency to g++ | c++-compiler | c-compiler.
  * Refresh debian/copyright file.
  * Update debian/icecc.install: Add icerun.
  * Update debian/rules:
    - Enable parallel build (pass --parallel option to dh).
    - List missing files (pass --list-missing option to dh).
    - Cleanup quilt bits.


Modified: kde-extras/icecream/trunk/debian/changelog
===================================================================
--- kde-extras/icecream/trunk/debian/changelog	2010-04-21 08:36:08 UTC (rev 17711)
+++ kde-extras/icecream/trunk/debian/changelog	2010-04-22 08:20:09 UTC (rev 17712)
@@ -1,3 +1,23 @@
+icecc (0.9.5-1) unstable; urgency=low
+
+  * New upstream release:
+    - Install an "icerun" symlink that will serialize
+      commands through icecream's local daemon.
+  * Fix typos in manpages.
+  * Add DEP-3 headers to patches.
+  * Update debian/control:
+    - Remove quilt build dependency.
+    - Bump Standards-Version to 3.8.4 (no changes needed).
+    - Add dependency to g++ | c++-compiler | c-compiler.
+  * Refresh debian/copyright file.
+  * Update debian/icecc.install: Add icerun.
+  * Update debian/rules:
+    - Enable parallel build (pass --parallel option to dh).
+    - List missing files (pass --list-missing option to dh).
+    - Cleanup quilt bits.
+
+ -- Fathi Boudra <fabo at debian.org>  Thu, 22 Apr 2010 09:12:27 +0300
+
 icecc (0.9.4-2) unstable; urgency=low
 
   * Add Japanese debconf template translation. (Closes: #558075)

Modified: kde-extras/icecream/trunk/debian/control
===================================================================
--- kde-extras/icecream/trunk/debian/control	2010-04-21 08:36:08 UTC (rev 17711)
+++ kde-extras/icecream/trunk/debian/control	2010-04-22 08:20:09 UTC (rev 17712)
@@ -3,17 +3,17 @@
 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: debhelper (>= 7), quilt, autoconf, automake, libtool, docbook2x,
+Build-Depends: debhelper (>= 7.4.15), autoconf, automake, libtool, docbook2x,
  libdevstat-dev [kfreebsd-i386 kfreebsd-amd64]
 Homepage: http://en.opensuse.org/Icecream
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 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)
+ g++ | 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
@@ -34,4 +34,4 @@
  This package is part if icecc. It provides files which are necessary to build
  icecc-monitor.
  .
- See the 'icecc' package for more informations.
+ See the 'icecc' package for more information.

Modified: kde-extras/icecream/trunk/debian/copyright
===================================================================
--- kde-extras/icecream/trunk/debian/copyright	2010-04-21 08:36:08 UTC (rev 17711)
+++ kde-extras/icecream/trunk/debian/copyright	2010-04-22 08:20:09 UTC (rev 17712)
@@ -1,50 +1,63 @@
 This package was debianized by Fathi Boudra <fboudra at free.fr> on
 Sun, 27 Aug 2006 12:21:38 +0200.
 
-It was downloaded from ftp://ftp.suse.com/pub/projects/icecream
+It was downloaded from:
 
+    ftp://ftp.suse.com/pub/projects/icecream
+
 Upstream Authors:
-   Stephan Kulow <coolo at kde.org> 
-   Michael Matz <matz at suse.de>
-   Cornelius Schumacher <cschum at suse.de>
-   Lubos Lunak <llunak at suse.cz>
-   Frerich Raabe <raabe at kde.org>
 
+    Stephan Kulow <coolo at kde.org> 
+    Michael Matz <matz at suse.de>
+    Cornelius Schumacher <cschum at suse.de>
+    Lubos Lunak <llunak at suse.cz>
+    Frerich Raabe <raabe at kde.org>
+
 icecc is based on distcc, which is (C) 2002-2003 Martin Pool <mbp at samba.org>
 and is licensed under the GPL.
 
 Copyright for safeguard, util, arg, cpp, ncpus, exitcode and tempfile code:
-   (C) 2002-2003 Martin Pool <mbp at samba.org>
 
+    Copyright (C) 2002-2003 Martin Pool <mbp at samba.org>
+
 Copyright for environment, job and logging code:
-   (C) 2004 Stephan Kulow <coolo at suse.de>
 
+    Copyright (C) 2004 Stephan Kulow <coolo at suse.de>
+
 Copyright for remote, local, client, serve, main and workit code:
-   (C) 2004 Stephan Kulow <coolo at suse.de>
-   (C) 2002 2003 Martin Pool <mbp at samba.org>
 
+    Copyright (C) 2004 Stephan Kulow <coolo at suse.de>
+    Copyright (C) 2002 2003 Martin Pool <mbp at samba.org>
+
 workit code is based on gcc, (C) 1999-2002 Free Software Foundation, Inc.
 
 Copyright for load code:
-   (C) 1999-2000 Chris Schlaeger <cs at kde.org>
-   (C) 2003 Stephan Kulow <coolo at kde.org>
 
+    Copyright (C) 1999-2000 Chris Schlaeger <cs at kde.org>
+    Copyright (C) 2003 Stephan Kulow <coolo at kde.org>
+
 Copyright for comm and scheduler code:
-   (C) 2004 Michael Matz <matz at suse.de>
-   (C) 2004 Stephan Kulow <coolo at suse.de>
 
+    Copyright (C) 2004 Michael Matz <matz at suse.de>
+    Copyright (C) 2004 Stephan Kulow <coolo at suse.de>
+
 Copyright for getifaddrs code:
-   (C) 2002 Free Software Foundation, Inc.
-   (C) 2002 Tim Jansen <tim at tjansen.de>
 
+    Copyright (C) 2002 Free Software Foundation, Inc.
+    Copyright (C) 2002 Tim Jansen <tim at tjansen.de>
+
 Copyright for suse init script:
-   (C) 2003 SuSE Linux AG Nuernberg, Germany.
 
+    Copyright (C) 2003 SuSE Linux AG Nuernberg, Germany.
+
 Copyright for miniLZO code:
-   (C) 1996-2005 Markus F. X. J. Oberhumer <markus at oberhumer.com>
 
-Copyright for md5 code: (C) 1999 Aladdin Enterprises <ghost at aladin.com>
+    Copyright (C) 1996-2005 Markus F. X. J. Oberhumer <markus at oberhumer.com>
 
+Copyright for md5 code:
+
+    Copyright (C) 1999 Aladdin Enterprises <ghost at aladin.com>
+
 License for miniLZO:
 
  LZO and miniLZO are distributed under the terms of the GNU General
@@ -89,10 +102,16 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
 
-The icecc manpages is (C) 2006 Jonathan Riddell <jriddell at ubuntu.com> and
-is licensed under the GPL, see above.
+The icecc manpages is:
 
-The Debian packaging is (C) 2006, Fathi Boudra <fboudra at free.fr> and
-is licensed under the GPL, see above.
+    Copyright (C) 2006 Jonathan Riddell <jriddell at ubuntu.com>
+
+and is licensed under the GPL-2, see above.
+
+The Debian packaging is:
+
+    Copyright (C) 2006-2010 Fathi Boudra <fabo at debian.org>
+
+and is licensed under the GPL-2, see above.

Modified: kde-extras/icecream/trunk/debian/icecc.install
===================================================================
--- kde-extras/icecream/trunk/debian/icecc.install	2010-04-21 08:36:08 UTC (rev 17711)
+++ kde-extras/icecream/trunk/debian/icecc.install	2010-04-22 08:20:09 UTC (rev 17712)
@@ -1,5 +1,6 @@
 debian/icecc.conf etc/icecc/
 usr/bin/icecc
+usr/bin/icerun
 usr/lib/icecc/icecc-create-env
 usr/sbin/icecc-scheduler
 usr/sbin/iceccd

Modified: kde-extras/icecream/trunk/debian/man/icecc-create-env.xml
===================================================================
--- kde-extras/icecream/trunk/debian/man/icecc-create-env.xml	2010-04-21 08:36:08 UTC (rev 17711)
+++ kde-extras/icecream/trunk/debian/man/icecc-create-env.xml	2010-04-22 08:20:09 UTC (rev 17712)
@@ -37,7 +37,7 @@
       /usr/lib/icecc/icecc-create-env creates an archive file containing all the files necessary to setup the compiler environment. The file will have a random unique name like "ddaea39ca1a7c88522b185eca04da2d8.tar.bz2" per default. Rename it to something more expressive for your convenience, e.g. "i386-3.3.1.tar.bz2".
     </para>
     <para>
-Set ICECC_VERSION=&lt;filename_of_archive_containing_your_environment&gt; in the shell environment where you start the compile jobs and the file will be transfered to the daemons where your compile jobs run and installed to a chroot environment for executing the compile jobs in the environment fitting to the environment of the client. This requires that the icecream deamon runs as root.
+Set ICECC_VERSION=&lt;filename_of_archive_containing_your_environment&gt; in the shell environment where you start the compile jobs and the file will be transfered to the daemons where your compile jobs run and installed to a chroot environment for executing the compile jobs in the environment fitting to the environment of the client. This requires that the icecream daemon runs as root.
 
     </para>
 

Modified: kde-extras/icecream/trunk/debian/man/icecc-scheduler.xml
===================================================================
--- kde-extras/icecream/trunk/debian/man/icecc-scheduler.xml	2010-04-21 08:36:08 UTC (rev 17711)
+++ kde-extras/icecream/trunk/debian/man/icecc-scheduler.xml	2010-04-22 08:20:09 UTC (rev 17712)
@@ -37,7 +37,7 @@
       icecc-scheduler is the server which organises compiles on the icecream compile cluster.
     </para>
     <para>
-     WARNING: Never use icecream in untrusted environments. Run the deamons and the scheduler as unpriviliged user in such networks if you have to. Howeveryou will then have to rely on homogeneous networks.
+     WARNING: Never use icecream in untrusted environments. Run the daemons and the scheduler as unpriviliged user in such networks if you have to. Howeveryou will then have to rely on homogeneous networks.
     </para>
     <para>
      To run the scheduler make sure START_ICECC_SCHEDULER="true" is set in /etc/default/icecc and run sudo /etc/init.d/icecc start (it will also start at bootup).

Modified: kde-extras/icecream/trunk/debian/man/icecc.xml
===================================================================
--- kde-extras/icecream/trunk/debian/man/icecc.xml	2010-04-21 08:36:08 UTC (rev 17711)
+++ kde-extras/icecream/trunk/debian/man/icecc.xml	2010-04-22 08:20:09 UTC (rev 17712)
@@ -37,7 +37,7 @@
   <refsect1>
     <title>DESCRIPTION</title>
     <para>
-      icecc is used to compile your C/C++ programmes with icecream over an icecream cluster.
+      icecc is used to compile your C/C++ programs with icecream over an icecream cluster.
     </para>
     <para>
       You should not generally call icecc directly but make sure the gcc/g++ symlinks to it are in your path when compiling.

Modified: kde-extras/icecream/trunk/debian/patches/10_rename_scheduler.diff
===================================================================
--- kde-extras/icecream/trunk/debian/patches/10_rename_scheduler.diff	2010-04-21 08:36:08 UTC (rev 17711)
+++ kde-extras/icecream/trunk/debian/patches/10_rename_scheduler.diff	2010-04-22 08:20:09 UTC (rev 17712)
@@ -1,3 +1,5 @@
+Description: Rename scheduler binary to icecc-scheduler
+Author: Fathi Boudra <fabo at debian.org>
 --- a/services/Makefile.am
 +++ b/services/Makefile.am
 @@ -11,9 +11,9 @@ ice_HEADERS = job.h comm.h

Modified: kde-extras/icecream/trunk/debian/patches/20_fix_ftbfs_on_kfreebsd.diff
===================================================================
--- kde-extras/icecream/trunk/debian/patches/20_fix_ftbfs_on_kfreebsd.diff	2010-04-21 08:36:08 UTC (rev 17711)
+++ kde-extras/icecream/trunk/debian/patches/20_fix_ftbfs_on_kfreebsd.diff	2010-04-22 08:20:09 UTC (rev 17712)
@@ -1,4 +1,5 @@
-Fix FTBFS on GNU/kFreeBSD, thanks to Petr Salinger.
+Description: Fix FTBFS on GNU/kFreeBSD
+Author: Petr Salinger
 --- a/minilzo/lzodefs.h
 +++ b/minilzo/lzodefs.h
 @@ -356,7 +356,7 @@

Modified: kde-extras/icecream/trunk/debian/patches/series
===================================================================
--- kde-extras/icecream/trunk/debian/patches/series	2010-04-21 08:36:08 UTC (rev 17711)
+++ kde-extras/icecream/trunk/debian/patches/series	2010-04-22 08:20:09 UTC (rev 17712)
@@ -1,4 +1,2 @@
 10_rename_scheduler.diff
-# Disabled 12_fix_crosstool_distribution_bug494692.diff
-# Disabled 13_fix_nonblocking_sockets_for_icemon_bug503152.diff
 20_fix_ftbfs_on_kfreebsd.diff

Modified: kde-extras/icecream/trunk/debian/rules
===================================================================
--- kde-extras/icecream/trunk/debian/rules	2010-04-21 08:36:08 UTC (rev 17711)
+++ kde-extras/icecream/trunk/debian/rules	2010-04-22 08:20:09 UTC (rev 17712)
@@ -1,21 +1,16 @@
 #!/usr/bin/make -f
 
-include /usr/share/quilt/quilt.make
-
 %:
-	dh $@
+	dh $@ --parallel --list-missing
 
-build: $(QUILT_STAMPFN)
-	autoreconf -vfi
-
+override_dh_auto_configure:
+	autoreconf --verbose --force --install
+	dh_auto_configure
 	for i in debian/man/*.xml; do \
 		/usr/bin/docbook2x-man $$i; \
 	done
 
-clean: unpatch
-
 get-orig-source-dpatch:
 	@@dh_testdir
 	@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
 	@@dpatch-get-origtargz ../tarballs
-

Added: kde-extras/icecream/trunk/debian/source/format
===================================================================
--- kde-extras/icecream/trunk/debian/source/format	                        (rev 0)
+++ kde-extras/icecream/trunk/debian/source/format	2010-04-22 08:20:09 UTC (rev 17712)
@@ -0,0 +1 @@
+3.0 (quilt)

More information about the pkg-kde-commits mailing list