r11004 - in /desktop/unstable/pango1.0/debian: README.Debian changelog docs libpango1.0-0.links.in libpango1.0-0.postinst.in libpango1.0-common.README.Debian libpango1.0-common.docs libpango1.0-common.links.in libpango1.0-common.preinst.in rules

joss at users.alioth.debian.org joss at users.alioth.debian.org
Tue May 15 23:09:53 UTC 2007 

Author: joss
Date: Tue May 15 23:09:53 2007
New Revision: 11004

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=11004
Log:
* Whoops. Re-commit some things that were uploaded as part of 1.16.2-2 
  but not committed.
* rules: remove the pango-thai-lang module, as it introduces too many
* Fix the incorrect libpango1.0-common -> libpango1.0-0 documentation 
  link.
  + Install docs in libpango1.0-common instead.
  + Reverse the symlink.
  + libpango1.0-common.preinst.in: remove the old symlink.
  + libpango1.0-0.postinst.in: create the new one.

Added:
    desktop/unstable/pango1.0/debian/libpango1.0-0.links.in
      - copied, changed from r10168, desktop/unstable/pango1.0/debian/libpango1.0-common.links.in
    desktop/unstable/pango1.0/debian/libpango1.0-0.postinst.in
    desktop/unstable/pango1.0/debian/libpango1.0-common.README.Debian
      - copied unchanged from r10168, desktop/unstable/pango1.0/debian/README.Debian
    desktop/unstable/pango1.0/debian/libpango1.0-common.docs
      - copied unchanged from r10168, desktop/unstable/pango1.0/debian/docs
    desktop/unstable/pango1.0/debian/libpango1.0-common.preinst.in
Removed:
    desktop/unstable/pango1.0/debian/README.Debian
    desktop/unstable/pango1.0/debian/docs
    desktop/unstable/pango1.0/debian/libpango1.0-common.links.in
Modified:
    desktop/unstable/pango1.0/debian/changelog
    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=11004&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/changelog (original)
+++ desktop/unstable/pango1.0/debian/changelog Tue May 15 23:09:53 2007
@@ -1,3 +1,10 @@
+pango1.0 (1.16.4-2) UNRELEASED; urgency=low
+
+  * Whoops. Re-commit some things that were uploaded as part of 1.16.2-2 
+    but not committed.
+
+ -- Josselin Mouette <joss at debian.org>  Wed, 16 May 2007 01:09:07 +0200
+
 pango1.0 (1.16.4-1) unstable; urgency=low
 
   * Drop "libtool_is_fool" snippet patching hardcode_libdir_flag_spec and
@@ -15,10 +22,16 @@
   * rules: use it for libpango1.0-0 and libpango1.0-udeb to avoid a
     self-dependency for the former, and an impossible dependency for the
     latter (closes: #419593).
-  * rules: remove the pango-thai-lang module, as it introduces too many 
+  * rules: remove the pango-thai-lang module, as it introduces too many
     dependencies for the udeb (closes: #419595).
-
- -- Josselin Mouette <joss at debian.org>  Fri, 20 Apr 2007 16:24:02 +0200
+  * Fix the incorrect libpango1.0-common -> libpango1.0-0 documentation 
+    link.
+    + Install docs in libpango1.0-common instead.
+    + Reverse the symlink.
+    + libpango1.0-common.preinst.in: remove the old symlink.
+    + libpango1.0-0.postinst.in: create the new one.
+
+ -- Josselin Mouette <joss at debian.org>  Fri, 20 Apr 2007 20:53:39 +0200
 
 pango1.0 (1.16.2-1) unstable; urgency=low
 

Copied: desktop/unstable/pango1.0/debian/libpango1.0-0.links.in (from r10168, desktop/unstable/pango1.0/debian/libpango1.0-common.links.in)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/libpango1.0-0.links.in?rev=11004&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/libpango1.0-common.links.in (original)
+++ desktop/unstable/pango1.0/debian/libpango1.0-0.links.in Tue May 15 23:09:53 2007
@@ -1,1 +1,1 @@
-usr/share/doc/libpango at APIVER@- at SONAME@ usr/share/doc/libpango at APIVER@-common
+usr/share/doc/libpango at APIVER@-common usr/share/doc/libpango at APIVER@- at SONAME@

Added: desktop/unstable/pango1.0/debian/libpango1.0-0.postinst.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/libpango1.0-0.postinst.in?rev=11004&op=file
==============================================================================
--- desktop/unstable/pango1.0/debian/libpango1.0-0.postinst.in (added)
+++ desktop/unstable/pango1.0/debian/libpango1.0-0.postinst.in Tue May 15 23:09:53 2007
@@ -1,0 +1,12 @@
+#! /bin/sh
+set -e
+
+DOCDIR=/usr/share/doc/libpango at APIVER@- at SONAME@
+if [ -d $DOCDIR ] && [ ! -L $DOCDIR ]; then
+  rm -rf $DOCDIR
+  ln -sf libpango at APIVER@-common $DOCDIR
+fi
+
+#DEBHELPER#
+
+exit 0

Added: desktop/unstable/pango1.0/debian/libpango1.0-common.preinst.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/libpango1.0-common.preinst.in?rev=11004&op=file
==============================================================================
--- desktop/unstable/pango1.0/debian/libpango1.0-common.preinst.in (added)
+++ desktop/unstable/pango1.0/debian/libpango1.0-common.preinst.in Tue May 15 23:09:53 2007
@@ -1,0 +1,10 @@
+#!/bin/sh
+set -e
+
+if [ -L /usr/share/doc/libpango at APIVER@-common ]; then
+        rm -f /usr/share/doc/libpango at APIVER@-common
+fi
+
+#DEBHELPER#
+
+exit 0

Modified: desktop/unstable/pango1.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/rules?rev=11004&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/rules (original)
+++ desktop/unstable/pango1.0/debian/rules Tue May 15 23:09:53 2007
@@ -217,8 +217,8 @@
 	dh_testroot
 	dh_installdirs -i
 	dh_install -i
-	dh_installchangelogs -i -N$(COMMON_PKG) ChangeLog ChangeLog.*
-	dh_installdocs -i -N$(COMMON_PKG) NEWS README
+	dh_installchangelogs -i ChangeLog ChangeLog.*
+	dh_installdocs -i NEWS README
 	dh_installman -i
 	dh_link -i
 	dh_compress -i
@@ -237,8 +237,8 @@
 	# empty the dependency_libs in the *.la files
 	sed -i "/dependency_libs/ s/'.*'/''/" \
 		debian/$(DEV_PKG)/$(LIBDIR)/*.la
-	dh_installchangelogs -a -N$(DEV_PKG) ChangeLog ChangeLog.*
-	dh_installdocs -a -N$(DEV_PKG) NEWS README
+	dh_installchangelogs -a -N$(SHARED_PKG) -N$(DEV_PKG) ChangeLog ChangeLog.*
+	dh_installdocs -a -N$(SHARED_PKG) -N$(DEV_PKG) NEWS README
 	dh_installdefoma -a
 	# fix the permissions of the development package because it ships
 	# dh_pangomodules which we need to invoke in this build

More information about the pkg-gnome-commits mailing list