callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Branch gtk+3.0 to exp

Browse Source
This commit is contained in:
Andreas Henriksson 2016-03-15 16:28:21 +00:00
commit a0f07e2806
12 changed files with 150 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
debian/changelog vendored
View File

@ -1,3 +1,106 @@
gtk+3.0 (3.18.9-1) unstable; urgency=medium
[ Michael Biebl ]
* New upstream release.
* Bump Standards-Version to 3.9.7.
[ Uwe Kleine-König ]
* Remove debian/{build,install} in clean target. (Closes: #792736)
-- Michael Biebl <biebl@debian.org> Sat, 12 Mar 2016 21:29:26 +0100
gtk+3.0 (3.18.8-1) unstable; urgency=medium
* New upstream stable release 3.18.8
-- Iain Lane <iain@orangesquash.org.uk> Wed, 24 Feb 2016 17:55:46 +0000
gtk+3.0 (3.18.7-1) unstable; urgency=medium
* New upstream release.
-- Michael Biebl <biebl@debian.org> Tue, 02 Feb 2016 19:12:28 +0100
gtk+3.0 (3.18.6-1) unstable; urgency=medium
* New upstream release.
* Refresh debian/patches/071_fix-installation-of-HTML-images.patch.
-- Michael Biebl <biebl@debian.org> Tue, 08 Dec 2015 15:11:24 +0100
gtk+3.0 (3.18.5-1) unstable; urgency=medium
* New upstream stable release 3.18.5
+ GtkFileChooser:
- Make sure external drives show up either in the sidebar or the places
view
- Ignore double-click events
+ Avoid some crashes in CSS parsing error handling
-- Iain Lane <laney@debian.org> Tue, 17 Nov 2015 14:10:09 +0000
gtk+3.0 (3.18.4-1) unstable; urgency=medium
* New upstream stable release 3.18.4
+ Revert a GtkTextBuffer change that broke binding API
- Remove downstream cherry-picks for this change.
+ Properly refresh styles when widget names change
-- Iain Lane <laney@debian.org> Fri, 13 Nov 2015 13:19:47 +0000
gtk+3.0 (3.18.3-3) unstable; urgency=medium
* Revert "textbuffer: nicer get_iter functions" and related commits since
this broke the bindings API. (Closes: #804798)
-- Michael Biebl <biebl@debian.org> Thu, 12 Nov 2015 18:50:55 +0100
gtk+3.0 (3.18.3-2) unstable; urgency=medium
* The placesview API was not supposed to be public, so those symbols were
removed. Update the libgtk-3-0.symbols file accordingly.
-- Michael Biebl <biebl@debian.org> Wed, 11 Nov 2015 02:39:56 +0100
gtk+3.0 (3.18.3-1) unstable; urgency=medium
* New upstream release.
* Refresh patches.
* Drop Recommends on hicolor-icon-theme from libgtk-3-0 as libgtk-3-common
already has a Depends on adwaita-icon-theme.
-- Michael Biebl <biebl@debian.org> Wed, 11 Nov 2015 01:41:11 +0100
gtk+3.0 (3.18.2-1) unstable; urgency=medium
* New upstream release.
* Refresh patches.
-- Michael Biebl <biebl@debian.org> Tue, 13 Oct 2015 23:07:49 +0200
gtk+3.0 (3.18.1-2) unstable; urgency=medium
* Add debian/patches/git_stylecontext-make-sure-valid.patch
- patch from upstream git to fix crash with some themes (Closes: #800911)
-- Andreas Henriksson <andreas@fatal.se> Sun, 11 Oct 2015 01:21:46 +0200
gtk+3.0 (3.18.1-1) unstable; urgency=medium
* New upstream release.
* Refresh patches.
* Drop debian/patches/git_bitmask-dont-hardcode-64bit-size.patch, merged
upstream.
-- Michael Biebl <biebl@debian.org> Thu, 08 Oct 2015 00:41:06 +0200
gtk+3.0 (3.18.0-4) unstable; urgency=medium
* Team upload.
* gir1.2-gtk-3.0 Breaks pre-3.18 versions of pygobject (Closes: #800798)
-- Simon McVittie <smcv@debian.org> Sun, 04 Oct 2015 15:46:54 +0100
gtk+3.0 (3.18.0-3) unstable; urgency=medium
[ Michael Biebl ]

20
debian/control vendored
View File

@ -2,7 +2,7 @@ Source: gtk+3.0
Section: libs
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
Uploaders: Andreas Henriksson <andreas@fatal.se>, Dmitry Shachnev <mitya57@debian.org>, Emilio Pozuelo Monfort <pochu@debian.org>, Iain Lane <laney@debian.org>, Michael Biebl <biebl@debian.org>
Uploaders: Iain Lane <laney@debian.org>, Michael Biebl <biebl@debian.org>
Build-Depends: debhelper (>= 8.1.3),
cdbs (>= 0.4.93),
gnome-pkg-tools (>= 0.11),
@ -53,9 +53,9 @@ Build-Depends-Indep: docbook-xml,
libatk1.0-doc,
libpango1.0-doc,
libcairo2-doc
Standards-Version: 3.9.6
Standards-Version: 3.9.7
Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gtk+3.0/
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gtk+3.0/
Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gtk+3.0/
Homepage: http://www.gtk.org/
Package: libgtk-3-0
@ -66,11 +66,11 @@ Depends: libgtk-3-common (>= ${source:Version}),
${shlibs:Depends},
shared-mime-info
Provides: gtk3-binver-3.0.0
Recommends: hicolor-icon-theme,
libgtk-3-bin
Recommends: libgtk-3-bin
Suggests: librsvg2-common,
gvfs
Breaks: gnome-themes-standard (<< 3.6), gtk3-engines-oxygen (<< 1.4.1-3)
Breaks: gnome-themes-standard (<< 3.6),
gtk3-engines-oxygen (<< 1.4.1-3)
Pre-Depends: ${misc:Pre-Depends}
Description: GTK+ graphical user interface library
GTK+ is a multi-platform toolkit for creating graphical user
@ -103,7 +103,8 @@ Package: libgtk-3-common
Section: misc
Architecture: all
Multi-Arch: foreign
Depends: ${misc:Depends}, adwaita-icon-theme (>= ${gnome:Version})
Depends: ${misc:Depends},
adwaita-icon-theme (>= ${gnome:Version})
Recommends: libgtk-3-0
Breaks: libgtk-3-0 (<< 3.5.4)
Replaces: libgtk-3-0 (<< 3.5.4)
@ -231,6 +232,8 @@ Depends: libgtk-3-common,
${misc:Depends},
${shlibs:Depends},
${gir:Depends}
Breaks: python-gi (<< 3.18),
python3-gi (<< 3.18),
Description: GTK+ graphical user interface library -- gir bindings
GTK+ is a multi-platform toolkit for creating graphical user
interfaces. Offering a complete set of widgets, GTK+ is suitable
@ -279,7 +282,8 @@ Architecture: any
Multi-Arch: same
Section: debug
Priority: extra
Depends: ${misc:Depends}, libgail-3-0 (= ${binary:Version})
Depends: ${misc:Depends},
libgail-3-0 (= ${binary:Version})
Recommends: libgtk-3-0-dbg
Description: Gail libraries and debugging symbols
Gail is the "GNOME Accessibility Implementation Library".

18
debian/control.in vendored
View File

@ -53,9 +53,9 @@ Build-Depends-Indep: docbook-xml,
libatk1.0-doc,
libpango1.0-doc,
libcairo2-doc
Standards-Version: 3.9.6
Standards-Version: 3.9.7
Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gtk+3.0/
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gtk+3.0/
Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gtk+3.0/
Homepage: http://www.gtk.org/
Package: @SHARED_PKG@
@ -66,11 +66,11 @@ Depends: @COMMON_PKG@ (>= ${source:Version}),
${shlibs:Depends},
shared-mime-info
Provides: @GTK_BINVER_DEP@
Recommends: hicolor-icon-theme,
@BIN_PKG@
Recommends: @BIN_PKG@
Suggests: librsvg2-common,
gvfs
Breaks: gnome-themes-standard (<< 3.6), gtk3-engines-oxygen (<< 1.4.1-3)
Breaks: gnome-themes-standard (<< 3.6),
gtk3-engines-oxygen (<< 1.4.1-3)
Pre-Depends: ${misc:Pre-Depends}
Description: GTK+ graphical user interface library
GTK+ is a multi-platform toolkit for creating graphical user
@ -103,7 +103,8 @@ Package: @COMMON_PKG@
Section: misc
Architecture: all
Multi-Arch: foreign
Depends: ${misc:Depends}, adwaita-icon-theme (>= ${gnome:Version})
Depends: ${misc:Depends},
adwaita-icon-theme (>= ${gnome:Version})
Recommends: @SHARED_PKG@
Breaks: @SHARED_PKG@ (<< 3.5.4)
Replaces: @SHARED_PKG@ (<< 3.5.4)
@ -231,6 +232,8 @@ Depends: @COMMON_PKG@,
${misc:Depends},
${shlibs:Depends},
${gir:Depends}
Breaks: python-gi (<< 3.18),
python3-gi (<< 3.18),
Description: GTK+ graphical user interface library -- gir bindings
GTK+ is a multi-platform toolkit for creating graphical user
interfaces. Offering a complete set of widgets, GTK+ is suitable
@ -279,7 +282,8 @@ Architecture: any
Multi-Arch: same
Section: debug
Priority: extra
Depends: ${misc:Depends}, libgail-3-0 (= ${binary:Version})
Depends: ${misc:Depends},
libgail-3-0 (= ${binary:Version})
Recommends: @DEBUG_PKG@
Description: Gail libraries and debugging symbols
Gail is the "GNOME Accessibility Implementation Library".

12
debian/copyright vendored
View File

@ -103,7 +103,6 @@ License: LGPL-2+
.
See /usr/share/common-licenses/LGPL-2 on your debian system.
Files: gtk/gtkcomboboxtext.h
gtk/gtktoolpaletteprivate.h
gtk/gtktoolitemgroup.*
@ -135,8 +134,6 @@ License: LGPL-2.1+
.
See /usr/share/common-licenses/LGPL-2.1 on your debian system.
Files: po/*
po-properties/*
Copyright: Copyright (C) 1998-2010 The Free Software Foundation, Inc.
@ -486,13 +483,13 @@ License: LGPL-2+
Files: gdk/win32/wintab.h
gdk/win32/pktdef.h
gtk/gtktextmark.*
Copyright: Copyright (C) 1991-1998 LCS/Telegraphics
License: other
The text and information contained in this file may be freely used,
copied, or distributed without compensation or licensing restrictions.
Files: gtk/gtktexttag.*
gtk/gtktextmark.*
gtk/gtktextsegment.c
gtk/gtktextchild.c
gtk/gtktextchildprivate.h
@ -606,13 +603,6 @@ License: LGPL-2+ or other
.
See /usr/share/common-licenses/LGPL-2 on your debian system.
Files: m4/introspection.m4
Copyright: Copyright (C) Johan Dahlin
License: other
This file is free software; the author(s) gives unlimited
permission to copy and/or distribute it, with or without
modifications, as long as this notice is preserved.
Files:
gdk/broadway/rawinflate.min.js
debian/missing-sources/zlib.js-0.1.6

9
debian/libgtk-3-0.symbols vendored
View File

@ -2852,15 +2852,6 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
gtk_places_sidebar_set_show_other_locations@Base 3.17.9
gtk_places_sidebar_set_show_recent@Base 3.17.9
gtk_places_sidebar_set_show_trash@Base 3.17.9
gtk_places_view_get_loading@Base 3.17.9
gtk_places_view_get_local_only@Base 3.17.9
gtk_places_view_get_open_flags@Base 3.17.9
gtk_places_view_get_search_query@Base 3.17.9
gtk_places_view_get_type@Base 3.17.9
gtk_places_view_new@Base 3.17.9
gtk_places_view_set_local_only@Base 3.17.9
gtk_places_view_set_open_flags@Base 3.17.9
gtk_places_view_set_search_query@Base 3.17.9
gtk_plug_construct@Base 3.0.0
gtk_plug_construct_for_display@Base 3.0.0
gtk_plug_get_embedded@Base 3.0.0

8
debian/patches/015_default-fallback-icon-theme.patch vendored
View File

@ -1,8 +1,8 @@
Index: gtk+-3.16.6/gtk/gtksettings.c
Index: gtk+-3.18.3/gtk/gtksettings.c
===================================================================
--- gtk+-3.16.6.orig/gtk/gtksettings.c 2015-07-22 21:04:31.312918612 +0200
+++ gtk+-3.16.6/gtk/gtksettings.c 2015-07-22 21:04:31.308918550 +0200
@@ -461,7 +461,7 @@
--- gtk+-3.18.3.orig/gtk/gtksettings.c 2015-11-11 01:32:31.859659829 +0100
+++ gtk+-3.18.3/gtk/gtksettings.c 2015-11-11 01:32:31.859659829 +0100
@@ -467,7 +467,7 @@
g_param_spec_string ("gtk-fallback-icon-theme",
P_("Fallback Icon Theme Name"),
P_("Name of a icon theme to fall back to"),

8
debian/patches/016_no_offscreen_widgets_grabbing.patch vendored
View File

@ -3,11 +3,11 @@ Author: Cody Russell <bratsche@gnome.org>
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=607668
Bug-Ubuntu: https://bugs.launchpad.net/bugs/512427
Index: gtk+-3.16.6/gtk/gtkmain.c
Index: gtk+-3.18.2/gtk/gtkmain.c
===================================================================
--- gtk+-3.16.6.orig/gtk/gtkmain.c 2015-07-22 21:04:35.528984593 +0200
+++ gtk+-3.16.6/gtk/gtkmain.c 2015-07-22 21:04:35.524984530 +0200
@@ -2064,9 +2064,14 @@
--- gtk+-3.18.2.orig/gtk/gtkmain.c 2015-10-13 21:40:57.143828925 +0200
+++ gtk+-3.18.2/gtk/gtkmain.c 2015-10-13 21:40:57.139828869 +0200
@@ -2163,9 +2163,14 @@
{
GtkWindowGroup *group;
GtkWidget *old_grab_widget;

8
debian/patches/017_no_offscreen_device_grabbing.patch vendored
View File

@ -3,11 +3,11 @@ Author: Robert Carr <racarr@canonical.com>
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=658563
Bug-Ubuntu: https://launchpad.net/bugs/804009
Index: gtk+-3.16.6/gtk/gtkmain.c
Index: gtk+-3.18.2/gtk/gtkmain.c
===================================================================
--- gtk+-3.16.6.orig/gtk/gtkmain.c 2015-07-22 21:04:37.829020576 +0200
+++ gtk+-3.16.6/gtk/gtkmain.c 2015-07-22 21:04:37.825020513 +0200
@@ -2157,9 +2157,14 @@
--- gtk+-3.18.2.orig/gtk/gtkmain.c 2015-10-13 21:41:02.115896913 +0200
+++ gtk+-3.18.2/gtk/gtkmain.c 2015-10-13 21:41:02.111896858 +0200
@@ -2256,9 +2256,14 @@
{
GtkWindowGroup *group;
GtkWidget *old_grab_widget;

8
debian/patches/060_ignore-random-icons.patch vendored
View File

@ -1,6 +1,8 @@
--- a/gtk/updateiconcache.c
+++ b/gtk/updateiconcache.c
@@ -676,7 +676,7 @@
Index: gtk+-3.18.1/gtk/updateiconcache.c
===================================================================
--- gtk+-3.18.1.orig/gtk/updateiconcache.c 2015-10-08 00:19:36.650119362 +0200
+++ gtk+-3.18.1/gtk/updateiconcache.c 2015-10-08 00:19:36.646119308 +0200
@@ -678,7 +678,7 @@
directories = g_list_append (directories, g_strdup (subdir));
}
else

8
debian/patches/071_fix-installation-of-HTML-images.patch vendored
View File

@ -11,9 +11,11 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=656803
gtk-doc.make | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/gtk-doc.make
+++ b/gtk-doc.make
@@ -182,8 +182,8 @@
Index: gtk+-3.18.7/gtk-doc.make
===================================================================
--- gtk+-3.18.7.orig/gtk-doc.make 2016-02-02 04:40:46.781788412 +0100
+++ gtk+-3.18.7/gtk-doc.make 2016-02-02 04:40:46.777788569 +0100
@@ -193,8 +193,8 @@
if test -f $(abs_srcdir)/$$file ; then \
cp $(abs_srcdir)/$$file $(abs_builddir)/html; \
fi; \

1
debian/patches/series vendored
View File

@ -7,4 +7,3 @@
060_ignore-random-icons.patch
071_fix-installation-of-HTML-images.patch
reftest-known-fail.patch
git_bitmask-dont-hardcode-64bit-size.patch

1
debian/rules vendored
View File

@ -156,6 +156,7 @@ clean:: debian/control
touch debian/control.in
rm -f $(call dh_subst_files,$(DEB_ALL_PACKAGES))
rm -f testsuite/reftests/*.ui.known_fail
rm -rf debian/build debian/install
pre-build::
# Mark reftests with known failures as non-fatal