r49593 - in /desktop/experimental/gtk+3.0: ./ debian/changelog debian/control debian/control.in debian/rules
smcv at users.alioth.debian.org
smcv at users.alioth.debian.org
Thu Aug 18 14:03:45 UTC 2016
Author: smcv
Date: Thu Aug 18 14:03:45 2016
New Revision: 49593
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=49593
Log:
Merge from unstable
Modified:
desktop/experimental/gtk+3.0/ (props changed)
desktop/experimental/gtk+3.0/debian/changelog
desktop/experimental/gtk+3.0/debian/control
desktop/experimental/gtk+3.0/debian/control.in
desktop/experimental/gtk+3.0/debian/rules
Propchange: desktop/experimental/gtk+3.0/
------------------------------------------------------------------------------
svn:mergeinfo = /desktop/unstable/gtk+3.0:49311-49592
Modified: desktop/experimental/gtk+3.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/changelog?rev=49593&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/changelog [utf-8] Thu Aug 18 14:03:45 2016
@@ -1,9 +1,44 @@
gtk+3.0 (3.21.4-2) UNRELEASED; urgency=medium
+ [ Simon McVittie ]
+ * Merge packaging changes from 3.20.9-1 in unstable
+
+ -- Jeremy Bicha <jbicha at ubuntu.com> Thu, 04 Aug 2016 13:16:39 -0400
+
+gtk+3.0 (3.20.9-1) unstable; urgency=medium
+
+ [ Jeremy Bicha ]
+ * Team upload
+ * New upstream release
* debian/control.in:
- Drop unnecessary version number from dependency on adwaita-icon-theme
-
- -- Jeremy Bicha <jbicha at ubuntu.com> Thu, 04 Aug 2016 13:16:39 -0400
+ * debian/patches/0001-Revert-Improve-external-drives-detection.patch:
+ - Dropped, applied in new version
+
+ [ Simon McVittie ]
+ * Another new upstream release
+ * Explicitly build-depend on docbook-xsl, libxml2-utils and xsltproc
+ to be able to generate man pages from their source code. Move docbook-xml
+ to Build-Depends since the man pages are in an Architecture: any package.
+ * Drop Build-Depends-Indep on docbook-utils, the old SGML toolchain,
+ which is currently uninstallable (#834616) and does not appear to be
+ needed for anything
+
+ -- Simon McVittie <smcv at debian.org> Thu, 18 Aug 2016 10:47:10 +0100
+
+gtk+3.0 (3.20.7-1) unstable; urgency=medium
+
+ [ Laurent Bigonville ]
+ * debian/control.in: Add hicolor-icon-theme as a hard dependency, the
+ package is small and only provides the directory structure of the theme.
+ * debian/control.in: Move adwaita-icon-theme dependency to the main package.
+
+ [ Emilio Pozuelo Monfort ]
+ * New upstream release.
+ * debian/patches/0001-Revert-Improve-external-drives-detection.patch:
+ + Revert upstream change that requires unstable glib 2.49.1.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org> Thu, 04 Aug 2016 19:07:21 +0200
gtk+3.0 (3.21.4-1) experimental; urgency=medium
Modified: desktop/experimental/gtk+3.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/control?rev=49593&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/control [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/control [utf-8] Thu Aug 18 14:03:45 2016
@@ -2,13 +2,15 @@
Section: libs
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Andreas Henriksson <andreas at fatal.se>, Emilio Pozuelo Monfort <pochu at debian.org>, Michael Biebl <biebl at debian.org>
+Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Jeremy Bicha <jbicha at ubuntu.com>, Michael Biebl <biebl at debian.org>
Build-Depends: debhelper (>= 9.20141010),
cdbs (>= 0.4.93),
gnome-pkg-tools (>= 0.11),
dpkg-dev (>= 1.17.14),
gtk-doc-tools (>= 1.20),
dh-autoreconf,
+ docbook-xml,
+ docbook-xsl,
pkg-config,
autotools-dev,
dbus-x11 <!nocheck>,
@@ -29,6 +31,7 @@
libx11-dev (>= 2:1.3.3-2),
libxext-dev (>= 2:1.1.1-3),
libxi-dev (>= 2:1.3-4),
+ libxml2-utils,
libxrandr-dev (>= 2:1.2.99),
libxt-dev,
libxrender-dev (>= 1:0.9.5-2),
@@ -48,10 +51,9 @@
gobject-introspection (>= 1.41.3),
libgirepository1.0-dev (>= 1.39.0),
xauth <!nocheck>,
+ xsltproc,
xvfb <!nocheck>,
-Build-Depends-Indep: docbook-xml,
- docbook-utils,
- libglib2.0-doc,
+Build-Depends-Indep: libglib2.0-doc,
libatk1.0-doc,
libpango1.0-doc,
libcairo2-doc
@@ -66,6 +68,8 @@
Depends: libgtk-3-common (>= ${source:Version}),
${misc:Depends},
${shlibs:Depends},
+ hicolor-icon-theme,
+ adwaita-icon-theme,
shared-mime-info
Provides: gtk3-binver-3.0.0
Recommends: libgtk-3-bin
@@ -105,8 +109,7 @@
Section: misc
Architecture: all
Multi-Arch: foreign
-Depends: ${misc:Depends},
- adwaita-icon-theme
+Depends: ${misc:Depends}
Recommends: libgtk-3-0
Breaks: libgtk-3-0 (<< 3.5.4)
Replaces: libgtk-3-0 (<< 3.5.4)
@@ -255,9 +258,9 @@
Depends: ${misc:Depends},
${shlibs:Depends}
Breaks: libgtk2.0-bin (<< 2.24.30-2),
- libgtk-3-bin (<< 3.20.5-2)
+ libgtk-3-bin (<< 3.20.6-1)
Replaces: libgtk2.0-bin (<< 2.24.30-2),
- libgtk-3-bin (<< 3.20.5-2)
+ libgtk-3-bin (<< 3.20.6-1)
Description: icon theme caching utility
gtk-update-icon-cache creates mmap()able cache files for icon themes.
.
Modified: desktop/experimental/gtk+3.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/control.in?rev=49593&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/control.in [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/control.in [utf-8] Thu Aug 18 14:03:45 2016
@@ -9,6 +9,8 @@
dpkg-dev (>= 1.17.14),
gtk-doc-tools (>= 1.20),
dh-autoreconf,
+ docbook-xml,
+ docbook-xsl,
pkg-config,
autotools-dev,
dbus-x11 <!nocheck>,
@@ -29,6 +31,7 @@
libx11-dev (>= 2:1.3.3-2),
libxext-dev (>= 2:1.1.1-3),
libxi-dev (>= 2:1.3-4),
+ libxml2-utils,
libxrandr-dev (>= 2:1.2.99),
libxt-dev,
libxrender-dev (>= 1:0.9.5-2),
@@ -48,10 +51,9 @@
gobject-introspection (>= 1.41.3),
libgirepository1.0-dev (>= 1.39.0),
xauth <!nocheck>,
+ xsltproc,
xvfb <!nocheck>,
-Build-Depends-Indep: docbook-xml,
- docbook-utils,
- libglib2.0-doc,
+Build-Depends-Indep: libglib2.0-doc,
libatk1.0-doc,
libpango1.0-doc,
libcairo2-doc
@@ -66,6 +68,8 @@
Depends: @COMMON_PKG@ (>= ${source:Version}),
${misc:Depends},
${shlibs:Depends},
+ hicolor-icon-theme,
+ adwaita-icon-theme,
shared-mime-info
Provides: @GTK_BINVER_DEP@
Recommends: @BIN_PKG@
@@ -105,8 +109,7 @@
Section: misc
Architecture: all
Multi-Arch: foreign
-Depends: ${misc:Depends},
- adwaita-icon-theme
+Depends: ${misc:Depends}
Recommends: @SHARED_PKG@
Breaks: @SHARED_PKG@ (<< 3.5.4)
Replaces: @SHARED_PKG@ (<< 3.5.4)
@@ -255,9 +258,9 @@
Depends: ${misc:Depends},
${shlibs:Depends}
Breaks: libgtk2.0-bin (<< 2.24.30-2),
- libgtk-3-bin (<< 3.20.5-2)
+ libgtk-3-bin (<< 3.20.6-1)
Replaces: libgtk2.0-bin (<< 2.24.30-2),
- libgtk-3-bin (<< 3.20.5-2)
+ libgtk-3-bin (<< 3.20.6-1)
Description: icon theme caching utility
gtk-update-icon-cache creates mmap()able cache files for icon themes.
.
Modified: desktop/experimental/gtk+3.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/rules?rev=49593&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/rules [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/rules [utf-8] Thu Aug 18 14:03:45 2016
@@ -74,6 +74,7 @@
--enable-broadway-backend \
--enable-x11-backend \
--enable-gtk-doc \
+ --enable-man \
--enable-shared \
--enable-introspection \
--enable-cloudprint \
More information about the pkg-gnome-commits
mailing list