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

Mark Purcell msp at alioth.debian.org
Wed May 2 20:35:52 UTC 2007 

Author: msp
Date: 2007-05-02 20:35:51 +0000 (Wed, 02 May 2007)
New Revision: 6029

Added:
   kde-extras/icecream/trunk/debian/patches/Bug#41723-GCC4.3.diff
   kde-extras/icecream/trunk/debian/po/de.po
   kde-extras/icecream/trunk/debian/po/pt.po
Modified:
   kde-extras/icecream/trunk/debian/
   kde-extras/icecream/trunk/debian/changelog
   kde-extras/icecream/trunk/debian/rules
Log:
* Include gcc4.3 patch from Martin. (Closes: #417230)
* Add get-orig-source: target
* Add debcon translations
  - [INTL:de] initial German debconf translation (Closes: #413407)
  - [INTL:pt] Portuguese translation for debconf messages
  (Closes: #414917)


Property changes on: kde-extras/icecream/trunk/debian
___________________________________________________________________
Name: mergeWithUpstream
   + 1

Modified: kde-extras/icecream/trunk/debian/changelog
===================================================================
--- kde-extras/icecream/trunk/debian/changelog	2007-05-02 18:09:48 UTC (rev 6028)
+++ kde-extras/icecream/trunk/debian/changelog	2007-05-02 20:35:51 UTC (rev 6029)
@@ -1,3 +1,14 @@
+icecc (0.7.14-5) unstable; urgency=low
+
+  * Include gcc4.3 patch from Martin. (Closes: #417230)
+  * Add get-orig-source: target
+  * Add debcon translations
+    - [INTL:de] initial German debconf translation (Closes: #413407)
+    - [INTL:pt] Portuguese translation for debconf messages
+    (Closes: #414917)
+
+ -- Mark Purcell <msp at debian.org>  Wed, 02 May 2007 21:35:37 +0100
+
 icecc (0.7.14-4) unstable; urgency=low
 
   * Add czech and french debconf templates translations

Added: kde-extras/icecream/trunk/debian/patches/Bug#41723-GCC4.3.diff
===================================================================
--- kde-extras/icecream/trunk/debian/patches/Bug#41723-GCC4.3.diff	2007-05-02 18:09:48 UTC (rev 6028)
+++ kde-extras/icecream/trunk/debian/patches/Bug#41723-GCC4.3.diff	2007-05-02 20:35:51 UTC (rev 6029)
@@ -0,0 +1,156 @@
+From tbm at cyrius.com Mon Apr  2 07:14:50 2007
+Return-path: <pkg-kde-extras-bounces+msp=debian.org at lists.alioth.debian.org>
+Envelope-to: debian at purcell.id.au
+Delivery-date: Sun, 01 Apr 2007 22:20:28 +0100
+Received: from master.debian.org ([70.103.162.29])
+	by bristol.purcell.id.au with esmtp (Exim 4.63)
+	(envelope-from <pkg-kde-extras-bounces+msp=debian.org at lists.alioth.debian.org>)
+	id 1HY7T6-00017G-8K
+	for debian at purcell.id.au; Sun, 01 Apr 2007 22:20:28 +0100
+Received: from alioth.debian.org ([217.196.43.134])
+	by master.debian.org with esmtp (Exim 4.50)
+	id 1HY7Sf-0000Vc-TI
+	for debian at purcell.id.au; Sun, 01 Apr 2007 21:19:42 +0000
+Received: from localhost ([127.0.0.1] helo=alioth.debian.org)
+	by alioth.debian.org with esmtp (Exim 4.50)
+	id 1HY7ST-0005oq-2C
+	for msp at debian.org; Sun, 01 Apr 2007 21:19:29 +0000
+Received: from rietz.debian.org ([140.211.166.43])
+	by alioth.debian.org with esmtp (Exim 4.50) id 1HY7SM-0005oe-1T
+	for pkg-kde-extras at lists.alioth.debian.org;
+	Sun, 01 Apr 2007 21:19:27 +0000
+Received: from debbugs by rietz.debian.org with local (Exim 4.50)
+	id 1HY7R7-0008VA-ED; Sun, 01 Apr 2007 21:18:05 +0000
+X-Loop: owner at bugs.debian.org
+Resent-From: Martin Michlmayr <tbm at cyrius.com>
+Resent-To: debian-bugs-dist at lists.debian.org
+Resent-CC: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
+Resent-Date: Sun, 01 Apr 2007 21:18:02 +0000
+Resent-Message-ID: <handler.417230.B.117546210728144 at bugs.debian.org>
+X-Debian-PR-Message: report 417230
+X-Debian-PR-Package: icecc
+X-Debian-PR-Keywords: patch
+X-Debian-PR-Source: icecc
+Received: via spool by submit at bugs.debian.org id=B.117546210728144
+	(code B ref -1); Sun, 01 Apr 2007 21:18:02 +0000
+Received: (at submit) by bugs.debian.org; 1 Apr 2007 21:15:07 +0000
+Received: from sorrow.cyrius.com ([65.19.161.204])
+	by rietz.debian.org with esmtp (Exim 4.50) id 1HY7OE-0007IP-6E
+	for submit at bugs.debian.org; Sun, 01 Apr 2007 21:15:07 +0000
+Received: by sorrow.cyrius.com (Postfix, from userid 10)
+	id 6469464D3D; Sun,  1 Apr 2007 21:15:05 +0000 (UTC)
+Received: by deprecation.cyrius.com (Postfix, from userid 1000)
+	id 2757754373; Sun,  1 Apr 2007 22:14:50 +0100 (BST)
+Date: Sun, 1 Apr 2007 22:14:50 +0100
+From: Martin Michlmayr <tbm at cyrius.com>
+To: submit at bugs.debian.org
+Message-ID: <20070401211449.GM29178 at deprecation.cyrius.com>
+References: <E1HWMh0-0001Vw-50 at coconut0>
+MIME-Version: 1.0
+Content-Type: text/plain;
+  charset=us-ascii
+Content-Disposition: inline
+In-Reply-To: <E1HWMh0-0001Vw-50 at coconut0>
+User-Agent: Mutt/1.5.13 (2006-08-11)
+Delivered-To: submit at bugs.debian.org
+Resent-Sender: Debian BTS <debbugs at bugs.debian.org>
+Resent-Date: Sun, 01 Apr 2007 21:18:05 +0000
+X-BeenThere: pkg-kde-extras at lists.alioth.debian.org
+X-Mailman-Version: 2.1.5
+Precedence: list
+Reply-To: Martin Michlmayr <tbm at cyrius.com>,
+ 417230 at bugs.debian.org
+List-Id: "List for the maintainers of stuff under pkd-kde/kde-extras."
+	<pkg-kde-extras.lists.alioth.debian.org>
+List-Unsubscribe: <http://lists.alioth.debian.org/mailman/listinfo/pkg-kde-extras>,
+	<mailto:pkg-kde-extras-request at lists.alioth.debian.org?subject=unsubscribe>
+List-Archive: <http://lists.alioth.debian.org/pipermail/pkg-kde-extras>
+List-Post: <mailto:pkg-kde-extras at lists.alioth.debian.org>
+List-Help: <mailto:pkg-kde-extras-request at lists.alioth.debian.org?subject=help>
+List-Subscribe: <http://lists.alioth.debian.org/mailman/listinfo/pkg-kde-extras>,
+	<mailto:pkg-kde-extras-request at lists.alioth.debian.org?subject=subscribe>
+Sender: pkg-kde-extras-bounces+msp=debian.org at lists.alioth.debian.org
+Errors-To: pkg-kde-extras-bounces+msp=debian.org at lists.alioth.debian.org
+X-SA-Exim-Connect-IP: 70.103.162.29
+X-SA-Exim-Rcpt-To: debian at purcell.id.au
+X-SA-Exim-Mail-From: pkg-kde-extras-bounces+msp=debian.org at lists.alioth.debian.org
+X-Spam-Checker-Version: SpamAssassin 3.1.7-deb (2006-10-05) on debian
+X-Spam-Level: 
+X-Spam-Status: No, score=-2.6 required=1.0 tests=AWL,BAYES_00,
+	UNPARSEABLE_RELAY autolearn=ham version=3.1.7-deb
+X-Spam-Report: 
+	*  0.0 UNPARSEABLE_RELAY Informational: message has unparseable relay
+	*      lines
+	* -2.6 BAYES_00 BODY: Bayesian spam probability is 0 to 1%
+	*      [score: 0.0000]
+	* -0.0 AWL AWL: From: address is in the auto white-list
+Subject: [Pkg-kde-extras] Bug#417230: FTBFS with GCC 4.3: missing #includes
+X-SA-Exim-Version: 4.2.1 (built Tue, 09 Jan 2007 17:23:22 +0000)
+X-SA-Exim-Scanned: Yes (on bristol.purcell.id.au)
+X-Length: 7506
+X-KMail-EncryptionState:  
+X-KMail-SignatureState:  
+X-KMail-MDN-Sent:  
+X-UID: 2340
+Status: R
+X-Status: NC
+
+Package: icecc
+Version: 0.7.14-4
+Usertags: ftbfs-gcc-4.3
+Tags: patch
+
+Your package fails to build with GCC 4.3.  Version 4.3 has not been
+released yet but I'm building with a snapshot in order to find errors
+and give people an advance warning.  In GCC 4.3, the C++ header
+dependencies have been cleaned up.  The advantage of this is that
+programs will compile faster.  The downside is that you actually
+need to directly #include everything you use (but you really should
+do this anyway, otherwise your program won't work with any compiler
+other than GCC).  Some background of this can be found at
+http://gcc.gnu.org/PR28080
+
+You can reproduce this problem with gcc-snapshot from unstable.
+
+
+> Automatic build of icecc_0.7.14-4 on coconut0 by sbuild/ia64 0.49
+...
+>  g++ -DHAVE_CONFIG_H -I. -I. -I.. -I./../minilzo -fPIC -DPIC -W -Wall -Wimplicit -Wpointer-arith -Wcast-align -Wwrite-strings -g -Wall -O2 -c job.cpp -o libicecc_la-job.o
+> In file included from job.cpp:22:
+> logging.h:85: error: 'uint' does not name a type
+> logging.h: In constructor 'log_block::log_block(const char*)':
+> logging.h:92: error: 'nesting' was not declared in this scope
+> logging.h:98: error: 'nesting' was not declared in this scope
+> logging.h: In destructor 'log_block::~log_block()':
+> logging.h:109: error: 'nesting' was not declared in this scope
+> logging.h:115: error: 'free' was not declared in this scope
+^^^^^^^^^^^^^^^^^^^
+> /usr/lib/gcc-snapshot/lib/gcc/ia64-linux-gnu/4.3.0/../../../../include/c++/4.3.0/bits/basic_string.h: In member function 'std::basic_string<_CharT, _Traits, _Alloc>::_Rep* std::basic_string<_CharT, _Traits, _Alloc>::_M_rep() const [with _CharT = char, _Traits = std::char_traits<char>, _Alloc = std::allocator<char>]':
+> /usr/lib/gcc-snapshot/lib/gcc/ia64-linux-gnu/4.3.0/../../../../include/c++/4.3.0/bits/basic_string.h:496:   instantiated from 'std::basic_string<_CharT, _Traits, _Alloc>::~basic_string() [with _CharT = char, _Traits = std::char_traits<char>, _Alloc = std::allocator<char>]'
+> job.h:32:   instantiated from here
+> /usr/lib/gcc-snapshot/lib/gcc/ia64-linux-gnu/4.3.0/../../../../include/c++/4.3.0/bits/basic_string.h:288: warning: cast from 'char*' to 'std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_Rep*' increases required alignment of target type
+> make[3]: *** [libicecc_la-job.lo] Error 1
+> make[3]: Leaving directory `/build/tbm/icecc-0.7.14/services'
+
+
+--- services/logging.h~	2007-04-01 21:06:21.000000000 +0000
++++ services/logging.h	2007-04-01 21:06:28.000000000 +0000
+@@ -21,6 +21,7 @@
+ #ifndef _LOGGING_H
+ #define _LOGGING_H
+ 
++#include <cstdlib>
+ #include <sys/time.h>
+ #include <errno.h>
+ #include <string>
+
+-- 
+Martin Michlmayr
+http://www.cyrius.com/
+
+
+_______________________________________________
+pkg-kde-extras mailing list
+pkg-kde-extras at lists.alioth.debian.org
+http://lists.alioth.debian.org/mailman/listinfo/pkg-kde-extras
+

Added: kde-extras/icecream/trunk/debian/po/de.po
===================================================================
--- kde-extras/icecream/trunk/debian/po/de.po	2007-05-02 18:09:48 UTC (rev 6028)
+++ kde-extras/icecream/trunk/debian/po/de.po	2007-05-02 20:35:51 UTC (rev 6029)
@@ -0,0 +1,70 @@
+# Translation of icecc debconf templates to German
+# Copyright (C) Helge Kreutzmann <debian at helgefjell.de>, 2007.
+# This file is distributed under the same license as the icecc package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: icecc 0.7.14-4\n"
+"Report-Msgid-Bugs-To: pkg-kde-extras at lists.alioth.debian.org\n"
+"POT-Creation-Date: 2006-09-17 00:40+0200\n"
+"PO-Revision-Date: 2007-03-04 20:52+0100\n"
+"Last-Translator: Helge Kreutzmann <debian at helgefjell.de>\n"
+"Language-Team: German <debian-l10n-german at lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../icecc.templates:1001
+msgid "Start the icecc daemon on startup?"
+msgstr "Den Icecc-Daemon beim Systemstart starten?"
+
+#. Type: boolean
+#. Description
+#: ../icecc.templates:1001
+msgid "icecc can be run as a daemon, listening for incoming connections."
+msgstr "Icecc kann als Daemon laufen und auf eingehende Verbindungen warten."
+
+#. Type: boolean
+#. Description
+#: ../icecc.templates:1001
+msgid ""
+"You have the option of starting the icecc daemon automatically on the "
+"computer startup. You need a running daemon on every computer which should "
+"be part of the compile farm. If you later change your mind, you can run:  "
+"'dpkg-reconfigure icecc'."
+msgstr ""
+"Sie haben die Möglichkeit, den Icecc-Daemon automatisch beim Hochfahren des "
+"Rechners zu starten. Sie benötigen einen laufenden Daemon auf jedem Computer, "
+"der Teil der Compile-Farm sein soll. Falls Sie später Ihre Meinung ändern, "
+"können Sie »dpkg-reconfigure icecc« ausführen."
+
+#. Type: boolean
+#. Description
+#: ../icecc.templates:2001
+msgid "Start the icecc scheduler on startup?"
+msgstr "Das Icecc-Planprogramm (Scheduler) beim Systemstart starten?"
+
+#. Type: boolean
+#. Description
+#: ../icecc.templates:2001
+msgid ""
+"The scheduler can be run as a daemon, listening for incoming connections."
+msgstr ""
+"Das Planprogramm kann als Daemon laufen und auf eingehende Verbindungen "
+"warten."
+
+#. Type: boolean
+#. Description
+#: ../icecc.templates:2001
+msgid ""
+"You have the option of starting the icecc scheduler automatically on the "
+"computer startup. You need one scheduler in your compile farm. If in doubt,  "
+"you should not start it automatically on startup. If you later change your "
+"mind, you can run: 'dpkg-reconfigure icecc'."
+msgstr ""
+"Sie haben die Möglichkeit, das Planprogramm automatisch beim Systemstart zu "
+"starten. Sie benötigen ein Planprogramm in Ihrer Compile-Farm. Im Zweifel "
+"sollten Sie es nicht automatisch beim Systemstart starten. Falls Sie später "
+"Ihre Meinung ändern, führen Sie »dpkg-reconfigure icecc« aus."

Added: kde-extras/icecream/trunk/debian/po/pt.po
===================================================================
--- kde-extras/icecream/trunk/debian/po/pt.po	2007-05-02 18:09:48 UTC (rev 6028)
+++ kde-extras/icecream/trunk/debian/po/pt.po	2007-05-02 20:35:51 UTC (rev 6029)
@@ -0,0 +1,74 @@
+# Portuguese translation of icecc's debconf messages.
+# Copyright (C) 2007
+# This file is distributed under the same license as the icecc package.
+# Luísa Lourenço <kikentai at gmail.com>, 2007.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: icecc 0.7.14-4\n"
+"Report-Msgid-Bugs-To: pkg-kde-extras at lists.alioth.debian.org\n"
+"POT-Creation-Date: 2006-09-17 00:40+0200\n"
+"PO-Revision-Date: 2007-03-14 11:40+0000\n"
+"Last-Translator: Luísa Lourenço <kikentai at gmail.com>\n"
+"Language-Team: Portuguese <traduz at debianpt.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../icecc.templates:1001
+msgid "Start the icecc daemon on startup?"
+msgstr "Iniciar o daemon icecc no arranque?"
+
+#. Type: boolean
+#. Description
+#, fuzzy
+#: ../icecc.templates:1001
+msgid "icecc can be run as a daemon, listening for incoming connections."
+msgstr "icecc pode ser iniciado como um daemon, à espera de conexões de entrada."
+
+#. Type: boolean
+#. Description
+#: ../icecc.templates:1001
+#, fuzzy
+msgid ""
+"You have the option of starting the icecc daemon automatically on the "
+"computer startup. You need a running daemon on every computer which should "
+"be part of the compile farm. If you later change your mind, you can run:  "
+"'dpkg-reconfigure icecc'."
+msgstr ""
+"Tem a opção de iniciar o daemon icecc automaticamente no arranque do "
+"computador. Precisa de um daemon a correr em todos os computadores que devam "
+"fazer parte da compile farm. Se mais tarde mudar de ideias, pode correr: "
+"'dpkg-reconfigure icecc'."
+
+#. Type: boolean
+#. Description
+#: ../icecc.templates:2001
+msgid "Start the icecc scheduler on startup?"
+msgstr "Iniciar o escalonador do icecc no arranque?"
+
+#. Type: boolean
+#. Description
+#: ../icecc.templates:2001
+#, fuzzy
+msgid ""
+"The scheduler can be run as a daemon, listening for incoming connections."
+msgstr ""
+"O escalonador pode ser corrido como um daemon, à espera de conexões de entrada."
+
+#. Type: boolean
+#. Description
+#: ../icecc.templates:2001
+#, fuzzy
+msgid ""
+"You have the option of starting the icecc scheduler automatically on the "
+"computer startup. You need one scheduler in your compile farm. If in doubt, "
+"you should not start it automatically on startup. If you later change your "
+"mind, you can run: 'dpkg-reconfigure icecc'."
+msgstr ""
+"Tem a opção de iniciar o escalonador do icecc automaticamente no "
+"arranque do computador. Precisa de um escalonador na sua compile farm. Em "
+"caso de dúvida, não o deve começar automaticamente no arranque. Se mais tarde "
+"mudar de ideias, pode correr: 'dpkg-reconfigure icecc'."

Modified: kde-extras/icecream/trunk/debian/rules
===================================================================
--- kde-extras/icecream/trunk/debian/rules	2007-05-02 18:09:48 UTC (rev 6028)
+++ kde-extras/icecream/trunk/debian/rules	2007-05-02 20:35:51 UTC (rev 6029)
@@ -21,3 +21,7 @@
 clean::
 	rm -f *.1
 
+get-orig-source:
+	@@dh_testdir
+	@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
+	@@dpatch-get-origtargz ../tarballs

More information about the pkg-kde-commits mailing list