r26173 - in /desktop/experimental/gtk+3.0/debian: changelog libgtk3.0-0.install.in libgtk3.0-bin.install.in libgtk3.0-bin.links.in libgtk3.0-dev.install.in libgtk3.0-dev.manpages rules

pochu at users.alioth.debian.org pochu at users.alioth.debian.org
Sat Jan 8 15:02:00 UTC 2011 

Author: pochu
Date: Sat Jan  8 15:01:59 2011
New Revision: 26173

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26173
Log:
  + debian/libgtk3.0-*.{install.in,manpages},
    debian/rules:
    - Install manpages and binaries with the -3.0 suffix as upstream has
      stopped doing so.

Modified:
    desktop/experimental/gtk+3.0/debian/changelog
    desktop/experimental/gtk+3.0/debian/libgtk3.0-0.install.in
    desktop/experimental/gtk+3.0/debian/libgtk3.0-bin.install.in
    desktop/experimental/gtk+3.0/debian/libgtk3.0-bin.links.in
    desktop/experimental/gtk+3.0/debian/libgtk3.0-dev.install.in
    desktop/experimental/gtk+3.0/debian/libgtk3.0-dev.manpages
    desktop/experimental/gtk+3.0/debian/rules

Modified: desktop/experimental/gtk+3.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/changelog?rev=26173&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/changelog [utf-8] Sat Jan  8 15:01:59 2011
@@ -35,6 +35,10 @@
       - 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 <pochu at debian.org>  Sun, 02 Jan 2011 20:08:53 +0000

Modified: desktop/experimental/gtk+3.0/debian/libgtk3.0-0.install.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/libgtk3.0-0.install.in?rev=26173&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/libgtk3.0-0.install.in [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/libgtk3.0-0.install.in [utf-8] Sat Jan  8 15:01:59 2011
@@ -1,7 +1,7 @@
 # from the shared flavor
 debian/install/shared/etc/gtk- at APIVER@/im-multipress.conf etc/gtk- at 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@

Modified: desktop/experimental/gtk+3.0/debian/libgtk3.0-bin.install.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/libgtk3.0-bin.install.in?rev=26173&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/libgtk3.0-bin.install.in [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/libgtk3.0-bin.install.in [utf-8] Sat Jan  8 15:01:59 2011
@@ -1,4 +1,4 @@
 # from the shared flavor
-docs/reference/gtk/gtk-update-icon-cache- at APIVER@.1 usr/share/man/man1
+docs/reference/gtk/gtk-update-icon-cache.1 usr/share/man/man1
 docs/reference/gtk/gtk-query-immodules- at APIVER@.1 usr/share/man/man1
 debian/update-icon-caches usr/sbin

Modified: desktop/experimental/gtk+3.0/debian/libgtk3.0-bin.links.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/libgtk3.0-bin.links.in?rev=26173&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/libgtk3.0-bin.links.in [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/libgtk3.0-bin.links.in [utf-8] Sat Jan  8 15:01:59 2011
@@ -1,5 +1,5 @@
 @LIBDIR@/@SHARED_PKG@/gtk-query-immodules- at APIVER@ usr/bin/gtk-query-immodules- at APIVER@
- at LIBDIR@/@SHARED_PKG@/gtk-update-icon-cache- at APIVER@ usr/bin/gtk-update-icon-cache- at APIVER@
+ at LIBDIR@/@SHARED_PKG@/gtk-update-icon-cache usr/bin/gtk-update-icon-cache- at 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

Modified: desktop/experimental/gtk+3.0/debian/libgtk3.0-dev.install.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/libgtk3.0-dev.install.in?rev=26173&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/libgtk3.0-dev.install.in [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/libgtk3.0-dev.install.in [utf-8] Sat Jan  8 15:01:59 2011
@@ -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@

Modified: desktop/experimental/gtk+3.0/debian/libgtk3.0-dev.manpages
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/libgtk3.0-dev.manpages?rev=26173&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/libgtk3.0-dev.manpages [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/libgtk3.0-dev.manpages [utf-8] Sat Jan  8 15:01:59 2011
@@ -1,1 +1,1 @@
-docs/reference/gtk/gtk-builder-convert-3.0.1
+docs/reference/gtk/gtk-builder-convert.1

Modified: desktop/experimental/gtk+3.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/rules?rev=26173&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/rules [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/rules [utf-8] Sat Jan  8 15:01:59 2011
@@ -63,7 +63,6 @@
 
 DEB_CONFIGURE_EXTRA_FLAGS = \
 			--enable-test-print-backend \
-			--enable-introspection=no \
 			--enable-xinput
 
 DEB_CONFIGURE_FLAGS_shared = \
@@ -72,6 +71,7 @@
 			--disable-static
 
 DEB_CONFIGURE_FLAGS_shared_udeb = \
+			--enable-introspection=no \
 			--disable-xcomposite \
 			--disable-xdamage \
 			--disable-xfixes \
@@ -79,12 +79,13 @@
 
 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 @@
 	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

More information about the pkg-gnome-commits mailing list