From 30913ab94eb1e2e6316a80a03ddd20ff458a29cb Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 6 Aug 2012 19:40:25 +0000 Subject: [PATCH] If the NEWS or README file is larger than 4k in size append a .gz suffix as dh_compress will compress those files. This avoids dangling symlinks. Closes: #679754 --- debian/changelog | 3 +++ debian/libgtk-3-0-dbg.links.in | 4 ++-- debian/libgtk-3-0.links.in | 4 ++-- debian/libgtk-3-bin.links.in | 4 ++-- debian/libgtk-3-dev.links.in | 4 ++-- debian/rules | 7 +++++++ 6 files changed, 18 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 58369e64c3..5ca442b58f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,9 @@ gtk+3.0 (3.4.2-4) UNRELEASED; urgency=low This patch was a temporary workaround for a bug in mutter which has been fixed in version 3.4. It was not supposed to be shipped as part of wheezy, so drop it again. + * If the NEWS or README file is larger than 4k in size append a .gz suffix + as dh_compress will compress those files. This avoids dangling symlinks. + Closes: #679754 -- Michael Biebl Mon, 06 Aug 2012 18:00:10 +0200 diff --git a/debian/libgtk-3-0-dbg.links.in b/debian/libgtk-3-0-dbg.links.in index bb86f76b08..a3b90537c8 100644 --- a/debian/libgtk-3-0-dbg.links.in +++ b/debian/libgtk-3-0-dbg.links.in @@ -1,2 +1,2 @@ -usr/share/doc/@COMMON_PKG@/NEWS.gz usr/share/doc/@DEBUG_PKG@/NEWS.gz -usr/share/doc/@COMMON_PKG@/README usr/share/doc/@DEBUG_PKG@/README +usr/share/doc/@COMMON_PKG@/@NEWS@ usr/share/doc/@DEBUG_PKG@/@NEWS@ +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 122eee42b5..8c713974da 100644 --- a/debian/libgtk-3-0.links.in +++ b/debian/libgtk-3-0.links.in @@ -1,2 +1,2 @@ -usr/share/doc/@COMMON_PKG@/NEWS.gz usr/share/doc/@SHARED_PKG@/NEWS.gz -usr/share/doc/@COMMON_PKG@/README usr/share/doc/@SHARED_PKG@/README +usr/share/doc/@COMMON_PKG@/@NEWS@ usr/share/doc/@SHARED_PKG@/@NEWS@ +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 a64f0f0fb9..cc7a501dbe 100644 --- a/debian/libgtk-3-bin.links.in +++ b/debian/libgtk-3-bin.links.in @@ -1,3 +1,3 @@ @LIBDIR@/@SHARED_PKG@/gtk-update-icon-cache-3.0 usr/bin/gtk-update-icon-cache-3.0 -usr/share/doc/@COMMON_PKG@/NEWS.gz usr/share/doc/@BIN_PKG@/NEWS.gz -usr/share/doc/@COMMON_PKG@/README usr/share/doc/@BIN_PKG@/README +usr/share/doc/@COMMON_PKG@/@NEWS@ usr/share/doc/@BIN_PKG@/@NEWS@ +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 3fc53d9089..907fd969c2 100644 --- a/debian/libgtk-3-dev.links.in +++ b/debian/libgtk-3-dev.links.in @@ -1,2 +1,2 @@ -usr/share/doc/@COMMON_PKG@/NEWS.gz usr/share/doc/@DEV_PKG@/NEWS.gz -usr/share/doc/@COMMON_PKG@/README usr/share/doc/@DEV_PKG@/README +usr/share/doc/@COMMON_PKG@/@NEWS@ usr/share/doc/@DEV_PKG@/@NEWS@ +usr/share/doc/@COMMON_PKG@/@README@ usr/share/doc/@DEV_PKG@/@README@ diff --git a/debian/rules b/debian/rules index b225a9308d..64c1508435 100644 --- a/debian/rules +++ b/debian/rules @@ -49,6 +49,11 @@ BIN_PKG := libgtk-$(APIVER)-bin DEBUG_PKG := $(SHARED_PKG)-dbg EXAMPLES_PKG := gtk-$(APIVER)-examples +# files larger than 4k in size will be compressed by dh_compress +# so append a .gz suffix to avoid dangling symlinks +NEWS := NEWS$(shell find -maxdepth 1 -size +4k -name NEWS -exec echo ".gz" \;) +README := README$(shell find -maxdepth 1 -size +4k -name README -exec echo ".gz" \;) + DEB_DH_INSTALL_ARGS += --sourcedir=debian/install/shared DEB_DH_INSTALL_ARGS_$(UDEB_PKG) += --sourcedir=debian/install/shared_udeb @@ -107,6 +112,8 @@ debian/%: debian/%.in -e 's#@CONFDIR@#$(CONFDIR)#g' \ -e "s#@MODULES_BASE_PATH@#$(MODULES_BASE_PATH)#g" \ -e "s#@OLD_MODULES_BASE_PATH@#$(OLD_MODULES_BASE_PATH)#g" \ + -e "s#@NEWS@#$(NEWS)#g" \ + -e "s#@README@#$(README)#g" \ $@.in > $@ clean:: debian/control