From 43e8b88dca2ec503882a23387c4ba8432a46f7ed Mon Sep 17 00:00:00 2001 From: Emilio Pozuelo Monfort Date: Sat, 8 Jan 2011 15:01:59 +0000 Subject: [PATCH] + debian/libgtk3.0-*.{install.in,manpages}, debian/rules: - Install manpages and binaries with the -3.0 suffix as upstream has stopped doing so. --- debian/changelog | 4 ++++ debian/libgtk3.0-0.install.in | 2 +- debian/libgtk3.0-bin.install.in | 2 +- debian/libgtk3.0-bin.links.in | 2 +- debian/libgtk3.0-dev.install.in | 2 +- debian/libgtk3.0-dev.manpages | 2 +- debian/rules | 28 ++++++++++++++++++++++++---- 7 files changed, 33 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8c59f3157e..d471c8f344 100644 --- a/debian/changelog +++ b/debian/changelog @@ -35,6 +35,10 @@ gtk+3.0 (2.99.0-1) UNRELEASED; urgency=low - Refreshed. + debian/libgtk3.0-0.symbols: - Updated. + + debian/libgtk3.0-*.{install.in,manpages}, + debian/rules: + - Install manpages and binaries with the -3.0 suffix as upstream has + stopped doing so. * Switch to CDBS' flavours system. -- Emilio Pozuelo Monfort Sun, 02 Jan 2011 20:08:53 +0000 diff --git a/debian/libgtk3.0-0.install.in b/debian/libgtk3.0-0.install.in index 875b8c5edd..c7118bfe16 100644 --- a/debian/libgtk3.0-0.install.in +++ b/debian/libgtk3.0-0.install.in @@ -1,7 +1,7 @@ # from the shared flavor debian/install/shared/etc/gtk-@APIVER@/im-multipress.conf etc/gtk-@APIVER@ debian/install/shared/usr/bin/gtk-query-immodules-3.0 @LIBDIR@/@SHARED_PKG@ -debian/install/shared/usr/bin/gtk-update-icon-cache-3.0 @LIBDIR@/@SHARED_PKG@ +debian/install/shared/usr/bin/gtk-update-icon-cache @LIBDIR@/@SHARED_PKG@ debian/install/shared/@MODULES_BASE_PATH@/immodules/*.so @MODULES_BASE_PATH@/immodules debian/install/shared/@MODULES_BASE_PATH@/printbackends/*.so @MODULES_BASE_PATH@/printbackends debian/install/shared/@LIBDIR@/libgtk*.so.* @LIBDIR@ diff --git a/debian/libgtk3.0-bin.install.in b/debian/libgtk3.0-bin.install.in index 477879291c..6477fcdd3d 100644 --- a/debian/libgtk3.0-bin.install.in +++ b/debian/libgtk3.0-bin.install.in @@ -1,4 +1,4 @@ # from the shared flavor -docs/reference/gtk/gtk-update-icon-cache-@APIVER@.1 usr/share/man/man1 +docs/reference/gtk/gtk-update-icon-cache.1 usr/share/man/man1 docs/reference/gtk/gtk-query-immodules-@APIVER@.1 usr/share/man/man1 debian/update-icon-caches usr/sbin diff --git a/debian/libgtk3.0-bin.links.in b/debian/libgtk3.0-bin.links.in index 79c33d629f..27cbb284a0 100644 --- a/debian/libgtk3.0-bin.links.in +++ b/debian/libgtk3.0-bin.links.in @@ -1,5 +1,5 @@ @LIBDIR@/@SHARED_PKG@/gtk-query-immodules-@APIVER@ usr/bin/gtk-query-immodules-@APIVER@ -@LIBDIR@/@SHARED_PKG@/gtk-update-icon-cache-@APIVER@ usr/bin/gtk-update-icon-cache-@APIVER@ +@LIBDIR@/@SHARED_PKG@/gtk-update-icon-cache usr/bin/gtk-update-icon-cache-@APIVER@ 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 diff --git a/debian/libgtk3.0-dev.install.in b/debian/libgtk3.0-dev.install.in index 06392ede86..a605694228 100644 --- a/debian/libgtk3.0-dev.install.in +++ b/debian/libgtk3.0-dev.install.in @@ -1,5 +1,5 @@ # from the shared flavor -debian/install/shared/usr/bin/gtk-builder-convert-3.0 usr/bin +debian/install/shared/usr/bin/gtk-builder-convert usr/bin debian/install/shared/usr/include/gtk* usr/include debian/install/shared/@LIBDIR@/libg?k*.la @LIBDIR@ debian/install/shared/@LIBDIR@/libg?k*.so @LIBDIR@ diff --git a/debian/libgtk3.0-dev.manpages b/debian/libgtk3.0-dev.manpages index ea0eec658e..9ecdb8d962 100644 --- a/debian/libgtk3.0-dev.manpages +++ b/debian/libgtk3.0-dev.manpages @@ -1 +1 @@ -docs/reference/gtk/gtk-builder-convert-3.0.1 +docs/reference/gtk/gtk-builder-convert.1 diff --git a/debian/rules b/debian/rules index fb7c3cdbbe..e27d6e4609 100644 --- a/debian/rules +++ b/debian/rules @@ -63,7 +63,6 @@ mimexml = /usr/share/mime/packages/freedesktop.org.xml DEB_CONFIGURE_EXTRA_FLAGS = \ --enable-test-print-backend \ - --enable-introspection=no \ --enable-xinput DEB_CONFIGURE_FLAGS_shared = \ @@ -72,6 +71,7 @@ DEB_CONFIGURE_FLAGS_shared = \ --disable-static DEB_CONFIGURE_FLAGS_shared_udeb = \ + --enable-introspection=no \ --disable-xcomposite \ --disable-xdamage \ --disable-xfixes \ @@ -79,12 +79,13 @@ DEB_CONFIGURE_FLAGS_shared_udeb = \ DEB_CONFIGURE_FLAGS_static = \ --with-included-loaders=yes \ + --enable-introspection=no \ --disable-modules \ --disable-shared \ --enable-static DEB_MAKE_CHECK_TARGET = -k check || true -DEB_COMPRESS_EXCLUDE += .sgml .devhelp +DEB_COMPRESS_EXCLUDE += .devhelp 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 @@ -126,8 +127,27 @@ clean:: debian/control rm -rf $(mimedir) rm -f $(call dh_subst_files,$(DEB_ALL_PACKAGES)) -# Each binary/pkg target depends on its debian/%.in files -$(patsubst %,binary/%,$(DEB_ALL_PACKAGES)) :: binary/%: $(call dh_subst_files,%) +# Add dependencies to generate files from the debian/*.in ones +build-indep: $(call dh_subst_files,$(DEB_INDEP_PACKAGES)) +build-arch: $(call dh_subst_files,$(DEB_ARCH_PACKAGES)) + + +binary-install/$(DEV_PKG):: + # Install the binaries with a -3.0 suffix + mv debian/$(DEV_PKG)/usr/bin/gtk-builder-convert \ + debian/$(DEV_PKG)/usr/bin/gtk-builder-convert-$(APIVER) + mv debian/$(DEV_PKG)/usr/share/man/man1/gtk-builder-convert.1 \ + debian/$(DEV_PKG)/usr/share/man/man1/gtk-builder-convert-$(APIVER).1 + +binary-install/$(SHARED_PKG):: + # Install the binaries with a -3.0 suffix + mv debian/$(SHARED_PKG)/$(LIBDIR)/$(SHARED_PKG)/gtk-update-icon-cache \ + debian/$(SHARED_PKG)/$(LIBDIR)/$(SHARED_PKG)/gtk-update-icon-cache-$(APIVER) + +binary-install/$(BIN_PKG):: + # Install the binaries with a -3.0 suffix + mv debian/$(BIN_PKG)/usr/share/man/man1/gtk-update-icon-cache.1 \ + debian/$(BIN_PKG)/usr/share/man/man1/gtk-update-icon-cache-$(APIVER).1 binary/$(UDEB_PKG):: # generate a minimal MIME cache for the udeb