r14298 - /desktop/unstable/gtk+2.0/debian/
lool at users.alioth.debian.org
lool at users.alioth.debian.org
Mon Jan 21 16:57:31 UTC 2008
Author: lool
Date: Mon Jan 21 16:57:30 2008
New Revision: 14298
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=14298
Log:
* Rework /usr/share/doc symlinks completely; closes: #461440.
- Use a real directory for all packages using a symlink previously:
libgtk2.0-bin, libgtk-directfb-2.0-dev, libgtk2.0-dev, libgtk2.0-0-dbg,
libgtk-directfb-2.0-0, libgtk2.0-0; add a preinst snippet removing the
path on upgrade if it's a symlink and points to the proper directory;
add a prerm snippet removing the path on upgrade (for downgrades) if
it's a directory (and not a symlink).
- Create symlinks for changelog.gz, NEWS.gz, NEWS.pre-1-0.gz, and
README.gz in the /usr/share/doc dirs of these packages as well as for
gtk2-engines-pixbuf; add a libgtk2.0-common unversionned dependency for
all these packages.
- Split dh_installdocs and dh_installchangelogs calls on multiple packages
and use one call per package as the intent was to install in all the
specified packages; also call dh_installdocs and dh_installchangelogs
without any extra file for all packages to install copyright and Debian
changelog.
- Factor the list of dh_installdocs files in DH_INSTALLDOCS_FILES in
rules.
Added:
desktop/unstable/gtk+2.0/debian/gtk2-engines-pixbuf.links.in
desktop/unstable/gtk+2.0/debian/libgtk-directfb-2.0-0.preinst
desktop/unstable/gtk+2.0/debian/libgtk-directfb-2.0-0.prerm
desktop/unstable/gtk+2.0/debian/libgtk-directfb-2.0-dev.preinst
desktop/unstable/gtk+2.0/debian/libgtk-directfb-2.0-dev.prerm
desktop/unstable/gtk+2.0/debian/libgtk2.0-0-dbg.preinst
desktop/unstable/gtk+2.0/debian/libgtk2.0-0-dbg.prerm
desktop/unstable/gtk+2.0/debian/libgtk2.0-0.preinst
desktop/unstable/gtk+2.0/debian/libgtk2.0-0.prerm
desktop/unstable/gtk+2.0/debian/libgtk2.0-bin.preinst
desktop/unstable/gtk+2.0/debian/libgtk2.0-bin.prerm
desktop/unstable/gtk+2.0/debian/libgtk2.0-dev.preinst
desktop/unstable/gtk+2.0/debian/libgtk2.0-dev.prerm
Modified:
desktop/unstable/gtk+2.0/debian/changelog
desktop/unstable/gtk+2.0/debian/control
desktop/unstable/gtk+2.0/debian/control.in
desktop/unstable/gtk+2.0/debian/libgtk-directfb-2.0-0.links.in
desktop/unstable/gtk+2.0/debian/libgtk-directfb-2.0-dev.links.in
desktop/unstable/gtk+2.0/debian/libgtk2.0-0-dbg.links.in
desktop/unstable/gtk+2.0/debian/libgtk2.0-0.links.in
desktop/unstable/gtk+2.0/debian/libgtk2.0-bin.links.in
desktop/unstable/gtk+2.0/debian/libgtk2.0-dev.links.in
desktop/unstable/gtk+2.0/debian/rules
Modified: desktop/unstable/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/changelog?rev=14298&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/changelog (original)
+++ desktop/unstable/gtk+2.0/debian/changelog Mon Jan 21 16:57:30 2008
@@ -1,6 +1,24 @@
-gtk+2.0 (2.12.5-2) UNRELEASED; urgency=low
+gtk+2.0 (2.12.5-2) unstable; urgency=medium
* Add ${shlibs:Depends} to libgtk2.0-dev.
+ * Rework /usr/share/doc symlinks completely; closes: #461440.
+ - Use a real directory for all packages using a symlink previously:
+ libgtk2.0-bin, libgtk-directfb-2.0-dev, libgtk2.0-dev, libgtk2.0-0-dbg,
+ libgtk-directfb-2.0-0, libgtk2.0-0; add a preinst snippet removing the
+ path on upgrade if it's a symlink and points to the proper directory;
+ add a prerm snippet removing the path on upgrade (for downgrades) if
+ it's a directory (and not a symlink).
+ - Create symlinks for changelog.gz, NEWS.gz, NEWS.pre-1-0.gz, and
+ README.gz in the /usr/share/doc dirs of these packages as well as for
+ gtk2-engines-pixbuf; add a libgtk2.0-common unversionned dependency for
+ all these packages.
+ - Split dh_installdocs and dh_installchangelogs calls on multiple packages
+ and use one call per package as the intent was to install in all the
+ specified packages; also call dh_installdocs and dh_installchangelogs
+ without any extra file for all packages to install copyright and Debian
+ changelog.
+ - Factor the list of dh_installdocs files in DH_INSTALLDOCS_FILES in
+ rules.
-- Loic Minier <lool at dooz.org> Fri, 18 Jan 2008 10:38:43 +0100
Modified: desktop/unstable/gtk+2.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/control?rev=14298&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/control (original)
+++ desktop/unstable/gtk+2.0/debian/control Mon Jan 21 16:57:30 2008
@@ -112,6 +112,7 @@
Section: libs
Architecture: any
Depends: libgtk2.0-0 (= ${binary:Version}),
+ libgtk2.0-common,
${misc:Depends},
${shlibs:Depends}
Conflicts: libgtk+2.0-directfb0
@@ -165,7 +166,8 @@
Section: misc
Architecture: all
Depends: ${misc:Depends},
- libgtk2.0-0 (>= ${source:Version})
+ libgtk2.0-0 (>= ${source:Version}),
+ libgtk2.0-common
Replaces: libgtk2.0-common (<= 2.4.0-3),
libgtk2.0-dev (<= 2.4.3-1)
Conflicts: libgtk2.0-dev (<= 2.4.3-1)
@@ -182,6 +184,7 @@
Section: libdevel
Architecture: any
Depends: libgtk2.0-0 (= ${binary:Version}),
+ libgtk2.0-common,
${misc:Depends},
${shlibs:Depends},
libglib2.0-dev (>= 2.12.0),
@@ -218,6 +221,7 @@
Depends: libgtk-directfb-2.0-0 (= ${binary:Version}),
${misc:Depends},
libgtk2.0-dev (= ${binary:Version}),
+ libgtk2.0-common,
libcairo-directfb2-dev,
libcairo2-dev (>= 1.2.0)
Conflicts: libgtk+2.0-directfb-dev
@@ -236,6 +240,7 @@
Priority: extra
Architecture: any
Depends: libgtk2.0-0 (= ${binary:Version}),
+ libgtk2.0-common,
${misc:Depends}
Conflicts: libgtk2.0-dbg
Replaces: libgtk2.0-dbg
@@ -291,7 +296,8 @@
Architecture: any
Depends: ${misc:Depends},
${shlibs:Depends},
- libgtk2.0-0 (= ${binary:Version})
+ libgtk2.0-0 (= ${binary:Version}),
+ libgtk2.0-common
Conflicts: gtk2.0-engines-pixbuf
Replaces: gtk2.0-engines-pixbuf
Description: Pixbuf-based theme for GTK+ 2.x
Modified: desktop/unstable/gtk+2.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/control.in?rev=14298&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/control.in (original)
+++ desktop/unstable/gtk+2.0/debian/control.in Mon Jan 21 16:57:30 2008
@@ -112,6 +112,7 @@
Section: libs
Architecture: any
Depends: @SHARED_PKG@ (= ${binary:Version}),
+ @COMMON_PKG@,
${misc:Depends},
${shlibs:Depends}
Conflicts: libgtk+2.0-directfb0
@@ -165,7 +166,8 @@
Section: misc
Architecture: all
Depends: ${misc:Depends},
- @SHARED_PKG@ (>= ${source:Version})
+ @SHARED_PKG@ (>= ${source:Version}),
+ @COMMON_PKG@
Replaces: libgtk2.0-common (<= 2.4.0-3),
libgtk2.0-dev (<= 2.4.3-1)
Conflicts: libgtk2.0-dev (<= 2.4.3-1)
@@ -182,6 +184,7 @@
Section: libdevel
Architecture: any
Depends: @SHARED_PKG@ (= ${binary:Version}),
+ @COMMON_PKG@,
${misc:Depends},
${shlibs:Depends},
libglib2.0-dev (>= 2.12.0),
@@ -218,6 +221,7 @@
Depends: @DIRECTFB_PKG@ (= ${binary:Version}),
${misc:Depends},
@DEV_PKG@ (= ${binary:Version}),
+ @COMMON_PKG@,
libcairo-directfb2-dev,
libcairo2-dev (>= 1.2.0)
Conflicts: libgtk+2.0-directfb-dev
@@ -236,6 +240,7 @@
Priority: extra
Architecture: any
Depends: @SHARED_PKG@ (= ${binary:Version}),
+ @COMMON_PKG@,
${misc:Depends}
Conflicts: libgtk2.0-dbg
Replaces: libgtk2.0-dbg
@@ -291,7 +296,8 @@
Architecture: any
Depends: ${misc:Depends},
${shlibs:Depends},
- @SHARED_PKG@ (= ${binary:Version})
+ @SHARED_PKG@ (= ${binary:Version}),
+ @COMMON_PKG@
Conflicts: gtk2.0-engines-pixbuf
Replaces: gtk2.0-engines-pixbuf
Description: Pixbuf-based theme for GTK+ 2.x
Added: desktop/unstable/gtk+2.0/debian/gtk2-engines-pixbuf.links.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/gtk2-engines-pixbuf.links.in?rev=14298&op=file
==============================================================================
--- desktop/unstable/gtk+2.0/debian/gtk2-engines-pixbuf.links.in (added)
+++ desktop/unstable/gtk+2.0/debian/gtk2-engines-pixbuf.links.in Mon Jan 21 16:57:30 2008
@@ -1,0 +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@/NEWS.pre-1-0.gz usr/share/doc/@PIXBUF_PKG@/NEWS.pre-1-0.gz
+usr/share/doc/@COMMON_PKG@/README.gz usr/share/doc/@PIXBUF_PKG@/README.gz
Modified: desktop/unstable/gtk+2.0/debian/libgtk-directfb-2.0-0.links.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/libgtk-directfb-2.0-0.links.in?rev=14298&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/libgtk-directfb-2.0-0.links.in (original)
+++ desktop/unstable/gtk+2.0/debian/libgtk-directfb-2.0-0.links.in Mon Jan 21 16:57:30 2008
@@ -1,1 +1,4 @@
-usr/share/doc/@SHARED_PKG@ usr/share/doc/@DIRECTFB_PKG@
+usr/share/doc/@COMMON_PKG@/changelog.gz usr/share/doc/@DIRECTFB_PKG@/changelog.gz
+usr/share/doc/@COMMON_PKG@/NEWS.gz usr/share/doc/@DIRECTFB_PKG@/NEWS.gz
+usr/share/doc/@COMMON_PKG@/NEWS.pre-1-0.gz usr/share/doc/@DIRECTFB_PKG@/NEWS.pre-1-0.gz
+usr/share/doc/@COMMON_PKG@/README.gz usr/share/doc/@DIRECTFB_PKG@/README.gz
Added: desktop/unstable/gtk+2.0/debian/libgtk-directfb-2.0-0.preinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/libgtk-directfb-2.0-0.preinst?rev=14298&op=file
==============================================================================
--- desktop/unstable/gtk+2.0/debian/libgtk-directfb-2.0-0.preinst (added)
+++ desktop/unstable/gtk+2.0/debian/libgtk-directfb-2.0-0.preinst Mon Jan 21 16:57:30 2008
@@ -1,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+# remove /usr/share/doc symlinks as it's a directory since 2.12.5-2
+pkg=libgtk-directfb-2.0-0
+oldsymtarget=libgtk2.0-0
+if [ "$1" = upgrade ] && [ -L /usr/share/doc/$pkg ] && [ $oldsymtarget = "$(readlink /usr/share/doc/$pkg)" ]; then
+ rm -f /usr/share/doc/$pkg
+fi
+
+#DEBHELPER#
+
Added: desktop/unstable/gtk+2.0/debian/libgtk-directfb-2.0-0.prerm
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/libgtk-directfb-2.0-0.prerm?rev=14298&op=file
==============================================================================
--- desktop/unstable/gtk+2.0/debian/libgtk-directfb-2.0-0.prerm (added)
+++ desktop/unstable/gtk+2.0/debian/libgtk-directfb-2.0-0.prerm Mon Jan 21 16:57:30 2008
@@ -1,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+# remove /usr/share/doc directory as it was a symlink prior to 2.12.5-2
+pkg=libgtk-directfb-2.0-0
+if [ "$1" = upgrade ] && [ ! -L /usr/share/doc/$pkg ] && [ -d /usr/share/doc/$pkg ]; then
+ rm -rf /usr/share/doc/$pkg
+fi
+
+#DEBHELPER#
+
Modified: desktop/unstable/gtk+2.0/debian/libgtk-directfb-2.0-dev.links.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/libgtk-directfb-2.0-dev.links.in?rev=14298&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/libgtk-directfb-2.0-dev.links.in (original)
+++ desktop/unstable/gtk+2.0/debian/libgtk-directfb-2.0-dev.links.in Mon Jan 21 16:57:30 2008
@@ -1,1 +1,4 @@
-usr/share/doc/@DIRECTFB_PKG@ usr/share/doc/@DIRECTFB_DEV_PKG@
+usr/share/doc/@COMMON_PKG@/changelog.gz usr/share/doc/@DIRECTFB_DEV_PKG@/changelog.gz
+usr/share/doc/@COMMON_PKG@/NEWS.gz usr/share/doc/@DIRECTFB_DEV_PKG@/NEWS.gz
+usr/share/doc/@COMMON_PKG@/NEWS.pre-1-0.gz usr/share/doc/@DIRECTFB_DEV_PKG@/NEWS.pre-1-0.gz
+usr/share/doc/@COMMON_PKG@/README.gz usr/share/doc/@DIRECTFB_DEV_PKG@/README.gz
Added: desktop/unstable/gtk+2.0/debian/libgtk-directfb-2.0-dev.preinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/libgtk-directfb-2.0-dev.preinst?rev=14298&op=file
==============================================================================
--- desktop/unstable/gtk+2.0/debian/libgtk-directfb-2.0-dev.preinst (added)
+++ desktop/unstable/gtk+2.0/debian/libgtk-directfb-2.0-dev.preinst Mon Jan 21 16:57:30 2008
@@ -1,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+# remove /usr/share/doc symlinks as it's a directory since 2.12.5-2
+pkg=libgtk-directfb-2.0-dev
+oldsymtarget=libgtk-directfb-2.0-0
+if [ "$1" = upgrade ] && [ -L /usr/share/doc/$pkg ] && [ $oldsymtarget = "$(readlink /usr/share/doc/$pkg)" ]; then
+ rm -f /usr/share/doc/$pkg
+fi
+
+#DEBHELPER#
+
Added: desktop/unstable/gtk+2.0/debian/libgtk-directfb-2.0-dev.prerm
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/libgtk-directfb-2.0-dev.prerm?rev=14298&op=file
==============================================================================
--- desktop/unstable/gtk+2.0/debian/libgtk-directfb-2.0-dev.prerm (added)
+++ desktop/unstable/gtk+2.0/debian/libgtk-directfb-2.0-dev.prerm Mon Jan 21 16:57:30 2008
@@ -1,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+# remove /usr/share/doc directory as it was a symlink prior to 2.12.5-2
+pkg=libgtk-directfb-2.0-dev
+if [ "$1" = upgrade ] && [ ! -L /usr/share/doc/$pkg ] && [ -d /usr/share/doc/$pkg ]; then
+ rm -rf /usr/share/doc/$pkg
+fi
+
+#DEBHELPER#
+
Modified: desktop/unstable/gtk+2.0/debian/libgtk2.0-0-dbg.links.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/libgtk2.0-0-dbg.links.in?rev=14298&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/libgtk2.0-0-dbg.links.in (original)
+++ desktop/unstable/gtk+2.0/debian/libgtk2.0-0-dbg.links.in Mon Jan 21 16:57:30 2008
@@ -1,1 +1,4 @@
-usr/share/doc/@SHARED_PKG@ usr/share/doc/@DEBUG_PKG@
+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@/NEWS.pre-1-0.gz usr/share/doc/@DEBUG_PKG@/NEWS.pre-1-0.gz
+usr/share/doc/@COMMON_PKG@/README.gz usr/share/doc/@DEBUG_PKG@/README.gz
Added: desktop/unstable/gtk+2.0/debian/libgtk2.0-0-dbg.preinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/libgtk2.0-0-dbg.preinst?rev=14298&op=file
==============================================================================
--- desktop/unstable/gtk+2.0/debian/libgtk2.0-0-dbg.preinst (added)
+++ desktop/unstable/gtk+2.0/debian/libgtk2.0-0-dbg.preinst Mon Jan 21 16:57:30 2008
@@ -1,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+# remove /usr/share/doc symlinks as it's a directory since 2.12.5-2
+pkg=libgtk2.0-0-dbg
+oldsymtarget=libgtk2.0-0
+if [ "$1" = upgrade ] && [ -L /usr/share/doc/$pkg ] && [ $oldsymtarget = "$(readlink /usr/share/doc/$pkg)" ]; then
+ rm -f /usr/share/doc/$pkg
+fi
+
+#DEBHELPER#
+
Added: desktop/unstable/gtk+2.0/debian/libgtk2.0-0-dbg.prerm
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/libgtk2.0-0-dbg.prerm?rev=14298&op=file
==============================================================================
--- desktop/unstable/gtk+2.0/debian/libgtk2.0-0-dbg.prerm (added)
+++ desktop/unstable/gtk+2.0/debian/libgtk2.0-0-dbg.prerm Mon Jan 21 16:57:30 2008
@@ -1,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+# remove /usr/share/doc directory as it was a symlink prior to 2.12.5-2
+pkg=libgtk2.0-0-dbg
+if [ "$1" = upgrade ] && [ ! -L /usr/share/doc/$pkg ] && [ -d /usr/share/doc/$pkg ]; then
+ rm -rf /usr/share/doc/$pkg
+fi
+
+#DEBHELPER#
+
Modified: desktop/unstable/gtk+2.0/debian/libgtk2.0-0.links.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/libgtk2.0-0.links.in?rev=14298&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/libgtk2.0-0.links.in (original)
+++ desktop/unstable/gtk+2.0/debian/libgtk2.0-0.links.in Mon Jan 21 16:57:30 2008
@@ -1,1 +1,4 @@
-usr/share/doc/@COMMON_PKG@ usr/share/doc/@SHARED_PKG@
+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@/NEWS.pre-1-0.gz usr/share/doc/@SHARED_PKG@/NEWS.pre-1-0.gz
+usr/share/doc/@COMMON_PKG@/README.gz usr/share/doc/@SHARED_PKG@/README.gz
Added: desktop/unstable/gtk+2.0/debian/libgtk2.0-0.preinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/libgtk2.0-0.preinst?rev=14298&op=file
==============================================================================
--- desktop/unstable/gtk+2.0/debian/libgtk2.0-0.preinst (added)
+++ desktop/unstable/gtk+2.0/debian/libgtk2.0-0.preinst Mon Jan 21 16:57:30 2008
@@ -1,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+# remove /usr/share/doc symlinks as it's a directory since 2.12.5-2
+pkg=libgtk2.0-0
+oldsymtarget=libgtk2.0-common
+if [ "$1" = upgrade ] && [ -L /usr/share/doc/$pkg ] && [ $oldsymtarget = "$(readlink /usr/share/doc/$pkg)" ]; then
+ rm -f /usr/share/doc/$pkg
+fi
+
+#DEBHELPER#
+
Added: desktop/unstable/gtk+2.0/debian/libgtk2.0-0.prerm
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/libgtk2.0-0.prerm?rev=14298&op=file
==============================================================================
--- desktop/unstable/gtk+2.0/debian/libgtk2.0-0.prerm (added)
+++ desktop/unstable/gtk+2.0/debian/libgtk2.0-0.prerm Mon Jan 21 16:57:30 2008
@@ -1,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+# remove /usr/share/doc directory as it was a symlink prior to 2.12.5-2
+pkg=libgtk2.0-0
+if [ "$1" = upgrade ] && [ ! -L /usr/share/doc/$pkg ] && [ -d /usr/share/doc/$pkg ]; then
+ rm -rf /usr/share/doc/$pkg
+fi
+
+#DEBHELPER#
+
Modified: desktop/unstable/gtk+2.0/debian/libgtk2.0-bin.links.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/libgtk2.0-bin.links.in?rev=14298&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/libgtk2.0-bin.links.in (original)
+++ desktop/unstable/gtk+2.0/debian/libgtk2.0-bin.links.in Mon Jan 21 16:57:30 2008
@@ -3,4 +3,7 @@
usr/lib/@SHARED_PKG@/gtk-update-icon-cache usr/bin/gtk-update-icon-cache
usr/lib/@SHARED_PKG@/update-gtk-immodules usr/sbin/update-gtk-immodules
usr/lib/@SHARED_PKG@/update-gdkpixbuf-loaders usr/sbin/update-gdkpixbuf-loaders
-usr/share/doc/@SHARED_PKG@ usr/share/doc/@BIN_PKG@
+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@/NEWS.pre-1-0.gz usr/share/doc/@BIN_PKG@/NEWS.pre-1-0.gz
+usr/share/doc/@COMMON_PKG@/README.gz usr/share/doc/@BIN_PKG@/README.gz
Added: desktop/unstable/gtk+2.0/debian/libgtk2.0-bin.preinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/libgtk2.0-bin.preinst?rev=14298&op=file
==============================================================================
--- desktop/unstable/gtk+2.0/debian/libgtk2.0-bin.preinst (added)
+++ desktop/unstable/gtk+2.0/debian/libgtk2.0-bin.preinst Mon Jan 21 16:57:30 2008
@@ -1,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+# remove /usr/share/doc symlinks as it's a directory since 2.12.5-2
+pkg=libgtk2.0-bin
+oldsymtarget=libgtk2.0-0
+if [ "$1" = upgrade ] && [ -L /usr/share/doc/$pkg ] && [ $oldsymtarget = "$(readlink /usr/share/doc/$pkg)" ]; then
+ rm -f /usr/share/doc/$pkg
+fi
+
+#DEBHELPER#
+
Added: desktop/unstable/gtk+2.0/debian/libgtk2.0-bin.prerm
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/libgtk2.0-bin.prerm?rev=14298&op=file
==============================================================================
--- desktop/unstable/gtk+2.0/debian/libgtk2.0-bin.prerm (added)
+++ desktop/unstable/gtk+2.0/debian/libgtk2.0-bin.prerm Mon Jan 21 16:57:30 2008
@@ -1,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+# remove /usr/share/doc directory as it was a symlink prior to 2.12.5-2
+pkg=libgtk2.0-bin
+if [ "$1" = upgrade ] && [ ! -L /usr/share/doc/$pkg ] && [ -d /usr/share/doc/$pkg ]; then
+ rm -rf /usr/share/doc/$pkg
+fi
+
+#DEBHELPER#
+
Modified: desktop/unstable/gtk+2.0/debian/libgtk2.0-dev.links.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/libgtk2.0-dev.links.in?rev=14298&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/libgtk2.0-dev.links.in (original)
+++ desktop/unstable/gtk+2.0/debian/libgtk2.0-dev.links.in Mon Jan 21 16:57:30 2008
@@ -1,1 +1,4 @@
-usr/share/doc/@SHARED_PKG@ usr/share/doc/@DEV_PKG@
+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@/NEWS.pre-1-0.gz usr/share/doc/@DEV_PKG@/NEWS.pre-1-0.gz
+usr/share/doc/@COMMON_PKG@/README.gz usr/share/doc/@DEV_PKG@/README.gz
Added: desktop/unstable/gtk+2.0/debian/libgtk2.0-dev.preinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/libgtk2.0-dev.preinst?rev=14298&op=file
==============================================================================
--- desktop/unstable/gtk+2.0/debian/libgtk2.0-dev.preinst (added)
+++ desktop/unstable/gtk+2.0/debian/libgtk2.0-dev.preinst Mon Jan 21 16:57:30 2008
@@ -1,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+# remove /usr/share/doc symlinks as it's a directory since 2.12.5-2
+pkg=libgtk2.0-dev
+oldsymtarget=libgtk2.0-0
+if [ "$1" = upgrade ] && [ -L /usr/share/doc/$pkg ] && [ $oldsymtarget = "$(readlink /usr/share/doc/$pkg)" ]; then
+ rm -f /usr/share/doc/$pkg
+fi
+
+#DEBHELPER#
+
Added: desktop/unstable/gtk+2.0/debian/libgtk2.0-dev.prerm
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/libgtk2.0-dev.prerm?rev=14298&op=file
==============================================================================
--- desktop/unstable/gtk+2.0/debian/libgtk2.0-dev.prerm (added)
+++ desktop/unstable/gtk+2.0/debian/libgtk2.0-dev.prerm Mon Jan 21 16:57:30 2008
@@ -1,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+# remove /usr/share/doc directory as it was a symlink prior to 2.12.5-2
+pkg=libgtk2.0-dev
+if [ "$1" = upgrade ] && [ ! -L /usr/share/doc/$pkg ] && [ -d /usr/share/doc/$pkg ]; then
+ rm -rf /usr/share/doc/$pkg
+fi
+
+#DEBHELPER#
+
Modified: desktop/unstable/gtk+2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/rules?rev=14298&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/rules (original)
+++ desktop/unstable/gtk+2.0/debian/rules Mon Jan 21 16:57:30 2008
@@ -134,6 +134,8 @@
--enable-explicit-deps=yes \
--with-gdktarget=directfb
+DH_INSTALLDOCS_FILES := NEWS NEWS.pre-1-0 README ChangeLog.* ChangeLog
+
# macro computing the list of 'debian/<pkg>.*" files which have a corresponding
# ".in" file; pass the list of packages in $(1)
dh_subst_files = $(patsubst %.in,%,$(wildcard $(addprefix debian/, $(addsuffix *.in, $(1)))))
@@ -249,8 +251,15 @@
dh_testdir
dh_testroot
dh_install -i
- dh_installchangelogs -i -N$(BIN_PKG) ChangeLog ChangeLog.*
- dh_installdocs -i -N$(BIN_PKG) NEWS NEWS.pre-1-0 README
+ # changelog.gz symlinks will be overwritten by dh_link
+ dh_installchangelogs -i ChangeLog
+ # do not merge the calls: dh_installdocs will only install some files
+ # in the first package
+ dh_installdocs -p$(COMMON_PKG) $(DH_INSTALLDOCS_FILES)
+ dh_installdocs -p$(DOC_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$(COMMON_PKG) -i
dh_installman -i
dh_link -i
dh_compress -i
@@ -272,8 +281,14 @@
for f in update-gdkpixbuf-loaders update-gtk-immodules; do \
chmod 755 debian/$(SHARED_PKG)/usr/lib/$(SHARED_PKG)/$$f; \
done
- dh_installchangelogs -p$(EXAMPLES_PKG) -p$(PIXBUF_PKG) ChangeLog ChangeLog.*
- dh_installdocs -p$(EXAMPLES_PKG) -p$(PIXBUF_PKG) NEWS NEWS.pre-1-0 README
+ # 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
dh_installman -s
# fix the permissions of the development package because it ships
# dh_gtkmodules which we need to invoke in this build
More information about the pkg-gnome-commits
mailing list