[maemo-commits] [maemo-commits] r17271 - projects/haf/trunk/pango1.0/debian

[From: subversion at stage.maemo.org]

Author: kalikiana
Date: 2009-01-23 17:51:34 +0200 (Fri, 23 Jan 2009)
New Revision: 17271

Modified:
   projects/haf/trunk/pango1.0/debian/changelog
   projects/haf/trunk/pango1.0/debian/libpango1.0-0.install
   projects/haf/trunk/pango1.0/debian/libpango1.0-common.install
   projects/haf/trunk/pango1.0/debian/libpango1.0-dev.install
   projects/haf/trunk/pango1.0/debian/libpango1.0-doc.doc-base
   projects/haf/trunk/pango1.0/debian/libpango1.0-doc.install
   projects/haf/trunk/pango1.0/debian/libpango1.0.postinst
   projects/haf/trunk/pango1.0/debian/rules
Log:
pango1.0 (1.20.1-2maemo3) unstable; urgency=low

  * Revisit where which files belong to fix conflicts
  * Alter module setup so that fonts actually work

 -- Christian Dywan <christian at imendio.com>  Fri, 23 Jan 2009 16:48:11 +0100

Modified: projects/haf/trunk/pango1.0/debian/changelog
===================================================================
--- projects/haf/trunk/pango1.0/debian/changelog	2009-01-23 13:00:22 UTC (rev 17270)
+++ projects/haf/trunk/pango1.0/debian/changelog	2009-01-23 15:51:34 UTC (rev 17271)
@@ -1,5 +1,12 @@
 pango1.0 (1.20.1-2maemo3) unstable; urgency=low
 
+  * Revisit where which files belong to fix conflicts
+  * Alter module setup so that fonts actually work
+
+ -- Christian Dywan <christian at imendio.com>  Fri, 23 Jan 2009 16:48:11 +0100
+
+pango1.0 (1.20.1-2maemo3) unstable; urgency=low
+
   * Fix libpango1.0-0.install wildcards, to catch all .so symlinks.
 
  -- Christian Dywan <christian at imendio.com>  Fri, 09 Nov 2008 13:18:11 +0100

Modified: projects/haf/trunk/pango1.0/debian/libpango1.0-0.install
===================================================================
--- projects/haf/trunk/pango1.0/debian/libpango1.0-0.install	2009-01-23 13:00:22 UTC (rev 17270)
+++ projects/haf/trunk/pango1.0/debian/libpango1.0-0.install	2009-01-23 15:51:34 UTC (rev 17271)
@@ -1,4 +1,2 @@
-debian/tmp/usr/lib/lib*.so
 debian/tmp/usr/lib/lib*.so.*
 debian/tmp/usr/lib/pango/*/modules/*.so
-debian/tmp/usr/lib/pango/*/module-files.d/libpango1.0-0.modules

Modified: projects/haf/trunk/pango1.0/debian/libpango1.0-common.install
===================================================================
--- projects/haf/trunk/pango1.0/debian/libpango1.0-common.install	2009-01-23 13:00:22 UTC (rev 17270)
+++ projects/haf/trunk/pango1.0/debian/libpango1.0-common.install	2009-01-23 15:51:34 UTC (rev 17271)
@@ -1,6 +1,6 @@
-debian/tmp/usr/share/defoma/scripts/*
-debian/tmp/etc/defoma/config/*
-debian/tmp/etc/pango/pangox.aliases
-debian/tmp/var/lib/defoma/pango.d/*
+debian/tmp/etc/pango/*
 debian/update-pango-modules usr/sbin
 debian/update-pangox-aliases usr/sbin
+debian/tmp/usr/bin/pango-querymodules
+debian/tmp/usr/bin/pango-view
+debian/tmp/usr/share/man/man1/pango-querymodules.1

Modified: projects/haf/trunk/pango1.0/debian/libpango1.0-dev.install
===================================================================
--- projects/haf/trunk/pango1.0/debian/libpango1.0-dev.install	2009-01-23 13:00:22 UTC (rev 17270)
+++ projects/haf/trunk/pango1.0/debian/libpango1.0-dev.install	2009-01-23 15:51:34 UTC (rev 17271)
@@ -1,7 +1,4 @@
 debian/tmp/usr/include/*
-debian/tmp/usr/lib/lib*.{*a}
+debian/tmp/usr/lib/lib*.{so,a}
 debian/tmp/usr/lib/pkgconfig/*.pc
 debian/tmp/usr/lib/pango/*/modules/*.{a}
-debian/tmp/usr/share/man/man1/pango-querymodules.1
-debian/tmp/usr/bin/pango-querymodules
-debian/tmp/usr/bin/pango-view

Modified: projects/haf/trunk/pango1.0/debian/libpango1.0-doc.doc-base
===================================================================
--- projects/haf/trunk/pango1.0/debian/libpango1.0-doc.doc-base	2009-01-23 13:00:22 UTC (rev 17270)
+++ projects/haf/trunk/pango1.0/debian/libpango1.0-doc.doc-base	2009-01-23 15:51:34 UTC (rev 17271)
@@ -8,6 +8,6 @@
 Section: Apps/Programming
 
 Format: HTML
-Index: /usr/share/doc/libpango1.0-doc/pango/index.html
-Files: /usr/share/doc/libpango1.0-doc/pango/*.html
+Index: /usr/share/gtk-doc/html/pango/index.html
+Files: /usr/share/gtk-doc/html/pango/*.html
 

Modified: projects/haf/trunk/pango1.0/debian/libpango1.0-doc.install
===================================================================
--- projects/haf/trunk/pango1.0/debian/libpango1.0-doc.install	2009-01-23 13:00:22 UTC (rev 17270)
+++ projects/haf/trunk/pango1.0/debian/libpango1.0-doc.install	2009-01-23 15:51:34 UTC (rev 17271)
@@ -1,2 +1 @@
-debian/tmp/usr/share/doc/libpango1.0-doc/*
 debian/tmp/usr/share/gtk-doc/html/pango/*

Modified: projects/haf/trunk/pango1.0/debian/libpango1.0.postinst
===================================================================
--- projects/haf/trunk/pango1.0/debian/libpango1.0.postinst	2009-01-23 13:00:22 UTC (rev 17270)
+++ projects/haf/trunk/pango1.0/debian/libpango1.0.postinst	2009-01-23 15:51:34 UTC (rev 17271)
@@ -2,11 +2,10 @@
 # postinst script for pango
 #
 # see: dh_installdeb(1)
-/usr/sbin/update-pango-modules
-exit
+
 set -e
 
-. /usr/share/debconf/confmodule
+#. /usr/share/debconf/confmodule
 
 # summary of how this script can be called:
 #        * <postinst> `configure' <most-recently-configured-version>
@@ -68,5 +67,3 @@
 #DEBHELPER#
 
 exit 0
-
-

Modified: projects/haf/trunk/pango1.0/debian/rules
===================================================================
--- projects/haf/trunk/pango1.0/debian/rules	2009-01-23 13:00:22 UTC (rev 17270)
+++ projects/haf/trunk/pango1.0/debian/rules	2009-01-23 15:51:34 UTC (rev 17271)
@@ -7,7 +7,6 @@
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/cdbs/1/rules/tarball.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
 
 DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,-O1 -Wl,-z,defs -Wl,--as-needed"
 
@@ -31,3 +30,6 @@
 DEB_DH_MAKESHLIBS_ARGS_libpango1.0-0 := -V"libpango1.0-0 (>= $(SHLIB_VERSION))"
 
 DEB_DH_STRIP_ARGS := --dbg-package=libpango1.0-0
+
+install/libpango1.0-common::
+	debian/tmp/usr/bin/pango-querymodules > debian/tmp/etc/pango/pango.modules