Attached is the patch for the upcomgin NMU --
diff -Nru album-3.04.ori/debian/changelog album-3.04/debian/changelog --- album-3.04.ori/debian/changelog 2006-10-17 20:19:44.280817416 +0200 +++ album-3.04/debian/changelog 2006-10-25 07:36:27.639648367 +0200 @@ -1,3 +1,19 @@ +album (3.04-2.1) unstable; urgency=low + + * Non-maintainer upload to fix longstanding l10n and debconf-related issues + * Remove the note template and move its text to README.Debian + Closes: #388705, #377642 + This removes the need to depend on debconf and therefore the + support for the cdebconf transition. Closes: #331737 + This also make the debconf translations irrelevant. + Closes: #326137, #268367, #318441, #330427 + * Fix obviously outdated Debian packaging practices to make + the package a little bit cleaner: + - upgrade the debhelper compatibility to 4 + - move debhelper to Build-Depends + + -- Christian Perrier <[EMAIL PROTECTED]> Wed, 18 Oct 2006 07:38:46 +0200 + album (3.04-2) unstable; urgency=low * Included japanese template (closes: #260939) diff -Nru album-3.04.ori/debian/config album-3.04/debian/config --- album-3.04.ori/debian/config 2006-10-17 20:19:44.280817416 +0200 +++ album-3.04/debian/config 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -#!/bin/sh -e -. /usr/share/debconf/confmodule || exit -db_version 2.0 -db_reset album/info -db_input medium album/info || true -db_go || true diff -Nru album-3.04.ori/debian/control album-3.04/debian/control --- album-3.04.ori/debian/control 2006-10-17 20:19:44.296817537 +0200 +++ album-3.04/debian/control 2006-10-25 07:38:04.608290243 +0200 @@ -2,12 +2,12 @@ Section: non-free/web Priority: extra Maintainer: Elie Rosenblum <[EMAIL PROTECTED]> -Build-Depends-Indep: debhelper (>> 3.0.0) +Build-Depends: debhelper (>> 4.0.0) Standards-Version: 3.6.1 Package: album Architecture: all -Depends: debconf (>=0.9.53), ${perl:Depends}, imagemagick +Depends: ${perl:Depends}, imagemagick Description: HTML photo album generator with theme support Album is a perl script that can create HTML photo albums for your directories of images. It supports themes that determine the visual diff -Nru album-3.04.ori/debian/po/de.po album-3.04/debian/po/de.po --- album-3.04.ori/debian/po/de.po 2006-10-17 20:19:44.280817416 +0200 +++ album-3.04/debian/po/de.po 1970-01-01 01:00:00.000000000 +0100 @@ -1,60 +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: album 3.04-2\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2003-08-02 11:50-0400\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=ISO-8859-15\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Description -#: ../templates:3 -msgid "Album Information" -msgstr "Informationen zu Album" - -#. Description -#: ../templates:3 -msgid "" -"Album is free software in the sense that you are not required to pay for it, " -"but not open source. It is recommended that you read the album license in /" -"usr/share/doc/album/copyright or on the authors web site. The author also " -"requests that you visit his web site to read about supporting his " -"development efforts, at: http://MarginalHacks.com/Pay/" -msgstr "" -"Album ist freie Software in der Weise, das Sie nicht daf�r bezahlen m�ssen; " -"Album ist jedoch keine Open-Source-Software. Es empfiehlt sich, das Sie die " -"Album-Lizenzbestimmungen in der Datei /usr/share/doc/album/copyright oder " -"auf der Webseite des Autors durchlesen. Der Autor bittet auch um einen " -"Besuch seiner Webseite, um ihn bei seinen Entwicklungsanstrengungen zu " -"unterst�tzen. Die Adresse ist http://MarginalHacks.com/Pay/" - -#. Description -#: ../templates:3 -msgid "" -"Album supports themes for web page layout. The set of themes available when " -"this package was created is included, and installed under the directory /usr/" -"share/album/themes. The full path name to the theme directory must be " -"specified on the album command line in order to use a theme." -msgstr "" -"Album unterst�tzt Themes f�r das Webseiten-Layout. Die bei der " -"Paketerstellung verf�gbaren Themes sind in diesem Paket enthalten, und im " -"Verzeichnis /usr/share/album/themes installiert. Beim Album-Start �ber die " -"Kommandozeile muss der vollst�ndige Pfad zum Theme-Verzeichnis angegeben " -"werden, damit diese benutzt werden k=F6nnen." diff -Nru album-3.04.ori/debian/po/fr.po album-3.04/debian/po/fr.po --- album-3.04.ori/debian/po/fr.po 2006-10-17 20:19:44.280817416 +0200 +++ album-3.04/debian/po/fr.po 1970-01-01 01:00:00.000000000 +0100 @@ -1,60 +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: album 3.04-2\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-02-09 08:30+0100\n" -"PO-Revision-Date: 2004-02-09 08:35+0100\n" -"Last-Translator: Denis Barbier <[EMAIL PROTECTED]>\n" -"Language-Team: French <debian-l10n-french@lists.debian.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-15\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Type: note -#. Description -#: ../templates:3 -msgid "Album Information" -msgstr "Informations sur album" - -#. Type: note -#. Description -#: ../templates:3 -msgid "" -"Album is free software in the sense that you are not required to pay for it, " -"but not open source. It is recommended that you read the album license in /" -"usr/share/doc/album/copyright or on the authors web site. The author also " -"requests that you visit his web site to read about supporting his " -"development efforts, at: http://MarginalHacks.com/Pay/" -msgstr "" -"Album est un logiciel gratuit, mais pas un logiciel libre. Il vous est " -"recommand� de lire sa licence dans /usr/share/doc/album/copyright ou " -"sur le site de l'auteur. Celui-ci demande �galement de visiter son site sur " -"la Toile pour prendre connaissance des m�thodes disponibles pour soutenir " -"son effort de d�veloppement. Voir http://MarginalHacks.com/Pay/." - -#. Type: note -#. Description -#: ../templates:3 -msgid "" -"Album supports themes for web page layout. The set of themes available when " -"this package was created is included, and installed under the directory /usr/" -"share/album/themes. The full path name to the theme directory must be " -"specified on the album command line in order to use a theme." -msgstr "" -"Album permet l'utilisation de th�mes pour l'affichage des pages web. Le jeu " -"de th�mes existants au moment de la cr�ation de ce paquet est inclus et " -"install� dans le r�pertoire /usr/share/album/themes. Ce chemin doit �tre " -"indiqu� en ligne de commande afin d'utiliser un th�me s'y trouvant." diff -Nru album-3.04.ori/debian/po/ja.po album-3.04/debian/po/ja.po --- album-3.04.ori/debian/po/ja.po 2006-10-17 20:19:44.280817416 +0200 +++ album-3.04/debian/po/ja.po 1970-01-01 01:00:00.000000000 +0100 @@ -1,61 +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: album 3.04-1\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-07-23 06:43+0900\n" -"PO-Revision-Date: 2004-07-04 23:11+0900\n" -"Last-Translator: Hideki Yamane <[EMAIL PROTECTED]>\n" -"Language-Team: Japanese <debian-japanese@lists.debian.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=EUC-JP\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Type: note -#. Description -#: ../templates:3 -msgid "Album Information" -msgstr "album �ˤĤ��Ƥξ���" - -#. Type: note -#. Description -#: ../templates:3 -msgid "" -"Album is free software in the sense that you are not required to pay for it, " -"but not open source. It is recommended that you read the album license in /" -"usr/share/doc/album/copyright or on the authors web site. The author also " -"requests that you visit his web site to read about supporting his " -"development efforts, at: http://MarginalHacks.com/Pay/" -msgstr "" -"album �����Ѥ���ʧ���ʤ��Ƥ��ɤ����Ȥ�����̣�Ǥϥե (̵��) �ʥ��եȥ�����" -"�Ǥ����������ץ����ǤϤ����ޤ�����/usr/share/doc/album/copyright �� ����" -"�� web �����Ȥˤ��� album �Υ饤�����ɤ������ᤷ�ޤ������Ԥ⡢���� " -"web ������ http://MarginalHacks.com/Pay/ ��ˬ���Ƴ�ȯ�ζ�ϫ�ˤĤ����ɤ��Ǥ���" -"���Τ�˾���Ǥ��ޤ���" - -#. Type: note -#. Description -#: ../templates:3 -msgid "" -"Album supports themes for web page layout. The set of themes available when " -"this package was created is included, and installed under the directory /usr/" -"share/album/themes. The full path name to the theme directory must be " -"specified on the album command line in order to use a theme." -msgstr "" -"album �� web �ڡ����쥤�����ȤΥơ���ǽ�ݡ��Ȥ��Ƥ��ޤ������Υѥå�����" -"�������줿�������Ѳ�ǽ���ä��ơ��ޥ��åȤ��ޤޤ��Ƥ��ꡢ/usr/share/album/" -"themes �ʲ��˥��ȡ��뤵���Ƥ��ޤ����ơ��ޤ��Ȥ������ˤϡ�album �Υ��ޥ���" -"�饤���ǥơ��ޤΥǥ��쥯�ȥ����ե��ѥ�̾�ǻ��ꤹ��ɬ�פ������ޤ���" diff -Nru album-3.04.ori/debian/po/POTFILES.in album-3.04/debian/po/POTFILES.in --- album-3.04.ori/debian/po/POTFILES.in 2006-10-17 20:19:44.280817416 +0200 +++ album-3.04/debian/po/POTFILES.in 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -[type: gettext/rfc822deb] templates diff -Nru album-3.04.ori/debian/po/ru.po album-3.04/debian/po/ru.po --- album-3.04.ori/debian/po/ru.po 2006-10-17 20:19:44.280817416 +0200 +++ album-3.04/debian/po/ru.po 1970-01-01 01:00:00.000000000 +0100 @@ -1,59 +0,0 @@ -# translation of album_2.46-2.po to russian -# -# 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: album 3.04-1\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2003-08-02 11:50-0400\n" -"PO-Revision-Date: 2003-10-05 18:58+0600\n" -"Last-Translator: Ilgiz Kalmetev <[EMAIL PROTECTED]>\n" -"Language-Team: russian <debian-russian@lists.debian.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=KOI8-R\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.0.1\n" - -#. Description -#: ../templates:3 -msgid "Album Information" -msgstr "���������� � Album" - -#. Description -#: ../templates:3 -msgid "" -"Album is free software in the sense that you are not required to pay for it, " -"but not open source. It is recommended that you read the album license in /" -"usr/share/doc/album/copyright or on the authors web site. The author also " -"requests that you visit his web site to read about supporting his " -"development efforts, at: http://MarginalHacks.com/Pay/" -msgstr "" -"Album - ��� ��������� �� � ��� ������, ��� ��� �� ������� " -"������, �� ��� �� �������� ��. ��� �������������� ������������ � " -"��������� Album � ����� /usr/share/doc/album/copyright ��� " -"�� ��������� ���-�����. ����� ����� ������� �������� ��� ���-����, " -"����� �������� �� �������� ��������� � ����������, ����� " -"�����: http://MarginalHacks.com/Pay/" - -#. Description -#: ../templates:3 -msgid "" -"Album supports themes for web page layout. The set of themes available when " -"this package was created is included, and installed under the directory /usr/" -"share/album/themes. The full path name to the theme directory must be " -"specified on the album command line in order to use a theme." -msgstr "" -"Album ������������ ����� ��� ���������� ���-�������. � ���� ����� " -"������� ����� ����, �� ��������������� � ������� /usr/share/album/themes. " -"����� ������������ �����, ����� ������� ������ ��� �������� ���� � " -"��������� ������ album." - diff -Nru album-3.04.ori/debian/po/templates.pot album-3.04/debian/po/templates.pot --- album-3.04.ori/debian/po/templates.pot 2006-10-17 20:19:44.280817416 +0200 +++ album-3.04/debian/po/templates.pot 1970-01-01 01:00:00.000000000 +0100 @@ -1,49 +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-02 11:50-0400\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 "Album Information" -msgstr "" - -#. Description -#: ../templates:3 -msgid "" -"Album is free software in the sense that you are not required to pay for it, " -"but not open source. It is recommended that you read the album license in /" -"usr/share/doc/album/copyright or on the authors web site. The author also " -"requests that you visit his web site to read about supporting his " -"development efforts, at: http://MarginalHacks.com/Pay/" -msgstr "" - -#. Description -#: ../templates:3 -msgid "" -"Album supports themes for web page layout. The set of themes available when " -"this package was created is included, and installed under the directory /usr/" -"share/album/themes. The full path name to the theme directory must be " -"specified on the album command line in order to use a theme." -msgstr "" diff -Nru album-3.04.ori/debian/README.Debian album-3.04/debian/README.Debian --- album-3.04.ori/debian/README.Debian 2006-10-17 20:19:44.268817324 +0200 +++ album-3.04/debian/README.Debian 2006-10-18 07:35:20.635077228 +0200 @@ -8,4 +8,17 @@ that contained only the original binary. Then I copied it to a working directory and ran dh_make. - -- Elie Rosenblum <[EMAIL PROTECTED]>, Mon, 18 Mar 2002 15:25:43 -0500 + Album is free software in the sense that you are not required to pay for + it, but not open source. It is recommended that you read the album license + in /usr/share/doc/album/copyright or on the authors web site. The author + also requests that you visit his web site to read about supporting his + development efforts, at: http://MarginalHacks.com/Pay/ + . + Album supports themes for web page layout. The set of themes available + when this package was created is included, and installed under the + directory /usr/share/album/themes. The full path name to the theme + directory must be specified on the album command line in order to use a + theme. + + + -- Christian Perrier <[EMAIL PROTECTED]>, Wed, 18 Oct 2006 07:35:20 z diff -Nru album-3.04.ori/debian/rules album-3.04/debian/rules --- album-3.04.ori/debian/rules 2006-10-17 20:19:44.280817416 +0200 +++ album-3.04/debian/rules 2006-10-25 07:36:55.595833197 +0200 @@ -6,7 +6,7 @@ #export DH_VERBOSE=1 # This is the debhelper compatibility version to use. -export DH_COMPAT=3 +export DH_COMPAT=4 # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) @@ -71,7 +71,7 @@ binary-arch: build install dh_testdir dh_testroot - dh_installdebconf +# dh_installdebconf dh_installdocs Docs # dh_installexamples # dh_installmenu diff -Nru album-3.04.ori/debian/templates album-3.04/debian/templates --- album-3.04.ori/debian/templates 2006-10-17 20:19:44.280817416 +0200 +++ album-3.04/debian/templates 1970-01-01 01:00:00.000000000 +0100 @@ -1,14 +0,0 @@ -Template: album/info -Type: note -_Description: Album Information - Album is free software in the sense that you are not required to pay for - it, but not open source. It is recommended that you read the album license - in /usr/share/doc/album/copyright or on the authors web site. The author - also requests that you visit his web site to read about supporting his - development efforts, at: http://MarginalHacks.com/Pay/ - . - Album supports themes for web page layout. The set of themes available - when this package was created is included, and installed under the - directory /usr/share/album/themes. The full path name to the theme - directory must be specified on the album command line in order to use a - theme.
signature.asc
Description: Digital signature