Bug#221431: Diff of NMU 1.2.5-2.1
J.H.M. Dassen (Ray)
"J.H.M. Dassen (Ray)" <fsmla@xinara.org>, 221431@bugs.debian.org
Tue, 18 Nov 2003 10:39:37 +0100
--XsQoSWH+UP9D9v3l
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Package: pango1.0
Version: 1.2.5-2
Severity: normal
Tags: patch
-- System Information:
Debian Release: testing/unstable
Architecture: i386
Kernel: Linux zensunni 2.4.23-rc1-evms1.2.1 #1 SMP Mon Nov 17 19:24:48 CET 2003 i686
Locale: LANG=C, LC_CTYPE=en_US.ISO8859-1
--
Obsig: developing a new sig
--XsQoSWH+UP9D9v3l
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: attachment; filename=patch
Content-Transfer-Encoding: 8bit
diff -r -u --new-file pango1.0-1.2.5-2/debian/changelog pango1.0-1.2.5-2.1/debian/changelog
--- pango1.0-1.2.5-2/debian/changelog 2003-11-18 10:32:39.000000000 +0100
+++ pango1.0-1.2.5-2.1/debian/changelog 2003-11-18 10:17:53.000000000 +0100
@@ -1,3 +1,12 @@
+pango1.0 (1.2.5-2.1) unstable; urgency=high
+
+ * NMU
+ * [debian/patches/001_new_freetype_build_system.patch] New, needed to work
+ with freetype 2.1.7. (Closes: #220988)
+ * [debian/control.in, debian/control] Bumped the freetype build dependency.
+
+ -- J.H.M. Dassen (Ray) <jdassen@debian.org> Tue, 18 Nov 2003 10:17:51 +0100
+
pango1.0 (1.2.5-2) unstable; urgency=low
* acknowledge to NMU. (closes: Bug#216003, Bug#216091)
diff -r -u --new-file pango1.0-1.2.5-2/debian/control pango1.0-1.2.5-2.1/debian/control
--- pango1.0-1.2.5-2/debian/control 2003-11-18 10:32:39.000000000 +0100
+++ pango1.0-1.2.5-2.1/debian/control 2003-11-18 10:16:47.000000000 +0100
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Akira TAGOH <tagoh@debian.org>
Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Andrew Lau <netsnipe@users.sourceforge.net>, Edd Dumbill <ejad@debian.org>, Emil Soleyman-Zomalan <emil@nishra.com>, Gustavo Noronha Silva <kov@debian.org>, Johannes Rohr <j.rohr@comlink.apc.org>, Jordi Mallach <jordi@debian.org>, Josselin Mouette <joss@debian.org>, Rob Bradford <rob@debianplanet.org>, Robert McQueen <robot101@debian.org>, Ross Burton <ross@burtonini.com>, Sebastien Bacher <seb128@debian.org>, Takuo KITAME <kitame@debian.org>
-Build-Depends: debhelper (>= 4.1.16), libfreetype6-dev (>= 2.1.3), xlibs-dev, libglib2.0-dev (>= 2.2.0), pkg-config, defoma (>= 0.11.1), libxft-dev, libfontconfig1-dev (>= 2.1.91), autotools-dev, po-debconf, gnome-pkg-tools
+Build-Depends: debhelper (>= 4.1.16), libfreetype6-dev (>= 2.1.7), xlibs-dev, libglib2.0-dev (>= 2.2.0), pkg-config, defoma (>= 0.11.1), libxft-dev, libfontconfig1-dev (>= 2.1.91), autotools-dev, po-debconf, gnome-pkg-tools
Standards-Version: 3.6.1.0
Package: libpango1.0-0
diff -r -u --new-file pango1.0-1.2.5-2/debian/control.in pango1.0-1.2.5-2.1/debian/control.in
--- pango1.0-1.2.5-2/debian/control.in 2003-11-18 10:32:39.000000000 +0100
+++ pango1.0-1.2.5-2.1/debian/control.in 2003-11-18 09:58:28.000000000 +0100
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Akira TAGOH <tagoh@debian.org>
Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper (>= 4.1.16), libfreetype6-dev (>= 2.1.3), xlibs-dev, libglib2.0-dev (>= 2.2.0), pkg-config, defoma (>= 0.11.1), libxft-dev, libfontconfig1-dev (>= 2.1.91), autotools-dev, po-debconf, gnome-pkg-tools
+Build-Depends: debhelper (>= 4.1.16), libfreetype6-dev (>= 2.1.7), xlibs-dev, libglib2.0-dev (>= 2.2.0), pkg-config, defoma (>= 0.11.1), libxft-dev, libfontconfig1-dev (>= 2.1.91), autotools-dev, po-debconf, gnome-pkg-tools
Standards-Version: 3.6.1.0
Package: libpango1.0-@SONAME@
diff -r -u --new-file pango1.0-1.2.5-2/debian/patches/001_new_freetype_build_system.patch pango1.0-1.2.5-2.1/debian/patches/001_new_freetype_build_system.patch
--- pango1.0-1.2.5-2/debian/patches/001_new_freetype_build_system.patch 1970-01-01 01:00:00.000000000 +0100
+++ pango1.0-1.2.5-2.1/debian/patches/001_new_freetype_build_system.patch 2003-11-18 10:16:06.000000000 +0100
@@ -0,0 +1,244 @@
+diff -r -u pango-1.2.5.old/ChangeLog pango-1.2.5/ChangeLog
+--- pango-1.2.5.old/ChangeLog 2003-08-27 17:37:39.000000000 +0200
++++ pango-1.2.5/ChangeLog 2003-11-18 10:14:51.000000000 +0100
+@@ -1,3 +1,12 @@
++2003-11-18 J.H.M. Dassen (Ray) <jdassen@debian.org>
++
++ * Backported patch by Owen Taylor <otaylor@redhat.com>, needed for
++ building against freetype 2.1.7:
++ Switch over to recommended Freetype system of
++ include ftbuild.h then #include FT_FREETYPE_H.
++ Fixes ftmodule.h problem with current Freetype CVS.
++ (http://bugzilla.gnome.org/show_bug.cgi?id=125548)
++
+ Wed Aug 27 11:37:26 2003 Owen Taylor <otaylor@redhat.com>
+
+ * === Released 1.2.5 ===
+diff -r -u pango-1.2.5.old/modules/indic/indic-ot.h pango-1.2.5/modules/indic/indic-ot.h
+--- pango-1.2.5.old/modules/indic/indic-ot.h 2003-08-08 19:05:01.000000000 +0200
++++ pango-1.2.5/modules/indic/indic-ot.h 2003-11-18 10:14:51.000000000 +0100
+@@ -9,7 +9,8 @@
+ #ifndef __INDIC_OT_H__
+ #define __INDIC_OT_H__
+
+-#include <freetype/freetype.h>
++#include <ft2build.h>
++#include FT_FREETYPE_H
+ #include <pango/pango-glyph.h>
+ #include <pango/pango-types.h>
+ #include "mprefixups.h"
+diff -r -u pango-1.2.5.old/pango/opentype/ftxgdef.c pango-1.2.5/pango/opentype/ftxgdef.c
+--- pango-1.2.5.old/pango/opentype/ftxgdef.c 2003-08-08 19:05:09.000000000 +0200
++++ pango-1.2.5/pango/opentype/ftxgdef.c 2003-11-18 10:14:51.000000000 +0100
+@@ -15,16 +15,16 @@
+ *
+ ******************************************************************/
+
+-#include <freetype/tttags.h>
+-
+-#include <freetype/internal/ftstream.h>
+-#include <freetype/internal/ftmemory.h>
+-#include <freetype/internal/tttypes.h>
++#include "ftxopen.h"
++#include "ftxopenf.h"
+
+ #include "fterrcompat.h"
+
+-#include "ftxopen.h"
+-#include "ftxopenf.h"
++#include FT_TRUETYPE_TAGS_H
++
++#include FT_INTERNAL_STREAM_H
++#include FT_INTERNAL_MEMORY_H
++#include FT_INTERNAL_TRUETYPE_TYPES_H
+
+ #define TTAG_GDEF FT_MAKE_TAG( 'G', 'D', 'E', 'F' )
+
+diff -r -u pango-1.2.5.old/pango/opentype/ftxgpos.c pango-1.2.5/pango/opentype/ftxgpos.c
+--- pango-1.2.5.old/pango/opentype/ftxgpos.c 2003-08-25 16:22:30.000000000 +0200
++++ pango-1.2.5/pango/opentype/ftxgpos.c 2003-11-18 10:14:51.000000000 +0100
+@@ -21,19 +21,18 @@
+ sharing as much as possible with extensive use of macros. This
+ is something for a volunteer :-) */
+
+-#define TTAG_GPOS FT_MAKE_TAG( 'G', 'P', 'O', 'S' )
+-
+-#include <freetype/tttags.h>
+-
+-#include <freetype/internal/ftstream.h>
+-#include <freetype/internal/ftmemory.h>
+-#include <freetype/internal/tttypes.h>
++#include "ftxopen.h"
++#include "ftxopenf.h"
+
+ #include "fterrcompat.h"
+
+-#include "ftxopen.h"
+-#include "ftxopenf.h"
++#include FT_TRUETYPE_TAGS_H
+
++#include FT_INTERNAL_STREAM_H
++#include FT_INTERNAL_MEMORY_H
++#include FT_INTERNAL_TRUETYPE_TYPES_H
++
++#define TTAG_GPOS FT_MAKE_TAG( 'G', 'P', 'O', 'S' )
+
+ struct GPOS_Instance_
+ {
+diff -r -u pango-1.2.5.old/pango/opentype/ftxgsub.c pango-1.2.5/pango/opentype/ftxgsub.c
+--- pango-1.2.5.old/pango/opentype/ftxgsub.c 2003-08-25 16:22:15.000000000 +0200
++++ pango-1.2.5/pango/opentype/ftxgsub.c 2003-11-18 10:15:35.000000000 +0100
+@@ -23,14 +23,17 @@
+
+ #define EXPORT_FUNC
+
+-#include <freetype/tttags.h>
+-
+-#include <freetype/internal/ftstream.h>
+-#include <freetype/internal/ftmemory.h>
+-#include <freetype/internal/tttypes.h>
++#include "ftxopen.h"
++#include "ftxopenf.h"
+
+ #include "fterrcompat.h"
+
++#include FT_TRUETYPE_TAGS_H
++
++#include FT_INTERNAL_STREAM_H
++#include FT_INTERNAL_MEMORY_H
++#include FT_INTERNAL_TRUETYPE_TYPES_H
++
+ #include "ftxopen.h"
+ #include "ftxopenf.h"
+
+diff -r -u pango-1.2.5.old/pango/opentype/ftxopen.c pango-1.2.5/pango/opentype/ftxopen.c
+--- pango-1.2.5.old/pango/opentype/ftxopen.c 2003-08-08 19:05:10.000000000 +0200
++++ pango-1.2.5/pango/opentype/ftxopen.c 2003-11-18 10:14:51.000000000 +0100
+@@ -15,15 +15,14 @@
+ *
+ ******************************************************************/
+
+-#include <freetype/internal/ftstream.h>
+-#include <freetype/internal/ftmemory.h>
+-#include <freetype/internal/tttypes.h>
+-
+-#include "fterrcompat.h"
+-
+ #include "ftxopen.h"
+ #include "ftxopenf.h"
+
++#include "fterrcompat.h"
++
++#include FT_INTERNAL_STREAM_H
++#include FT_INTERNAL_MEMORY_H
++#include FT_INTERNAL_TRUETYPE_TYPES_H
+
+ /***************************
+ * Script related functions
+diff -r -u pango-1.2.5.old/pango/opentype/ftxopen.h pango-1.2.5/pango/opentype/ftxopen.h
+--- pango-1.2.5.old/pango/opentype/ftxopen.h 2003-08-08 19:05:10.000000000 +0200
++++ pango-1.2.5/pango/opentype/ftxopen.h 2003-11-18 10:14:51.000000000 +0100
+@@ -22,7 +22,8 @@
+ #ifndef FTXOPEN_H
+ #define FTXOPEN_H
+
+-#include <freetype/freetype.h>
++#include <ft2build.h>
++#include FT_FREETYPE_H
+
+ #ifdef __cplusplus
+ extern "C" {
+diff -r -u pango-1.2.5.old/pango/opentype/ottest.c pango-1.2.5/pango/opentype/ottest.c
+--- pango-1.2.5.old/pango/opentype/ottest.c 2000-12-20 05:41:36.000000000 +0100
++++ pango-1.2.5/pango/opentype/ottest.c 2003-11-18 10:14:51.000000000 +0100
+@@ -23,7 +23,6 @@
+ #include <stdlib.h>
+
+ #include "ftxopen.h"
+-#include <freetype/internal/ftmemory.h>
+
+ #include "disasm.h"
+
+diff -r -u pango-1.2.5.old/pango/opentype/pango-ot-info.c pango-1.2.5/pango/opentype/pango-ot-info.c
+--- pango-1.2.5.old/pango/opentype/pango-ot-info.c 2003-04-16 23:48:20.000000000 +0200
++++ pango-1.2.5/pango/opentype/pango-ot-info.c 2003-11-18 10:14:51.000000000 +0100
+@@ -21,8 +21,8 @@
+
+ #include "pango-ot-private.h"
+ #include "fterrcompat.h"
+-#include <freetype/internal/ftobjs.h>
+-#include <freetype/ftmodule.h>
++#include FT_INTERNAL_OBJECTS_H
++#include FT_MODULE_H
+
+ static void pango_ot_info_class_init (GObjectClass *object_class);
+ static void pango_ot_info_finalize (GObject *object);
+diff -r -u pango-1.2.5.old/pango/opentype/pango-ot-private.h pango-1.2.5/pango/opentype/pango-ot-private.h
+--- pango-1.2.5.old/pango/opentype/pango-ot-private.h 2000-12-20 05:41:36.000000000 +0100
++++ pango-1.2.5/pango/opentype/pango-ot-private.h 2003-11-18 10:14:51.000000000 +0100
+@@ -22,7 +22,8 @@
+ #ifndef __PANGO_OT_PRIVATE_H__
+ #define __PANGO_OT_PRIVATE_H__
+
+-#include <freetype/freetype.h>
++#include <ft2build.h>
++#include FT_FREETYPE_H
+
+ #include <glib-object.h>
+
+diff -r -u pango-1.2.5.old/pango/opentype/pango-ot-ruleset.c pango-1.2.5/pango/opentype/pango-ot-ruleset.c
+--- pango-1.2.5.old/pango/opentype/pango-ot-ruleset.c 2003-07-24 23:04:13.000000000 +0200
++++ pango-1.2.5/pango/opentype/pango-ot-ruleset.c 2003-11-18 10:14:51.000000000 +0100
+@@ -19,11 +19,11 @@
+ * Boston, MA 02111-1307, USA.
+ */
+
+-#include <freetype/internal/ftmemory.h>
+-
+ #include <pango/pango-ot.h>
+ #include "pango-ot-private.h"
+
++#include FT_INTERNAL_MEMORY_H /* For FT_Free() */
++
+ #define PANGO_SCALE_26_6 (PANGO_SCALE / (1<<6))
+ #define PANGO_UNITS_26_6(d) (PANGO_SCALE_26_6 * (d))
+
+diff -r -u pango-1.2.5.old/pango/pango-ot.h pango-1.2.5/pango/pango-ot.h
+--- pango-1.2.5.old/pango/pango-ot.h 2002-06-04 02:20:47.000000000 +0200
++++ pango-1.2.5/pango/pango-ot.h 2003-11-18 10:14:51.000000000 +0100
+@@ -22,7 +22,8 @@
+ #ifndef __PANGO_OT_H__
+ #define __PANGO_OT_H__
+
+-#include <freetype/freetype.h>
++#include <ft2build.h>
++#include FT_FREETYPE_H
+ #include <pango/pango-glyph.h>
+
+ G_BEGIN_DECLS
+diff -r -u pango-1.2.5.old/pango/pangoft2.c pango-1.2.5/pango/pangoft2.c
+--- pango-1.2.5.old/pango/pangoft2.c 2003-08-08 19:05:05.000000000 +0200
++++ pango-1.2.5/pango/pangoft2.c 2003-11-18 10:14:51.000000000 +0100
+@@ -28,7 +28,8 @@
+ #include <glib.h>
+ #include <glib/gprintf.h>
+
+-#include <freetype/freetype.h>
++#include <ft2build.h>
++#include FT_FREETYPE_H
+
+ #include "pango-utils.h"
+ #include "pangoft2.h"
+diff -r -u pango-1.2.5.old/pango/pangoft2.h pango-1.2.5/pango/pangoft2.h
+--- pango-1.2.5.old/pango/pangoft2.h 2002-07-04 00:30:36.000000000 +0200
++++ pango-1.2.5/pango/pangoft2.h 2003-11-18 10:14:51.000000000 +0100
+@@ -23,7 +23,8 @@
+ #ifndef __PANGOFT2_H__
+ #define __PANGOFT2_H__
+
+-#include <freetype/freetype.h>
++#include <ft2build.h>
++#include FT_FREETYPE_H
+
+ #include <fontconfig/fontconfig.h>
+
diff -r -u --new-file pango1.0-1.2.5-2/debian/po/fr.po pango1.0-1.2.5-2.1/debian/po/fr.po
--- pango1.0-1.2.5-2/debian/po/fr.po 2003-11-18 10:32:39.000000000 +0100
+++ pango1.0-1.2.5-2.1/debian/po/fr.po 2003-11-18 10:16:48.000000000 +0100
@@ -15,7 +15,7 @@
msgstr ""
"Project-Id-Version: pango\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-10-25 04:25+0900\n"
+"POT-Creation-Date: 2003-11-18 09:41+0100\n"
"PO-Revision-Date: 2003-04-19 22:39+0200\n"
"Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
"Language-Team: french <debian-l10n-french@lists.debian.org>\n"
@@ -23,11 +23,13 @@
"Content-Type: text/plain; charset=iso-8859-15\n"
"Content-Transfer-Encoding: 8bit\n"
+#. Type: boolean
#. Description
#: ../libpango1.0-common.templates:4
msgid "Do you want to entrust font management to defoma?"
msgstr "Voulez-vous confier la gestion des polices à defoma ?"
+#. Type: boolean
#. Description
#: ../libpango1.0-common.templates:4
msgid ""
@@ -39,6 +41,7 @@
"pouvez choisir de gérer les polices de pango avec defoma ou sans. Defoma est "
"choisi s'il existe déjà des polices gérées par defoma."
+#. Type: boolean
#. Description
#: ../libpango1.0-common.templates:4
msgid ""
@@ -52,6 +55,7 @@
"defoma. Le fichier est recréé par defoma pour toute installation, mise à "
"jour ou suppression de polices gérées par defoma."
+#. Type: boolean
#. Description
#: ../libpango1.0-common.templates:4
msgid ""
@@ -61,6 +65,7 @@
"Si vous ne voulez pas utiliser defoma et si vous préférez modifier "
"manuellement le fichier pangox.aliases, n'acceptez pas cette option."
+#. Type: boolean
#. Description
#: ../libpango1.0-common.templates:4
msgid ""
@@ -71,6 +76,7 @@
"que le fichier/etc/pango/pangox.aliases soit géré par defoma ou si vous "
"voulez le gérer vous-même."
+#. Type: note
#. Description
#: ../libpango1.0-common.templates:22
msgid ""
@@ -79,11 +85,13 @@
"L'ancien pangox.aliases a été sauvegardé dans le fichier /etc/pango/pangox."
"aliases-old."
+#. Type: note
#. Description
#: ../libpango1.0-common.templates:28
msgid "pangox.aliases configuration"
msgstr "Configuration de pangox.aliases."
+#. Type: note
#. Description
#: ../libpango1.0-common.templates:28
msgid ""
diff -r -u --new-file pango1.0-1.2.5-2/debian/po/ja.po pango1.0-1.2.5-2.1/debian/po/ja.po
--- pango1.0-1.2.5-2/debian/po/ja.po 2003-11-18 10:32:39.000000000 +0100
+++ pango1.0-1.2.5-2.1/debian/po/ja.po 2003-11-18 10:16:48.000000000 +0100
@@ -16,7 +16,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-10-25 04:25+0900\n"
+"POT-Creation-Date: 2003-11-18 09:41+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -24,11 +24,13 @@
"Content-Type: text/plain; charset=EUC-JP\n"
"Content-Transfer-Encoding: 8bit\n"
+#. Type: boolean
#. Description
#: ../libpango1.0-common.templates:4
msgid "Do you want to entrust font management to defoma?"
msgstr "defoma¤Ë¥Õ¥©¥ó¥È´ÉÍý¤òǤ¤»¤¿¤¤¤Ç¤¹¤«?"
+#. Type: boolean
#. Description
#: ../libpango1.0-common.templates:4
msgid ""
@@ -41,6 +43,7 @@
"¤ì¤Ï¤¹¤Ç¤Ëdefoma²½¤µ¤ì¤¿¥Õ¥©¥ó¥È ¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë»þ¤ËÅö¤Æ¤Ï¤Þ¤ë¤Ç¤·¤ç"
"¤¦¡¥"
+#. Type: boolean
#. Description
#: ../libpango1.0-common.templates:4
msgid ""
@@ -54,6 +57,7 @@
"¤Þ¤¹¡¥¤³¤Î¥Õ¥¡¥¤¥ë¤Ï¤¢¤Ê¤¿¤¬ defoma²½¤µ¤ì¤¿¥Õ¥©¥ó¥È¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë¡¤"
"¥¢¥Ã¥×¥°¥ì¡¼¥É ¤¢¤ë¤¤¤Ïºï½ü¤ò¤·¤¿»þ¤Ëdefoma¤Ë¤è¤Ã¤ÆºÆÀ¸À®¤µ¤ì¤ë¤Ç¤·¤ç¤¦¡¥"
+#. Type: boolean
#. Description
#: ../libpango1.0-common.templates:4
msgid ""
@@ -63,6 +67,7 @@
"¤â¤·¤¢¤Ê¤¿¤¬defoma¤ò»È¤¤¤¿¤¯¤Ê¤¤¡¤¤¢¤ë¤¤¤Ïpangox.aliases ¤ò¼êÆ°¤ÇÊÔ½¸¤·¤¿¤¤¤Ê"
"¤é¡¤'No'¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡¥"
+#. Type: boolean
#. Description
#: ../libpango1.0-common.templates:4
msgid ""
@@ -72,6 +77,7 @@
"defoma¤Ë/etc/pango/pangox.aliases¤òǤ¤»¤¿¤¤¡¤¤¢¤ë¤¤¤Ï ¤¢¤Ê¤¿¤¬¤³¤Î¥Õ¥¡¥¤¥ë¤ò"
"´ÉÍý¤¹¤ë¤¿¤á¤Ë¡¤¸å¤«¤édpkg-reconfigure ¤òÁö¤é¤»¤ÆºÆÀßÄꤹ¤ë¤³¤È¤â¤Ç¤¤Þ¤¹¡¥"
+#. Type: note
#. Description
#: ../libpango1.0-common.templates:22
msgid ""
@@ -80,11 +86,13 @@
"¤¢¤Ê¤¿¤Î¸Å¤¤pangox.aliases¥Õ¥¡¥¤¥ë¤Ï/etc/pango/pangox.aliases-old ¤È¤·¤ÆÊݸ"
"¤µ¤ì¤Þ¤·¤¿¡¥"
+#. Type: note
#. Description
#: ../libpango1.0-common.templates:28
msgid "pangox.aliases configuration"
msgstr "pangox.aliases¤ÎÀßÄê¤Ë¤Ä¤¤¤Æ"
+#. Type: note
#. Description
#: ../libpango1.0-common.templates:28
msgid ""
diff -r -u --new-file pango1.0-1.2.5-2/debian/po/pt_BR.po pango1.0-1.2.5-2.1/debian/po/pt_BR.po
--- pango1.0-1.2.5-2/debian/po/pt_BR.po 2003-11-18 10:32:39.000000000 +0100
+++ pango1.0-1.2.5-2.1/debian/po/pt_BR.po 2003-11-18 10:16:48.000000000 +0100
@@ -15,7 +15,7 @@
msgstr ""
"Project-Id-Version: pango1.0_1.2.3-1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-10-25 04:25+0900\n"
+"POT-Creation-Date: 2003-11-18 09:41+0100\n"
"PO-Revision-Date: 2003-08-31 13:37-0300\n"
"Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
"Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
@@ -23,11 +23,13 @@
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
+#. Type: boolean
#. Description
#: ../libpango1.0-common.templates:4
msgid "Do you want to entrust font management to defoma?"
msgstr "Deseja delegar o gerenciamento de fontes ao defoma ?"
+#. Type: boolean
#. Description
#: ../libpango1.0-common.templates:4
msgid ""
@@ -40,6 +42,7 @@
"com o pango. Este será o caso quando você possuir pacotes de fontes usando "
"defoma já instalados."
+#. Type: boolean
#. Description
#: ../libpango1.0-common.templates:4
msgid ""
@@ -53,6 +56,7 @@
"verdade gerencia. O arquivo será gerado novamente pelo defoma qundo você "
"instalar/atualizar/remover pacotes de fontes com suporte ao defoma."
+#. Type: boolean
#. Description
#: ../libpango1.0-common.templates:4
msgid ""
@@ -62,6 +66,7 @@
"Caso você não queira usar o defoma e prefira editar o arquivo pangox.aliases "
"manualmente, escolha 'Não' aqui."
+#. Type: boolean
#. Description
#: ../libpango1.0-common.templates:4
msgid ""
@@ -71,6 +76,7 @@
"Você pode executar o dpkg-reconfigure posteriormente para ter /etc/pango/"
"pangox.aliases gerenciado pelo defoma ou gerenciar o arquivo manualmente."
+#. Type: note
#. Description
#: ../libpango1.0-common.templates:22
msgid ""
@@ -79,11 +85,13 @@
"Seu antigo arquivo pangox.aliases foi gravado como /etc/pango/pangox.aliases-"
"old."
+#. Type: note
#. Description
#: ../libpango1.0-common.templates:28
msgid "pangox.aliases configuration"
msgstr "Configuração pangox.aliases"
+#. Type: note
#. Description
#: ../libpango1.0-common.templates:28
msgid ""
diff -r -u --new-file pango1.0-1.2.5-2/debian/po/templates.pot pango1.0-1.2.5-2.1/debian/po/templates.pot
--- pango1.0-1.2.5-2/debian/po/templates.pot 2003-11-18 10:32:39.000000000 +0100
+++ pango1.0-1.2.5-2.1/debian/po/templates.pot 2003-11-18 09:41:20.000000000 +0100
@@ -16,7 +16,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-10-25 04:25+0900\n"
+"POT-Creation-Date: 2003-11-18 09:41+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -24,11 +24,13 @@
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
+#. Type: boolean
#. Description
#: ../libpango1.0-common.templates:4
msgid "Do you want to entrust font management to defoma?"
msgstr ""
+#. Type: boolean
#. Description
#: ../libpango1.0-common.templates:4
msgid ""
@@ -37,6 +39,7 @@
"when you have defomized font packages already installed."
msgstr ""
+#. Type: boolean
#. Description
#: ../libpango1.0-common.templates:4
msgid ""
@@ -46,6 +49,7 @@
"defomized font packages."
msgstr ""
+#. Type: boolean
#. Description
#: ../libpango1.0-common.templates:4
msgid ""
@@ -53,6 +57,7 @@
"manually, choose 'No' here."
msgstr ""
+#. Type: boolean
#. Description
#: ../libpango1.0-common.templates:4
msgid ""
@@ -60,17 +65,20 @@
"aliases or manage the file by yourself."
msgstr ""
+#. Type: note
#. Description
#: ../libpango1.0-common.templates:22
msgid ""
"Your old pangox.aliases file has been saved as /etc/pango/pangox.aliases-old."
msgstr ""
+#. Type: note
#. Description
#: ../libpango1.0-common.templates:28
msgid "pangox.aliases configuration"
msgstr ""
+#. Type: note
#. Description
#: ../libpango1.0-common.templates:28
msgid ""
--XsQoSWH+UP9D9v3l--