Attached if the patch for the 0.2-4.1 patch.

-- 


diff -Nru colormake-0.2.ori/debian/changelog colormake-0.2/debian/changelog
--- colormake-0.2.ori/debian/changelog  2006-10-05 21:55:13.542190456 +0200
+++ colormake-0.2/debian/changelog      2006-10-05 22:01:54.673144115 +0200
@@ -1,3 +1,15 @@
+colormake (0.2-4.1) unstable; urgency=low
+
+  * Non-maintainer upload to fix longstanding l10n issues
+  * Remove the note template which deals with the upgrade from a
+    pre-sarge version. Closes: #388875
+    This also closes all l10n bug reports.
+    Closes: #297595, #331310, #338730, #282149
+  * Fix typos in manpages. Thanks to Nicolas François for the patch
+    Closes: #350803
+
+ -- Christian Perrier <[EMAIL PROTECTED]>  Thu,  5 Oct 2006 21:59:08 +0200
+
 colormake (0.2-4) unstable; urgency=low
 
   * Actually return the make exit value, not display it. Closes: #171318.
diff -Nru colormake-0.2.ori/debian/clmake.1 colormake-0.2/debian/clmake.1
--- colormake-0.2.ori/debian/clmake.1   2006-10-05 21:55:13.538190426 +0200
+++ colormake-0.2/debian/clmake.1       2006-10-05 22:02:56.457605042 +0200
@@ -2,7 +2,7 @@
 .SH NAME
 clmake \- color wrapper for make(1) and less(1)
 .SH SYNOPSIS
-\fBclmake\R [ \fB-f makefile\fR ] [ option ] ...  target ...
+\fBclmake\fR [ \fB-f makefile\fR ] [ option ] ...  target ...
 .SH DESCRIPTION
 clmake acts as a wrapper around make(1) to ease reading the output by
 colorizing it. It also pipes the output to the \fBless\fR(1) text
@@ -24,4 +24,4 @@
 This manual page was written by Joe Wreschnig <[EMAIL PROTECTED]>, for the
 Debian GNU/Linux system (but may be used by others).
 .SH SEE ALSO
-\fBmake\fR\|(1), \fBcmake\fR\|(1), \fBless\fR\|(1)
+\fBmake\fR\|(1), \fBcolormake\fR\|(1), \fBless\fR\|(1)
diff -Nru colormake-0.2.ori/debian/colormake.1 colormake-0.2/debian/colormake.1
--- colormake-0.2.ori/debian/colormake.1        2006-10-05 21:55:13.542190456 
+0200
+++ colormake-0.2/debian/colormake.1    2006-10-05 22:03:01.609643544 +0200
@@ -2,7 +2,7 @@
 .SH NAME
 colormake \- color wrapper for make(1)
 .SH SYNOPSIS
-\fBcolormake\R [ \fB-f makefile\fR ] [ option ] ...  target ...
+\fBcolormake\fR [ \fB-f makefile\fR ] [ option ] ...  target ...
 .SH DESCRIPTION
 colormake acts as a wrapper around make(1) to ease reading the output by
 colorizing it.
diff -Nru colormake-0.2.ori/debian/colormake.pl.1 
colormake-0.2/debian/colormake.pl.1
--- colormake-0.2.ori/debian/colormake.pl.1     2006-10-05 21:55:13.538190426 
+0200
+++ colormake-0.2/debian/colormake.pl.1 2006-10-05 22:03:05.225670573 +0200
@@ -19,7 +19,7 @@
 .BR make (1),
 .BR colormake (1).
 .SH AUTHOR
-This manual page was written by Cl�ment Stenac <[EMAIL PROTECTED]>,
+This manual page was written by Cl\['e]ment Stenac <[EMAIL PROTECTED]>,
 for the Debian GNU/Linux project (but may be used by others).
 .PP
 Colormake was written by Bjarni R. Einarsson
diff -Nru colormake-0.2.ori/debian/config colormake-0.2/debian/config
--- colormake-0.2.ori/debian/config     2006-10-05 21:55:13.542190456 +0200
+++ colormake-0.2/debian/config 1970-01-01 01:00:00.000000000 +0100
@@ -1,14 +0,0 @@
-#! /bin/sh
-
-. /usr/share/debconf/confmodule || exit 0
-
-db_version 2.0
-db_capb
-db_title colormake
-
-if dpkg --compare-versions "$2" ge-nl "0.2-3"; then
-       db_fset colormake/renamed seen true 
-fi
-
-db_input low colormake/renamed
-db_go
diff -Nru colormake-0.2.ori/debian/control colormake-0.2/debian/control
--- colormake-0.2.ori/debian/control    2006-10-05 21:55:13.538190426 +0200
+++ colormake-0.2/debian/control        2006-10-05 21:59:01.963863823 +0200
@@ -3,7 +3,6 @@
 Priority: optional
 Maintainer: Roland Bauerschmidt <[EMAIL PROTECTED]>
 Standards-Version: 3.6.1
-Build-Depends-Indep: po-debconf
 
 Package: colormake
 Architecture: all
diff -Nru colormake-0.2.ori/debian/po/da.po colormake-0.2/debian/po/da.po
--- colormake-0.2.ori/debian/po/da.po   2006-10-05 21:55:13.026186703 +0200
+++ colormake-0.2/debian/po/da.po       1970-01-01 01:00:00.000000000 +0100
@@ -1,39 +0,0 @@
-#
-#    Translators, if you are not familiar with the PO format, gettext
-#    documentation is worth reading, especially sections dedicated to
-#    this format, e.g. by running:
-#         info -n '(gettext)PO Files'
-#         info -n '(gettext)Header Entry'
-#
-#    Some information specific to po-debconf are available at
-#            /usr/share/doc/po-debconf/README-trans
-#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
-#
-#    Developers do not need to manually edit POT or PO files.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: colormake 0.2-3.1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-08-13 08:08+0200\n"
-"PO-Revision-Date: 2004-06-08 01:06+0200\n"
-"Last-Translator: Michael Kristensen <[EMAIL PROTECTED]>\n"
-"Language-Team: Danish <[EMAIL PROTECTED]>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Description
-#: ../templates:3
-msgid "/usr/bin/cmake was renamed to /usr/bin/colormake"
-msgstr "/usr/bin/cmake er blevet omdøbt til /usr/bin/colormake"
-
-#. Description
-#: ../templates:3
-msgid ""
-"Due to a name clash with the cmake package renaming /usr/bin/cmake was "
-"necessary."
-msgstr ""
-"På grund af problemer med ens filnavne med pakken 'cmake' var omdøbelsen "
-"af /usr/bin/cmake nødvendig."
diff -Nru colormake-0.2.ori/debian/po/de.po colormake-0.2/debian/po/de.po
--- colormake-0.2.ori/debian/po/de.po   2006-10-05 21:55:13.026186703 +0200
+++ colormake-0.2/debian/po/de.po       1970-01-01 01:00:00.000000000 +0100
@@ -1,39 +0,0 @@
-#
-#    Translators, if you are not familiar with the PO format, gettext
-#    documentation is worth reading, especially sections dedicated to
-#    this format, e.g. by running:
-#         info -n '(gettext)PO Files'
-#         info -n '(gettext)Header Entry'
-#
-#    Some information specific to po-debconf are available at
-#            /usr/share/doc/po-debconf/README-trans
-#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
-#
-#    Developers do not need to manually edit POT or PO files.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-08-13 08:08+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Sebastian Feltel <[EMAIL PROTECTED]>\n"
-"Language-Team: LANGUAGE <[EMAIL PROTECTED]>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-15\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Description
-#: ../templates:3
-msgid "/usr/bin/cmake was renamed to /usr/bin/colormake"
-msgstr "/usr/bin/cmake wurde zu /usr/bin/colormake umbenannt"
-
-#. Description
-#: ../templates:3
-msgid ""
-"Due to a name clash with the cmake package renaming /usr/bin/cmake was "
-"necessary."
-msgstr ""
-"Aufgrund eines Namenskonfliktes mit dem cmake Paket wurde die Umbenennung "
-"von /usr/bin/cmake notwendig."
diff -Nru colormake-0.2.ori/debian/po/es.po colormake-0.2/debian/po/es.po
--- colormake-0.2.ori/debian/po/es.po   2006-10-05 21:55:13.026186703 +0200
+++ colormake-0.2/debian/po/es.po       1970-01-01 01:00:00.000000000 +0100
@@ -1,39 +0,0 @@
-#
-#    Translators, if you are not familiar with the PO format, gettext
-#    documentation is worth reading, especially sections dedicated to
-#    this format, e.g. by running:
-#         info -n '(gettext)PO Files'
-#         info -n '(gettext)Header Entry'
-#
-#    Some information specific to po-debconf are available at
-#            /usr/share/doc/po-debconf/README-trans
-#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
-#
-#    Developers do not need to manually edit POT or PO files.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-08-13 08:08+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Carlos Valdivia Yag�e <[EMAIL PROTECTED]>\n"
-"Language-Team: LANGUAGE <[EMAIL PROTECTED]>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-15\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Description
-#: ../templates:3
-msgid "/usr/bin/cmake was renamed to /usr/bin/colormake"
-msgstr "/usr/bin/cmake ahora se llama /usr/bin/colormake"
-
-#. Description
-#: ../templates:3
-msgid ""
-"Due to a name clash with the cmake package renaming /usr/bin/cmake was "
-"necessary."
-msgstr ""
-"Debido a una colisi�n con el paquete cmake, ha habido que renombrar /usr/bin/"
-"cmake."
diff -Nru colormake-0.2.ori/debian/po/fr.po colormake-0.2/debian/po/fr.po
--- colormake-0.2.ori/debian/po/fr.po   2006-10-05 21:55:13.534190397 +0200
+++ colormake-0.2/debian/po/fr.po       1970-01-01 01:00:00.000000000 +0100
@@ -1,37 +0,0 @@
-#
-#    Translators, if you are not familiar with the PO format, gettext
-#    documentation is worth reading, especially sections dedicated to
-#    this format, e.g. by running:
-#         info -n '(gettext)PO Files'
-#         info -n '(gettext)Header Entry'
-#
-#    Some information specific to po-debconf are available at
-#            /usr/share/doc/po-debconf/README-trans
-#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
-#
-#    Developers do not need to manually edit POT or PO files.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: colormake (0.2-3)\n"
-"POT-Creation-Date: 2003-08-13 08:08+0200\n"
-"PO-Revision-Date: 2003-08-13 08:10+0100\n"
-"Last-Translator: Christian Perrier <[EMAIL PROTECTED]>\n"
-"Language-Team: French <[email protected]>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-15\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Description
-#: ../templates:3
-msgid "/usr/bin/cmake was renamed to /usr/bin/colormake"
-msgstr "/usr/bin/cmake a �t� renomm� en /usr/bin/colormake"
-
-#. Description
-#: ../templates:3
-msgid ""
-"Due to a name clash with the cmake package renaming /usr/bin/cmake was "
-"necessary."
-msgstr ""
-"� cause d'un conflit de nom avec le paquet cmake, il a �t� n�cessaire de "
-"renommer le programme /usr/bin/cmake."
diff -Nru colormake-0.2.ori/debian/po/ja.po colormake-0.2/debian/po/ja.po
--- colormake-0.2.ori/debian/po/ja.po   2006-10-05 21:55:13.538190426 +0200
+++ colormake-0.2/debian/po/ja.po       1970-01-01 01:00:00.000000000 +0100
@@ -1,37 +0,0 @@
-#
-#    Translators, if you are not familiar with the PO format, gettext
-#    documentation is worth reading, especially sections dedicated to
-#    this format, e.g. by running:
-#         info -n '(gettext)PO Files'
-#         info -n '(gettext)Header Entry'
-#
-#    Some information specific to po-debconf are available at
-#            /usr/share/doc/po-debconf/README-trans
-#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
-#
-#    Developers do not need to manually edit POT or PO files.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-08-13 08:08+0200\n"
-"PO-Revision-Date: 2004-01-04 16:02+0900\n"
-"Last-Translator: Hideki Yamane <[EMAIL PROTECTED]>\n"
-"Language-Team: Japanese <[email protected]>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=EUC-JP\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Description
-#: ../templates:3
-msgid "/usr/bin/cmake was renamed to /usr/bin/colormake"
-msgstr "/usr/bin/cmake �� /usr/bin/colormake �إ��͡��व���ޤ���"
-
-#. Description
-#: ../templates:3
-msgid ""
-"Due to a name clash with the cmake package renaming /usr/bin/cmake was "
-"necessary."
-msgstr "cmake �ѥå�������̾�������ͤ����Τǡ�/usr/bin/cmake �Υ��͡��बɬ�פˤʤ��ޤ�����"
diff -Nru colormake-0.2.ori/debian/po/nl.po colormake-0.2/debian/po/nl.po
--- colormake-0.2.ori/debian/po/nl.po   2006-10-05 21:55:13.538190426 +0200
+++ colormake-0.2/debian/po/nl.po       1970-01-01 01:00:00.000000000 +0100
@@ -1,34 +0,0 @@
-#
-#    Translators, if you are not familiar with the PO format, gettext
-#    documentation is worth reading, especially sections dedicated to
-#    this format, e.g. by running:
-#         info -n '(gettext)PO Files'
-#         info -n '(gettext)Header Entry'
-#
-#    Some information specific to po-debconf are available at
-#            /usr/share/doc/po-debconf/README-trans
-#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
-#
-#    Developers do not need to manually edit POT or PO files.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: colormake 0.2-3.1\n"
-"POT-Creation-Date: 2003-08-13 08:08+0200\n"
-"PO-Revision-Date: 2004-03-26 16:41+0100\n"
-"Last-Translator: Luk Claes <[EMAIL PROTECTED]>\n"
-"Language-Team: Debian l10n Dutch <[email protected]>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Description
-#: ../templates:3
-msgid "/usr/bin/cmake was renamed to /usr/bin/colormake"
-msgstr "/usr/bin/cmake is hernoemd naar /usr/bin/colormake"
-
-#. Description
-#: ../templates:3
-msgid "Due to a name clash with the cmake package renaming /usr/bin/cmake was 
necessary."
-msgstr "Door een naamconflict met het cmake-pakket was het hernoemen van 
/usr/bin/cmake noodzakelijk."
-
diff -Nru colormake-0.2.ori/debian/po/POTFILES.in 
colormake-0.2/debian/po/POTFILES.in
--- colormake-0.2.ori/debian/po/POTFILES.in     2006-10-05 21:55:13.538190426 
+0200
+++ colormake-0.2/debian/po/POTFILES.in 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-[type: gettext/rfc822deb] templates
diff -Nru colormake-0.2.ori/debian/po/ru.po colormake-0.2/debian/po/ru.po
--- colormake-0.2.ori/debian/po/ru.po   2006-10-05 21:55:13.538190426 +0200
+++ colormake-0.2/debian/po/ru.po       1970-01-01 01:00:00.000000000 +0100
@@ -1,39 +0,0 @@
-#
-#    Translators, if you are not familiar with the PO format, gettext
-#    documentation is worth reading, especially sections dedicated to
-#    this format, e.g. by running:
-#         info -n '(gettext)PO Files'
-#         info -n '(gettext)Header Entry'
-#
-#    Some information specific to po-debconf are available at
-#            /usr/share/doc/po-debconf/README-trans
-#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
-#
-#    Developers do not need to manually edit POT or PO files.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-08-13 08:08+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: [EMAIL PROTECTED] (Ilgiz Kalmetev)n"
-"Language-Team: LANGUAGE <[EMAIL PROTECTED]>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=KOI8-R\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Description
-#: ../templates:3
-msgid "/usr/bin/cmake was renamed to /usr/bin/colormake"
-msgstr "/usr/bin/cmake ��� ������������ � /usr/bin/colormake"
-
-#. Description
-#: ../templates:3
-msgid ""
-"Due to a name clash with the cmake package renaming /usr/bin/cmake was "
-"necessary."
-msgstr ""
-"��-��  �����������  ���� � ������� cmake ���� ���������� ������������� /usr/"
-"bin/cmake."
diff -Nru colormake-0.2.ori/debian/po/templates.pot 
colormake-0.2/debian/po/templates.pot
--- colormake-0.2.ori/debian/po/templates.pot   2006-10-05 21:55:13.026186703 
+0200
+++ colormake-0.2/debian/po/templates.pot       1970-01-01 01:00:00.000000000 
+0100
@@ -1,37 +0,0 @@
-#
-#    Translators, if you are not familiar with the PO format, gettext
-#    documentation is worth reading, especially sections dedicated to
-#    this format, e.g. by running:
-#         info -n '(gettext)PO Files'
-#         info -n '(gettext)Header Entry'
-#
-#    Some information specific to po-debconf are available at
-#            /usr/share/doc/po-debconf/README-trans
-#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
-#
-#    Developers do not need to manually edit POT or PO files.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-08-13 08:08+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <[EMAIL PROTECTED]>\n"
-"Language-Team: LANGUAGE <[EMAIL PROTECTED]>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Description
-#: ../templates:3
-msgid "/usr/bin/cmake was renamed to /usr/bin/colormake"
-msgstr ""
-
-#. Description
-#: ../templates:3
-msgid ""
-"Due to a name clash with the cmake package renaming /usr/bin/cmake was "
-"necessary."
-msgstr ""
diff -Nru colormake-0.2.ori/debian/po/vi.po colormake-0.2/debian/po/vi.po
--- colormake-0.2.ori/debian/po/vi.po   2006-10-05 21:55:13.538190426 +0200
+++ colormake-0.2/debian/po/vi.po       1970-01-01 01:00:00.000000000 +0100
@@ -1,28 +0,0 @@
-# Vietnamese Translation for colormake.
-# Copyright © 2005 Free Software Foundation, Inc.
-# Clytie Siddall <[EMAIL PROTECTED]>, 2005.
-# 
-msgid ""
-msgstr ""
-"Project-Id-Version: colormake 0.2-3.2\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-08-13 08:08+0200\n"
-"PO-Revision-Date: 2005-05-21 17:03+0930\n"
-"Last-Translator: Clytie Siddall <[EMAIL PROTECTED]>\n"
-"Language-Team: Vietnamese <[EMAIL PROTECTED]>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
-
-#.Description
-#:../templates:3
-msgid "/usr/bin/cmake was renamed to /usr/bin/colormake"
-msgstr "Mới thay đổi tên của /usr/bin/cmake thành /usr/bin/colormake"
-
-#.Description
-#:../templates:3
-msgid ""
-"Due to a name clash with the cmake package renaming /usr/bin/cmake was "
-"necessary."
-msgstr "Cần phải thay đổi /usr/bin/cmake vì tên xung đột với gói tin cmake."
diff -Nru colormake-0.2.ori/debian/rules colormake-0.2/debian/rules
--- colormake-0.2.ori/debian/rules      2006-10-05 21:55:13.542190456 +0200
+++ colormake-0.2/debian/rules  2006-10-05 22:15:50.099447204 +0200
@@ -28,11 +28,7 @@
                -d debian/tmp/usr/bin\
                -d debian/tmp/usr/share/man/man1\
                -d debian/tmp/usr/share/doc/$(package)
-       install -m 755 debian/postinst debian/postrm debian/config 
debian/tmp/DEBIAN
-       # Modification for po-debconf switch
-       po2debconf debian/templates >debian/tmp/DEBIAN/templates
-       # install -m 644 debian/templates debian/tmp/DEBIAN
-       # End of po-debconf switch modifications
+       install -m 755 debian/postinst debian/postrm debian/tmp/DEBIAN
        cp -a debian/copyright debian/tmp/usr/share/doc/$(package)/.
        cp -a debian/changelog 
debian/tmp/usr/share/doc/$(package)/changelog.Debian
        cp -a ChangeLog debian/tmp/usr/share/doc/$(package)/changelog
diff -Nru colormake-0.2.ori/debian/templates colormake-0.2/debian/templates
--- colormake-0.2.ori/debian/templates  2006-10-05 21:55:13.542190456 +0200
+++ colormake-0.2/debian/templates      1970-01-01 01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-Template: colormake/renamed
-Type: text
-_Description: /usr/bin/cmake was renamed to /usr/bin/colormake
- Due to a name clash with the cmake package renaming /usr/bin/cmake was
- necessary.

Attachment: signature.asc
Description: Digital signature

Reply via email to