r36804 - in /desktop/experimental/gtk+2.0/debian: changelog gtk2-engines-pixbuf.links.in libgtk2.0-0-dbg.links.in libgtk2.0-0.links.in libgtk2.0-bin.links.in libgtk2.0-dev.links.in rules
jbicha-guest at users.alioth.debian.org
jbicha-guest at users.alioth.debian.org
Mon Feb 25 18:13:55 UTC 2013
Author: jbicha-guest
Date: Mon Feb 25 18:13:54 2013
New Revision: 36804
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=36804
Log:
* Remove dh_installdoc calls which install files that are supposed to be
symlinked to the -common package. These symlinks get overwritten later on
(by dh_compress), turning back into real files and breaking multiarch
coinstallability (LP: #1132881)
* Symlink AUTHORS files to -common too
Modified:
desktop/experimental/gtk+2.0/debian/changelog
desktop/experimental/gtk+2.0/debian/gtk2-engines-pixbuf.links.in
desktop/experimental/gtk+2.0/debian/libgtk2.0-0-dbg.links.in
desktop/experimental/gtk+2.0/debian/libgtk2.0-0.links.in
desktop/experimental/gtk+2.0/debian/libgtk2.0-bin.links.in
desktop/experimental/gtk+2.0/debian/libgtk2.0-dev.links.in
desktop/experimental/gtk+2.0/debian/rules
Modified: desktop/experimental/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/changelog?rev=36804&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/changelog [utf-8] Mon Feb 25 18:13:54 2013
@@ -1,3 +1,13 @@
+gtk+2.0 (2.24.16-2) UNRELEASED; urgency=low
+
+ * Remove dh_installdoc calls which install files that are supposed to be
+ symlinked to the -common package. These symlinks get overwritten later on
+ (by dh_compress), turning back into real files and breaking multiarch
+ coinstallability (LP: #1132881)
+ * Symlink AUTHORS files to -common too
+
+ -- Iain Lane <iain.lane at canonical.com> Mon, 25 Feb 2013 17:46:26 +0000
+
gtk+2.0 (2.24.16-1) experimental; urgency=low
* New upstream release.
Modified: desktop/experimental/gtk+2.0/debian/gtk2-engines-pixbuf.links.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/gtk2-engines-pixbuf.links.in?rev=36804&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/gtk2-engines-pixbuf.links.in [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/gtk2-engines-pixbuf.links.in [utf-8] Mon Feb 25 18:13:54 2013
@@ -1,3 +1,4 @@
usr/share/doc/@COMMON_PKG@/changelog.gz usr/share/doc/@PIXBUF_PKG@/changelog.gz
usr/share/doc/@COMMON_PKG@/NEWS.gz usr/share/doc/@PIXBUF_PKG@/NEWS.gz
usr/share/doc/@COMMON_PKG@/README.gz usr/share/doc/@PIXBUF_PKG@/README.gz
+usr/share/doc/@COMMON_PKG@/AUTHORS usr/share/doc/@PIXBUF_PKG@/AUTHORS
Modified: desktop/experimental/gtk+2.0/debian/libgtk2.0-0-dbg.links.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/libgtk2.0-0-dbg.links.in?rev=36804&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/libgtk2.0-0-dbg.links.in [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/libgtk2.0-0-dbg.links.in [utf-8] Mon Feb 25 18:13:54 2013
@@ -1,3 +1,4 @@
usr/share/doc/@COMMON_PKG@/changelog.gz usr/share/doc/@DEBUG_PKG@/changelog.gz
usr/share/doc/@COMMON_PKG@/NEWS.gz usr/share/doc/@DEBUG_PKG@/NEWS.gz
usr/share/doc/@COMMON_PKG@/README.gz usr/share/doc/@DEBUG_PKG@/README.gz
+usr/share/doc/@COMMON_PKG@/AUTHORS usr/share/doc/@DEBUG_PKG@/AUTHORS
Modified: desktop/experimental/gtk+2.0/debian/libgtk2.0-0.links.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/libgtk2.0-0.links.in?rev=36804&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/libgtk2.0-0.links.in [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/libgtk2.0-0.links.in [utf-8] Mon Feb 25 18:13:54 2013
@@ -1,3 +1,4 @@
usr/share/doc/@COMMON_PKG@/changelog.gz usr/share/doc/@SHARED_PKG@/changelog.gz
usr/share/doc/@COMMON_PKG@/NEWS.gz usr/share/doc/@SHARED_PKG@/NEWS.gz
usr/share/doc/@COMMON_PKG@/README.gz usr/share/doc/@SHARED_PKG@/README.gz
+usr/share/doc/@COMMON_PKG@/AUTHORS usr/share/doc/@SHARED_PKG@/AUTHORS
Modified: desktop/experimental/gtk+2.0/debian/libgtk2.0-bin.links.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/libgtk2.0-bin.links.in?rev=36804&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/libgtk2.0-bin.links.in [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/libgtk2.0-bin.links.in [utf-8] Mon Feb 25 18:13:54 2013
@@ -2,3 +2,4 @@
usr/share/doc/@COMMON_PKG@/changelog.gz usr/share/doc/@BIN_PKG@/changelog.gz
usr/share/doc/@COMMON_PKG@/NEWS.gz usr/share/doc/@BIN_PKG@/NEWS.gz
usr/share/doc/@COMMON_PKG@/README.gz usr/share/doc/@BIN_PKG@/README.gz
+usr/share/doc/@COMMON_PKG@/AUTHORS usr/share/doc/@BIN_PKG@/AUTHORS
Modified: desktop/experimental/gtk+2.0/debian/libgtk2.0-dev.links.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/libgtk2.0-dev.links.in?rev=36804&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/libgtk2.0-dev.links.in [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/libgtk2.0-dev.links.in [utf-8] Mon Feb 25 18:13:54 2013
@@ -1,3 +1,4 @@
usr/share/doc/@COMMON_PKG@/changelog.gz usr/share/doc/@DEV_PKG@/changelog.gz
usr/share/doc/@COMMON_PKG@/NEWS.gz usr/share/doc/@DEV_PKG@/NEWS.gz
usr/share/doc/@COMMON_PKG@/README.gz usr/share/doc/@DEV_PKG@/README.gz
+usr/share/doc/@COMMON_PKG@/AUTHORS usr/share/doc/@DEV_PKG@/AUTHORS
Modified: desktop/experimental/gtk+2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/rules?rev=36804&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/rules [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/rules [utf-8] Mon Feb 25 18:13:54 2013
@@ -286,9 +286,6 @@
dh_install -s
# changelog.gz symlinks will be overwritten by dh_link
dh_installchangelogs -s ChangeLog
- # do not merge the calls: dh_installdocs only installs in the first pkg
- dh_installdocs -p$(EXAMPLES_PKG) $(DH_INSTALLDOCS_FILES)
- dh_installdocs -p$(PIXBUF_PKG) $(DH_INSTALLDOCS_FILES)
# install copyright in all packages; the -p is for the special behavior
# of dh_installdocs (ship README.Debian etc. in the first package)
dh_installdocs -p$(PIXBUF_PKG) -s
More information about the pkg-gnome-commits
mailing list