r48816 - /desktop/unstable/gtk+3.0/debian/
biebl at users.alioth.debian.org
biebl at users.alioth.debian.org
Sun May 22 06:52:16 UTC 2016
Author: biebl
Date: Sun May 22 06:52:15 2016
New Revision: 48816
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=48816
Log:
Split gtk-update-icon-cache utility out of libgtk-3-bin into a separate
package called gtk-update-icon-cache to break a dependency cycle with
adwaita-icon-theme when building the package. (Closes: #747392)
As the gtk-update-icon-cache binary doesn't actually have any libgtk-3-0
dependency, there is no longer a reason to ship a gtk2 and gtk3 variant.
So from now on we will only ship one implementation built from src:gtk+3.0
and drop the Debian specific -3.0 suffix. To simplify the transition make
libgtk-3-bin depend on gtk-update-icon-cache. Once all theme packages have
been updated, this dependency can be dropped.
Added:
desktop/unstable/gtk+3.0/debian/gtk-update-icon-cache.install
desktop/unstable/gtk+3.0/debian/gtk-update-icon-cache.manpages
desktop/unstable/gtk+3.0/debian/gtk-update-icon-cache.preinst
Removed:
desktop/unstable/gtk+3.0/debian/libgtk-3-bin.manpages
desktop/unstable/gtk+3.0/debian/libgtk-3-bin.postrm
desktop/unstable/gtk+3.0/debian/libgtk-3-bin.preinst
Modified:
desktop/unstable/gtk+3.0/debian/changelog
desktop/unstable/gtk+3.0/debian/control
desktop/unstable/gtk+3.0/debian/control.in
desktop/unstable/gtk+3.0/debian/libgtk-3-0.install.in
desktop/unstable/gtk+3.0/debian/libgtk-3-bin.install
desktop/unstable/gtk+3.0/debian/libgtk-3-bin.links.in
desktop/unstable/gtk+3.0/debian/rules
desktop/unstable/gtk+3.0/debian/update-icon-caches
Modified: desktop/unstable/gtk+3.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/changelog?rev=48816&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/changelog [utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/changelog [utf-8] Sun May 22 06:52:15 2016
@@ -1,3 +1,17 @@
+gtk+3.0 (3.20.5-2) UNRELEASED; urgency=medium
+
+ * Split gtk-update-icon-cache utility out of libgtk-3-bin into a separate
+ package called gtk-update-icon-cache to break a dependency cycle with
+ adwaita-icon-theme when building the package. (Closes: #747392)
+ As the gtk-update-icon-cache binary doesn't actually have any libgtk-3-0
+ dependency, there is no longer a reason to ship a gtk2 and gtk3 variant.
+ So from now on we will only ship one implementation built from src:gtk+3.0
+ and drop the Debian specific -3.0 suffix. To simplify the transition make
+ libgtk-3-bin depend on gtk-update-icon-cache. Once all theme packages have
+ been updated, this dependency can be dropped.
+
+ -- Michael Biebl <biebl at debian.org> Sun, 22 May 2016 08:31:36 +0200
+
gtk+3.0 (3.20.5-1) unstable; urgency=medium
* New upstream release.
Modified: desktop/unstable/gtk+3.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/control?rev=48816&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/control [utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/control [utf-8] Sun May 22 06:52:15 2016
@@ -124,7 +124,8 @@
Multi-Arch: foreign
Depends: ${misc:Depends}, ${shlibs:Depends},
libgtk-3-0 (>= ${source:Version}),
- libgtk-3-common (>= ${source:Version})
+ libgtk-3-common (>= ${source:Version}),
+ gtk-update-icon-cache
Description: programs for the GTK+ graphical user interface library
GTK+ is a multi-platform toolkit for creating graphical user
interfaces. Offering a complete set of widgets, GTK+ is suitable
@@ -247,6 +248,25 @@
This package can be used by other packages using the GIRepository format to
generate dynamic bindings.
+Package: gtk-update-icon-cache
+Architecture: any
+Multi-Arch: foreign
+Section: misc
+Priority: optional
+Depends: ${misc:Depends},
+ ${shlibs:Depends}
+Breaks: libgtk2.0-bin (<< 2.24.30-2),
+ libgtk-3-bin (<< 3.20.5-2)
+Replaces: libgtk2.0-bin (<< 2.24.30-2),
+ libgtk-3-bin (<< 3.20.5-2)
+Description: icon theme caching utility
+ gtk-update-icon-cache creates mmap()able cache files for icon themes.
+ .
+ GTK+ can use the cache files created by gtk-update-icon-cache to avoid a lot
+ of system call and disk seek overhead when the application starts. Since the
+ format of the cache files allows them to be mmap()ed shared between multiple
+ applications, the overall memory consumption is reduced as well.
+
Package: libgail-3-0
Architecture: any
Multi-Arch: same
Modified: desktop/unstable/gtk+3.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/control.in?rev=48816&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/control.in [utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/control.in [utf-8] Sun May 22 06:52:15 2016
@@ -124,7 +124,8 @@
Multi-Arch: foreign
Depends: ${misc:Depends}, ${shlibs:Depends},
@SHARED_PKG@ (>= ${source:Version}),
- @COMMON_PKG@ (>= ${source:Version})
+ @COMMON_PKG@ (>= ${source:Version}),
+ gtk-update-icon-cache
Description: programs for the GTK+ graphical user interface library
GTK+ is a multi-platform toolkit for creating graphical user
interfaces. Offering a complete set of widgets, GTK+ is suitable
@@ -247,6 +248,25 @@
This package can be used by other packages using the GIRepository format to
generate dynamic bindings.
+Package: gtk-update-icon-cache
+Architecture: any
+Multi-Arch: foreign
+Section: misc
+Priority: optional
+Depends: ${misc:Depends},
+ ${shlibs:Depends}
+Breaks: libgtk2.0-bin (<< 2.24.30-2),
+ libgtk-3-bin (<< 3.20.5-2)
+Replaces: libgtk2.0-bin (<< 2.24.30-2),
+ libgtk-3-bin (<< 3.20.5-2)
+Description: icon theme caching utility
+ gtk-update-icon-cache creates mmap()able cache files for icon themes.
+ .
+ GTK+ can use the cache files created by gtk-update-icon-cache to avoid a lot
+ of system call and disk seek overhead when the application starts. Since the
+ format of the cache files allows them to be mmap()ed shared between multiple
+ applications, the overall memory consumption is reduced as well.
+
Package: libgail-3-0
Architecture: any
Multi-Arch: same
Added: desktop/unstable/gtk+3.0/debian/gtk-update-icon-cache.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/gtk-update-icon-cache.install?rev=48816&op=file
==============================================================================
--- desktop/unstable/gtk+3.0/debian/gtk-update-icon-cache.install (added)
+++ desktop/unstable/gtk+3.0/debian/gtk-update-icon-cache.install [utf-8] Sun May 22 06:52:15 2016
@@ -0,0 +1,3 @@
+../../../debian/update-icon-caches usr/sbin/
+usr/bin/gtk-update-icon-cache
+usr/share/man/man1/gtk-update-icon-cache.1
Added: desktop/unstable/gtk+3.0/debian/gtk-update-icon-cache.manpages
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/gtk-update-icon-cache.manpages?rev=48816&op=file
==============================================================================
--- desktop/unstable/gtk+3.0/debian/gtk-update-icon-cache.manpages (added)
+++ desktop/unstable/gtk+3.0/debian/gtk-update-icon-cache.manpages [utf-8] Sun May 22 06:52:15 2016
@@ -0,0 +1 @@
+debian/update-icon-caches.8
Added: desktop/unstable/gtk+3.0/debian/gtk-update-icon-cache.preinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/gtk-update-icon-cache.preinst?rev=48816&op=file
==============================================================================
--- desktop/unstable/gtk+3.0/debian/gtk-update-icon-cache.preinst (added)
+++ desktop/unstable/gtk+3.0/debian/gtk-update-icon-cache.preinst [utf-8] Sun May 22 06:52:15 2016
@@ -0,0 +1,14 @@
+#!/bin/sh
+set -e
+
+# Clean up existing diversions from libgtk-3-bin
+if dpkg --compare-versions "$2" lt "3.20.5-2" ; then
+ dpkg-divert --remove --package libgtk-3-bin --rename \
+ --divert /usr/sbin/update-icon-caches.gtk2 \
+ /usr/sbin/update-icon-caches
+ dpkg-divert --remove --package libgtk-3-bin --rename \
+ --divert /usr/share/man/man8/update-icon-caches.gtk2.8.gz \
+ /usr/share/man/man8/update-icon-caches.8.gz
+fi
+
+#DEBHELPER#
Modified: desktop/unstable/gtk+3.0/debian/libgtk-3-0.install.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/libgtk-3-0.install.in?rev=48816&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/libgtk-3-0.install.in [utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/libgtk-3-0.install.in [utf-8] Sun May 22 06:52:15 2016
@@ -1,5 +1,4 @@
usr/bin/gtk-query-immodules-3.0 @LIBDIR@/@SHARED_PKG@
-usr/bin/gtk-update-icon-cache @LIBDIR@/@SHARED_PKG@
@MODULES_BASE_PATH@/immodules/*.so
@MODULES_BASE_PATH@/printbackends/*.so
@LIBDIR@/libgtk*.so.*
Modified: desktop/unstable/gtk+3.0/debian/libgtk-3-bin.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/libgtk-3-bin.install?rev=48816&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/libgtk-3-bin.install [utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/libgtk-3-bin.install [utf-8] Sun May 22 06:52:15 2016
@@ -9,4 +9,3 @@
usr/share/man/man1/gtk-launch.1
usr/share/man/man1/gtk-query-immodules-3.0.1
usr/share/man/man1/gtk-query-settings.1
-usr/share/man/man1/gtk-update-icon-cache.1
Modified: desktop/unstable/gtk+3.0/debian/libgtk-3-bin.links.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/libgtk-3-bin.links.in?rev=48816&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/libgtk-3-bin.links.in [utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/libgtk-3-bin.links.in [utf-8] Sun May 22 06:52:15 2016
@@ -1,3 +1,2 @@
- at LIBDIR@/@SHARED_PKG@/gtk-update-icon-cache-3.0 usr/bin/gtk-update-icon-cache-3.0
usr/share/doc/@COMMON_PKG@/@NEWS@ usr/share/doc/@BIN_PKG@/@NEWS@
usr/share/doc/@COMMON_PKG@/@README@ usr/share/doc/@BIN_PKG@/@README@
Modified: desktop/unstable/gtk+3.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/rules?rev=48816&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/rules [utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/rules [utf-8] Sun May 22 06:52:15 2016
@@ -170,15 +170,3 @@
# 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/$(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-3.0
-
-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-3.0.1
- install -m 0755 -D debian/update-icon-caches \
- debian/$(BIN_PKG)/usr/sbin/update-icon-caches
Modified: desktop/unstable/gtk+3.0/debian/update-icon-caches
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/update-icon-caches?rev=48816&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/update-icon-caches [utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/update-icon-caches [utf-8] Sun May 22 06:52:15 2016
@@ -13,7 +13,7 @@
fi
if [ -f "$dir"/index.theme ]; then
# Generate or regenerate the cache
- if ! gtk-update-icon-cache-3.0 --force --quiet "$dir"; then
+ if ! gtk-update-icon-cache --force --quiet "$dir"; then
echo "WARNING: icon cache generation failed for $dir"
fi
else
More information about the pkg-gnome-commits
mailing list