r5906 - in /desktop/unstable/pango1.0/debian: changelog compat control.in po/gl.po rules

seb128 at users.alioth.debian.org seb128 at users.alioth.debian.org
Sat May 6 13:57:01 UTC 2006 

Author: seb128
Date: Sat May  6 13:56:58 2006
New Revision: 5906

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=5906
Log:
pango1.0 (1.12.1-3) dapper; urgency=low

  * debian/compat:
    - updated
  * debian/control.in, debian/rules:
    - patch by Frans Pop <aragorn at tiscali.nl>
    - add --add-udeb option for dh_makeshlibs which autogenerates the
      udeb: lines for the shlibs file (Closes: #365293)
    - this requires debhelper 5.0.22
    - drop the Provides: libpango1.0- at SONAME@
    - add a temporary hack in debian/rules to create a correct dependency on
      libcairo2-directfb-udeb 
  * debian/po/gl.po:
    - Galician translation by Jacobo Tarrio <jtarrio at trasno.net> 
      (Closes: #361268)
  * debian/rules:
    - updated the -dbg package name to work with the new compat

 -- Sebastien Bacher <seb128 at canonical.com>  Sat,  6 May 2006 15:19:52 +0200

Added:
    desktop/unstable/pango1.0/debian/po/gl.po
Modified:
    desktop/unstable/pango1.0/debian/changelog
    desktop/unstable/pango1.0/debian/compat
    desktop/unstable/pango1.0/debian/control.in
    desktop/unstable/pango1.0/debian/rules

Modified: desktop/unstable/pango1.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/changelog?rev=5906&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/changelog (original)
+++ desktop/unstable/pango1.0/debian/changelog Sat May  6 13:56:58 2006
@@ -1,3 +1,23 @@
+pango1.0 (1.12.1-3) dapper; urgency=low
+
+  * debian/compat:
+    - updated
+  * debian/control.in, debian/rules:
+    - patch by Frans Pop <aragorn at tiscali.nl>
+    - add --add-udeb option for dh_makeshlibs which autogenerates the
+      udeb: lines for the shlibs file (Closes: #365293)
+    - this requires debhelper 5.0.22
+    - drop the Provides: libpango1.0- at SONAME@
+    - add a temporary hack in debian/rules to create a correct dependency on
+      libcairo2-directfb-udeb 
+  * debian/po/gl.po:
+    - Galician translation by Jacobo Tarrio <jtarrio at trasno.net> 
+      (Closes: #361268)
+  * debian/rules:
+    - updated the -dbg package name to work with the new compat
+
+ -- Sebastien Bacher <seb128 at canonical.com>  Sat,  6 May 2006 15:19:52 +0200
+
 pango1.0 (1.12.1-2) unstable; urgency=low
 
   * debian/control.in:

Modified: desktop/unstable/pango1.0/debian/compat
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/compat?rev=5906&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/compat (original)
+++ desktop/unstable/pango1.0/debian/compat Sat May  6 13:56:58 2006
@@ -1,1 +1,1 @@
-4
+5

Modified: desktop/unstable/pango1.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/control.in?rev=5906&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/control.in (original)
+++ desktop/unstable/pango1.0/debian/control.in Sat May  6 13:56:58 2006
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Sebastien Bacher <seb128 at debian.org>
 Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper (>= 4.9.12), libfreetype6-dev (>= 2.1.7), libx11-dev (>= 2:1.0.0), libxrender-dev (>= 1:0.9.0.2-2), libxt-dev, libglib2.0-dev (>= 2.10.0), pkg-config, defoma (>= 0.11.1), libxft-dev, libfontconfig1-dev (>= 2.1.91), autotools-dev, po-debconf, gnome-pkg-tools, libcairo2-dev (>= 1.0.0)
+Build-Depends: debhelper (>= 5.0.22), libfreetype6-dev (>= 2.1.7), libx11-dev (>= 2:1.0.0), libxrender-dev (>= 1:0.9.0.2-2), libxt-dev, libglib2.0-dev (>= 2.10.0), pkg-config, defoma (>= 0.11.1), libxft-dev, libfontconfig1-dev (>= 2.1.91), autotools-dev, po-debconf, gnome-pkg-tools, libcairo2-dev (>= 1.0.0)
 Standards-Version: 3.6.2
 
 Package: libpango1.0- at SONAME@
@@ -32,7 +32,6 @@
 Priority: optional
 Architecture: any
 Depends: ${shlibs:Depends}
-Provides: libpango1.0- at SONAME@
 Description: Layout and rendering of internationalized text
  This is a udeb, or a microdeb, for the debian-installer.
  .

Added: desktop/unstable/pango1.0/debian/po/gl.po
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/po/gl.po?rev=5906&op=file
==============================================================================
--- desktop/unstable/pango1.0/debian/po/gl.po (added)
+++ desktop/unstable/pango1.0/debian/po/gl.po Sat May  6 13:56:58 2006
@@ -1,0 +1,104 @@
+#
+#    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: pango1.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-06-05 15:53+0200\n"
+"PO-Revision-Date: 2006-04-07 16:30+0200\n"
+"Last-Translator: Jacobo Tarrio <jtarrio at debian.org>\n"
+"Language-Team: Galician <trasno at ceu.fi.udc.es>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\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 "¿Quere confiar a xestión dos tipos de letra a defoma?"
+
+#. Type: boolean
+#. Description
+#: ../libpango1.0-common.templates:4
+msgid ""
+"/etc/pango/pangox.aliases can now be managed by defoma. You can choose here "
+"whether to use defoma or not for managing pango fonts. This will be the case "
+"when you have defomized font packages already installed."
+msgstr ""
+"Agora defoma pode xestionar /etc/pango/pangox.aliases. Pode escoller aquí se "
+"quere empregar defoma ou non para xestionar os tipos de letra de pango. Isto "
+"ha ser o caso cando teña paquetes de tipos de letra defomizados xa "
+"instalados."
+
+#. Type: boolean
+#. Description
+#: ../libpango1.0-common.templates:4
+msgid ""
+"If you say 'Yes' here, /etc/pango/pangox.aliases will be a symbolic link to /"
+"var/lib/defoma/pango.d/pangox.aliases, which defoma actually manages. The "
+"file will be re-generated by defoma when you install/upgrade/remove "
+"defomized font packages."
+msgstr ""
+"Se aquí di \"Si\", /etc/pango/pangox.aliases ha ser unha ligazón simbólica "
+"a /var/lib/defoma/pango.d/pangox.aliases, que xestiona defoma. O ficheiro "
+"hao rexenerar defoma cando instale/actualice/elimine paquetes de tipos de "
+"letra defomizados."
+
+#. Type: boolean
+#. Description
+#: ../libpango1.0-common.templates:4
+msgid ""
+"If you don't want to use defoma and you prefer to edit pangox.aliases "
+"manually, choose 'No' here."
+msgstr ""
+"Se non quere empregar defoma e prefire editar pangox.aliases a man, escolla "
+"\"Non\" aquí."
+
+#. Type: boolean
+#. Description
+#: ../libpango1.0-common.templates:4
+msgid ""
+"You can run dpkg-reconfigure later, to have defomized /etc/pango/pangox."
+"aliases or manage the file by yourself."
+msgstr ""
+"Pode executar dpkg-reconfigure máis tarde se quere ter o /etc/pango/pangox."
+"aliases defomizado ou se quere xestionar vostede o ficheiro."
+
+#. Type: note
+#. Description
+#: ../libpango1.0-common.templates:22
+msgid ""
+"Your old pangox.aliases file has been saved as /etc/pango/pangox.aliases-old."
+msgstr ""
+"O seu antigo ficheiro pangox.aliases gravouse en /etc/pango/pangox.aliases-"
+"old."
+
+#. Type: note
+#. Description
+#: ../libpango1.0-common.templates:28
+msgid "pangox.aliases configuration"
+msgstr "Configuración de pangox.aliases"
+
+#. Type: note
+#. Description
+#: ../libpango1.0-common.templates:28
+msgid ""
+"/etc/pango/pangox.aliases was not found. Now update-pangox-aliases will "
+"generate a default pangox.aliases. You may modify the generated file to be "
+"suitable for your needs."
+msgstr ""
+"Non se atopou o ficheiro /etc/pango/pangox.aliases. Agora update-pangox-"
+"aliases ha xerar un ficheiro pangox.aliases por defecto. Pode modificar o "
+"ficheiro xerado para que se axuste ás súas necesidades."

Modified: desktop/unstable/pango1.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/rules?rev=5906&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/rules (original)
+++ desktop/unstable/pango1.0/debian/rules Sat May  6 13:56:58 2006
@@ -47,7 +47,6 @@
 modver=1.5.0
 libpath=$(CURDIR)/$(BUILD_SHARED_DIR)/pango/.libs
 udeblibpath=$(CURDIR)/$(BUILD_UDEB_DIR)/pango/.libs
-udebname=libpango$(apiver)-udeb_$(debversion)_$(shell dpkg-architecture -qDEB_BUILD_ARCH).udeb
 
 
 debian/control:
@@ -296,7 +295,7 @@
 	dh_builddeb -i
 
 # Build architecture-dependent files here.
-binary-arch: build install binary-arch-udeb
+binary-arch: build build-udeb install install-udeb
 	dh_testdir -a
 	dh_testroot -a
 
@@ -317,38 +316,22 @@
 	dh_installman -a
 	dh_installinfo -a
 	dh_installchangelogs $(BUILD_DIR)/ChangeLog
-	dh_strip -a --dbg-package=libpango$(apiver)-$(soname)
+	dh_strip -a --dbg-package=libpango$(apiver)-$(soname)-dbg
 	dh_compress -a
 	dh_fixperms -a
-	dh_makeshlibs -plibpango$(apiver)-$(soname) -X usr/lib/pango/$(modver)/modules -V "libpango${apiver}-${soname} (>= ${version})"
+	dh_makeshlibs -plibpango$(apiver)-$(soname) -X usr/lib/pango/$(modver)/modules -V "libpango${apiver}-${soname} (>= ${version})" --add-udeb="libpango$(apiver)-udeb"
 	dh_makeshlibs -n -plibpango$(apiver)-common
 	dh_makeshlibs -plibpango$(apiver)-dev
 	dh_installdeb -a
 	dh_shlibdeps -l$(libpath) -a
-	cat debian/*/DEBIAN/shlibs > debian/shlibs.local
-	dh_gencontrol -a -Nlibpango$(apiver)-udeb
-	dh_md5sums -a -Nlibpango$(apiver)-udeb
-	dh_builddeb -a -Nlibpango$(apiver)-udeb
-
-binary-arch-udeb: build-udeb install-udeb
-	dh_testdir -a -plibpango$(apiver)-udeb
-	dh_testroot -a -plibpango$(apiver)-udeb
-
-	dh_installdebconf -a -plibpango$(apiver)-udeb
-	dh_strip -plibpango$(apiver)-udeb
-	dh_compress -a -plibpango$(apiver)-udeb
-	dh_fixperms -a -plibpango$(apiver)-udeb
-	dh_installdeb -a -plibpango$(apiver)-udeb
-	-rm -f $(CURDIR)/debian/shlibs.local
-	dh_shlibdeps -l$(udeblibpath) -plibpango$(apiver)-udeb
-	# hmm, I don't know but need to fix the self dependency.
-	sed -e 's/, libpango$(apiver)-$(soname) (>= [.0-9]*)//' $(CURDIR)/debian/libpango$(apiver)-udeb.substvars > $(CURDIR)/debian/libpango$(apiver)-udeb.substvars.new
-	mv $(CURDIR)/debian/libpango$(apiver)-udeb.substvars.new \
-	   $(CURDIR)/debian/libpango$(apiver)-udeb.substvars
-	dh_gencontrol -a -plibpango$(apiver)-udeb -- -fdebian/files~
-	dpkg-distaddfile $(udebname) debian-installer optional
-
-	dh_builddeb -plibpango$(apiver)-udeb --filename=$(udebname)
-
-binary: binary-indep binary-arch binary-arch-udeb
-.PHONY: build build-shared build-static build-udeb clean binary-indep binary-arch binary-arch-udeb binary install install-shared install-static install-udeb configure configure-shared configure-static configure-udeb debian/control update-po debian/po/templates.pot
+	# Hmm, I don't know but need to fix the self dependency for the udeb
+	sed -i 's/, libpango$(apiver)-udeb (>= [.0-9]*)//' $(CURDIR)/debian/libpango$(apiver)-udeb.substvars
+	# As the libcairo udeb is not produced by the libcairo package,
+	# we temporarily have to hack that dependency
+	sed -i 's/libcairo2 (>= [-.0-9]*)/libcairo2-directfb-udeb (>= 1.0.4)/' $(CURDIR)/debian/libpango$(apiver)-udeb.substvars
+	dh_gencontrol -a
+	dh_md5sums -a
+	dh_builddeb -a
+
+binary: binary-indep binary-arch
+.PHONY: build build-shared build-static build-udeb clean binary-indep binary-arch binary install install-shared install-static install-udeb configure configure-shared configure-static configure-udeb debian/control update-po debian/po/templates.pot

More information about the Pkg-gnome-maintainers mailing list