diff --git a/debian/changelog b/debian/changelog index 34f437f307..3bf6fa9a6c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,9 +3,10 @@ gtk+3.0 (3.2.2-2) UNRELEASED; urgency=low * Upload to unstable. * debian/control.in: - Add Breaks against gnome-themes-standard (<< 3.2) due to the CSS theming - related changes. (Closes: #649203) + related changes. Closes: #649203 + * Fix broken doc symlinks. Closes: #647466 - -- Michael Biebl Fri, 18 Nov 2011 20:20:15 +0100 + -- Michael Biebl Fri, 18 Nov 2011 23:34:58 +0100 gtk+3.0 (3.2.2-1) experimental; urgency=low diff --git a/debian/gtk3-engines-pixbuf.links.in b/debian/gtk3-engines-pixbuf.links.in index fc113fce7b..a6eebb604b 100644 --- a/debian/gtk3-engines-pixbuf.links.in +++ b/debian/gtk3-engines-pixbuf.links.in @@ -1,3 +1,2 @@ -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@/README usr/share/doc/@PIXBUF_PKG@/README diff --git a/debian/libgtk-3-0-dbg.links.in b/debian/libgtk-3-0-dbg.links.in index 457429fb4f..bb86f76b08 100644 --- a/debian/libgtk-3-0-dbg.links.in +++ b/debian/libgtk-3-0-dbg.links.in @@ -1,3 +1,2 @@ -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@/README usr/share/doc/@DEBUG_PKG@/README diff --git a/debian/libgtk-3-0.links.in b/debian/libgtk-3-0.links.in index de44d59d8d..122eee42b5 100644 --- a/debian/libgtk-3-0.links.in +++ b/debian/libgtk-3-0.links.in @@ -1,3 +1,2 @@ -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@/README usr/share/doc/@SHARED_PKG@/README diff --git a/debian/libgtk-3-bin.links.in b/debian/libgtk-3-bin.links.in index b99a286689..b0caa89401 100644 --- a/debian/libgtk-3-bin.links.in +++ b/debian/libgtk-3-bin.links.in @@ -1,5 +1,4 @@ @LIBDIR@/@SHARED_PKG@/gtk-query-immodules-3.0 usr/bin/gtk-query-immodules-3.0 @LIBDIR@/@SHARED_PKG@/gtk-update-icon-cache-3.0 usr/bin/gtk-update-icon-cache-3.0 -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@/README usr/share/doc/@BIN_PKG@/README diff --git a/debian/libgtk-3-dev.links.in b/debian/libgtk-3-dev.links.in index 89ca30e3d2..3fc53d9089 100644 --- a/debian/libgtk-3-dev.links.in +++ b/debian/libgtk-3-dev.links.in @@ -1,3 +1,2 @@ -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@/README usr/share/doc/@DEV_PKG@/README diff --git a/debian/rules b/debian/rules index 4b5f774488..ae3df4d7fc 100644 --- a/debian/rules +++ b/debian/rules @@ -81,6 +81,8 @@ DEB_CONFIGURE_FLAGS_static = \ --enable-static DEB_MAKE_CHECK_TARGET = -k check || true +DEB_INSTALL_DOCS_ALL = AUTHORS +DEB_INSTALL_DOCS_$(COMMON_PKG) = README NEWS DEB_INSTALL_DOCS_$(DOC_PKG) += -X.in DEB_DH_MAKESHLIBS_ARGS_ALL += -X$(MODULES_BASE_PATH) DEB_DH_MAKESHLIBS_ARGS_$(SHARED_PKG) += -V --add-udeb=$(UDEB_PKG) -- -c4