* New upstream release
* debian/control: - Bump build-depends on libglib2.0-dev, libgdk-pixbuf2.0-dev, libatk1.0-dev, gobject-introspection * debian/libgail3.0-0.symbols: * debian/libgtk3.0-0.symbols: - Updated - Mark symbols with stable version number * debian/rules: - Bump SHVER
This commit is contained in:
parent
ee1672ee1f
commit
278ef1242d
15
debian/changelog
vendored
15
debian/changelog
vendored
@ -1,3 +1,18 @@
|
|||||||
|
gtk+3.0 (3.0.0-1) UNRELEASED; urgency=low
|
||||||
|
|
||||||
|
* New upstream release
|
||||||
|
* debian/control:
|
||||||
|
- Bump build-depends on libglib2.0-dev, libgdk-pixbuf2.0-dev, libatk1.0-dev,
|
||||||
|
gobject-introspection
|
||||||
|
* debian/libgail3.0-0.symbols:
|
||||||
|
* debian/libgtk3.0-0.symbols:
|
||||||
|
- Updated
|
||||||
|
- Mark symbols with stable version number
|
||||||
|
* debian/rules:
|
||||||
|
- Bump SHVER
|
||||||
|
|
||||||
|
-- Robert Ancell <robert.ancell@canonical.com> Mon, 14 Feb 2011 09:56:54 +1100
|
||||||
|
|
||||||
gtk+3.0 (2.99.3-1) UNRELEASED; urgency=low
|
gtk+3.0 (2.99.3-1) UNRELEASED; urgency=low
|
||||||
|
|
||||||
* New upstream release.
|
* New upstream release.
|
||||||
|
42
debian/control
vendored
42
debian/control
vendored
@ -2,7 +2,7 @@ Source: gtk+3.0
|
|||||||
Section: libs
|
Section: libs
|
||||||
Priority: optional
|
Priority: optional
|
||||||
Maintainer: Sebastien Bacher <seb128@debian.org>
|
Maintainer: Sebastien Bacher <seb128@debian.org>
|
||||||
Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu@debian.org>, Sebastian Dröge <slomo@debian.org>, Sjoerd Simons <sjoerd@debian.org>
|
Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu@debian.org>, Sjoerd Simons <sjoerd@debian.org>
|
||||||
Build-Depends: debhelper (>= 7.0.50~),
|
Build-Depends: debhelper (>= 7.0.50~),
|
||||||
cdbs (>= 0.4.90~),
|
cdbs (>= 0.4.90~),
|
||||||
gnome-pkg-tools (>= 0.11),
|
gnome-pkg-tools (>= 0.11),
|
||||||
@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 7.0.50~),
|
|||||||
gettext,
|
gettext,
|
||||||
pkg-config,
|
pkg-config,
|
||||||
autotools-dev,
|
autotools-dev,
|
||||||
libglib2.0-dev (>= 2.27.5),
|
libglib2.0-dev (>= 2.28.0),
|
||||||
libgdk-pixbuf2.0-dev (>= 2.22.1),
|
libgdk-pixbuf2.0-dev (>= 2.22.1),
|
||||||
libpango1.0-dev (>= 1.28.3-2),
|
libpango1.0-dev (>= 1.28.3-2),
|
||||||
libatk1.0-dev (>= 1.32.0),
|
libatk1.0-dev (>= 1.32.0),
|
||||||
@ -31,8 +31,8 @@ Build-Depends: debhelper (>= 7.0.50~),
|
|||||||
libcairo2-dev (>= 1.10.0),
|
libcairo2-dev (>= 1.10.0),
|
||||||
x11proto-xext-dev,
|
x11proto-xext-dev,
|
||||||
libcups2-dev (>= 1.2),
|
libcups2-dev (>= 1.2),
|
||||||
gobject-introspection (>= 0.9.12-4~),
|
gobject-introspection (>= 0.10.1),
|
||||||
libgirepository1.0-dev (>= 0.9.3),
|
libgirepository1.0-dev (>= 0.10.1),
|
||||||
gir1.2-glib-2.0,
|
gir1.2-glib-2.0,
|
||||||
gir1.2-freedesktop,
|
gir1.2-freedesktop,
|
||||||
gir1.2-atk-1.0,
|
gir1.2-atk-1.0,
|
||||||
@ -126,10 +126,10 @@ Depends: libgtk3.0-0 (= ${binary:Version}),
|
|||||||
libgtk3.0-common,
|
libgtk3.0-common,
|
||||||
${misc:Depends},
|
${misc:Depends},
|
||||||
${shlibs:Depends},
|
${shlibs:Depends},
|
||||||
libglib2.0-dev (>= 2.27.5),
|
libglib2.0-dev (>= 2.28.0),
|
||||||
libgdk-pixbuf2.0-dev (>= 2.21.0),
|
libgdk-pixbuf2.0-dev (>= 2.22.1),
|
||||||
libpango1.0-dev (>= 1.20),
|
libpango1.0-dev (>= 1.20),
|
||||||
libatk1.0-dev (>= 1.29.2),
|
libatk1.0-dev (>= 1.32.0),
|
||||||
libcairo2-dev (>= 1.9.10),
|
libcairo2-dev (>= 1.9.10),
|
||||||
libx11-dev (>= 2:1.0.0-6),
|
libx11-dev (>= 2:1.0.0-6),
|
||||||
libxext-dev (>= 1:1.0.1-2),
|
libxext-dev (>= 1:1.0.1-2),
|
||||||
@ -204,20 +204,20 @@ Description: Examples files for the GTK+ 3.0
|
|||||||
This package contains the examples files and a demonstration program
|
This package contains the examples files and a demonstration program
|
||||||
for the GTK+-3.0.
|
for the GTK+-3.0.
|
||||||
|
|
||||||
Package: gtk3-engines-pixbuf
|
#Package: gtk3-engines-pixbuf
|
||||||
Section: graphics
|
#Section: graphics
|
||||||
Architecture: any
|
#Architecture: any
|
||||||
Depends: ${misc:Depends},
|
#Depends: ${misc:Depends},
|
||||||
${shlibs:Depends},
|
# ${shlibs:Depends},
|
||||||
libgtk3.0-0 (= ${binary:Version}),
|
# libgtk3.0-0 (= ${binary:Version}),
|
||||||
libgtk3.0-common
|
# libgtk3.0-common
|
||||||
Description: Pixbuf-based theme for GTK+ 3.x
|
#Description: Pixbuf-based theme for GTK+ 3.x
|
||||||
The GTK+ is a multi-platform toolkit for creating graphical user
|
# The GTK+ is a multi-platform toolkit for creating graphical user
|
||||||
interfaces. Offering a complete set of widgets, the GTK+ is suitable
|
# interfaces. Offering a complete set of widgets, the GTK+ is suitable
|
||||||
for projects ranging from small one-off tools to complete application
|
# for projects ranging from small one-off tools to complete application
|
||||||
suites.
|
# suites.
|
||||||
.
|
# .
|
||||||
This package contains the pixbuf theme engine.
|
# This package contains the pixbuf theme engine.
|
||||||
|
|
||||||
Package: gir1.2-gtk-3.0
|
Package: gir1.2-gtk-3.0
|
||||||
Architecture: any
|
Architecture: any
|
||||||
|
8
debian/control.in
vendored
8
debian/control.in
vendored
@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 7.0.50~),
|
|||||||
gettext,
|
gettext,
|
||||||
pkg-config,
|
pkg-config,
|
||||||
autotools-dev,
|
autotools-dev,
|
||||||
libglib2.0-dev (>= 2.27.5),
|
libglib2.0-dev (>= 2.28.0),
|
||||||
libgdk-pixbuf2.0-dev (>= 2.22.1),
|
libgdk-pixbuf2.0-dev (>= 2.22.1),
|
||||||
libpango1.0-dev (>= 1.28.3-2),
|
libpango1.0-dev (>= 1.28.3-2),
|
||||||
libatk1.0-dev (>= 1.32.0),
|
libatk1.0-dev (>= 1.32.0),
|
||||||
@ -126,10 +126,10 @@ Depends: @SHARED_PKG@ (= ${binary:Version}),
|
|||||||
@COMMON_PKG@,
|
@COMMON_PKG@,
|
||||||
${misc:Depends},
|
${misc:Depends},
|
||||||
${shlibs:Depends},
|
${shlibs:Depends},
|
||||||
libglib2.0-dev (>= 2.27.5),
|
libglib2.0-dev (>= 2.28.0),
|
||||||
libgdk-pixbuf2.0-dev (>= 2.21.0),
|
libgdk-pixbuf2.0-dev (>= 2.22.1),
|
||||||
libpango1.0-dev (>= 1.20),
|
libpango1.0-dev (>= 1.20),
|
||||||
libatk1.0-dev (>= 1.29.2),
|
libatk1.0-dev (>= 1.32.0),
|
||||||
libcairo2-dev (>= 1.9.10),
|
libcairo2-dev (>= 1.9.10),
|
||||||
libx11-dev (>= 2:1.0.0-6),
|
libx11-dev (>= 2:1.0.0-6),
|
||||||
libxext-dev (>= 1:1.0.1-2),
|
libxext-dev (>= 1:1.0.1-2),
|
||||||
|
28
debian/libgail3.0-0.symbols
vendored
28
debian/libgail3.0-0.symbols
vendored
@ -1,15 +1,15 @@
|
|||||||
libgailutil-3.0.so.0 libgail3.0-0 #MINVER#
|
libgailutil-3.so.0 libgail3.0-0 #MINVER#
|
||||||
gail_misc_add_attribute@Base 2.99.1
|
gail_misc_add_attribute@Base 3.0.0
|
||||||
gail_misc_buffer_get_run_attributes@Base 2.99.1
|
gail_misc_buffer_get_run_attributes@Base 3.0.0
|
||||||
gail_misc_get_default_attributes@Base 2.99.1
|
gail_misc_get_default_attributes@Base 3.0.0
|
||||||
gail_misc_get_extents_from_pango_rectangle@Base 2.99.1
|
gail_misc_get_extents_from_pango_rectangle@Base 3.0.0
|
||||||
gail_misc_get_index_at_point_in_layout@Base 2.99.1
|
gail_misc_get_index_at_point_in_layout@Base 3.0.0
|
||||||
gail_misc_get_origins@Base 2.99.1
|
gail_misc_get_origins@Base 3.0.0
|
||||||
gail_misc_layout_get_run_attributes@Base 2.99.1
|
gail_misc_layout_get_run_attributes@Base 3.0.0
|
||||||
gail_text_util_buffer_setup@Base 2.99.1
|
gail_text_util_buffer_setup@Base 3.0.0
|
||||||
gail_text_util_get_substring@Base 2.99.1
|
gail_text_util_get_substring@Base 3.0.0
|
||||||
gail_text_util_get_text@Base 2.99.1
|
gail_text_util_get_text@Base 3.0.0
|
||||||
gail_text_util_get_type@Base 2.99.1
|
gail_text_util_get_type@Base 3.0.0
|
||||||
gail_text_util_new@Base 2.99.1
|
gail_text_util_new@Base 3.0.0
|
||||||
gail_text_util_text_setup@Base 2.99.1
|
gail_text_util_text_setup@Base 3.0.0
|
||||||
|
|
||||||
|
8622
debian/libgtk3.0-0.symbols
vendored
8622
debian/libgtk3.0-0.symbols
vendored
File diff suppressed because it is too large
Load Diff
@ -2,11 +2,11 @@ Description: Don't query immodules for the local tree when cross-compiling or
|
|||||||
when --disable-shared was given
|
when --disable-shared was given
|
||||||
Bug: http://bugzilla.gnome.org/show_bug.cgi?id=346531
|
Bug: http://bugzilla.gnome.org/show_bug.cgi?id=346531
|
||||||
|
|
||||||
Index: gtk+-2.91.7/configure.ac
|
Index: gtk+-3.0.0/configure.ac
|
||||||
===================================================================
|
===================================================================
|
||||||
--- gtk+-2.91.7.orig/configure.ac 2010-12-22 04:06:59.000000000 +1100
|
--- gtk+-3.0.0.orig/configure.ac 2011-02-11 05:04:26.000000000 +1100
|
||||||
+++ gtk+-2.91.7/configure.ac 2010-12-22 13:16:50.083372001 +1100
|
+++ gtk+-3.0.0/configure.ac 2011-02-14 11:28:49.798142002 +1100
|
||||||
@@ -197,6 +197,8 @@
|
@@ -204,6 +204,8 @@
|
||||||
# Create libtool early, because it's used in configure
|
# Create libtool early, because it's used in configure
|
||||||
LT_OUTPUT
|
LT_OUTPUT
|
||||||
|
|
||||||
@ -15,10 +15,10 @@ Index: gtk+-2.91.7/configure.ac
|
|||||||
# Make sure we use 64-bit versions of various file stuff.
|
# Make sure we use 64-bit versions of various file stuff.
|
||||||
AC_SYS_LARGEFILE
|
AC_SYS_LARGEFILE
|
||||||
|
|
||||||
Index: gtk+-2.91.7/modules/input/Makefile.am
|
Index: gtk+-3.0.0/modules/input/Makefile.am
|
||||||
===================================================================
|
===================================================================
|
||||||
--- gtk+-2.91.7.orig/modules/input/Makefile.am 2010-12-22 04:06:55.000000000 +1100
|
--- gtk+-3.0.0.orig/modules/input/Makefile.am 2011-02-11 05:20:41.000000000 +1100
|
||||||
+++ gtk+-2.91.7/modules/input/Makefile.am 2010-12-22 13:16:50.083372001 +1100
|
+++ gtk+-3.0.0/modules/input/Makefile.am 2011-02-14 11:28:49.798142002 +1100
|
||||||
@@ -174,8 +174,12 @@
|
@@ -174,8 +174,12 @@
|
||||||
if CROSS_COMPILING
|
if CROSS_COMPILING
|
||||||
RUN_QUERY_IMMODULES_TEST=false
|
RUN_QUERY_IMMODULES_TEST=false
|
||||||
|
16
debian/patches/003_gdk.pc_privates.patch
vendored
16
debian/patches/003_gdk.pc_privates.patch
vendored
@ -1,6 +1,8 @@
|
|||||||
--- a/configure.ac
|
Index: gtk+-3.0.0/configure.ac
|
||||||
+++ b/configure.ac
|
===================================================================
|
||||||
@@ -1238,20 +1238,23 @@
|
--- gtk+-3.0.0.orig/configure.ac 2011-02-14 11:28:49.000000000 +1100
|
||||||
|
+++ gtk+-3.0.0/configure.ac 2011-02-14 11:29:26.737459339 +1100
|
||||||
|
@@ -1229,20 +1229,23 @@
|
||||||
CFLAGS="$saved_cflags"
|
CFLAGS="$saved_cflags"
|
||||||
LDFLAGS="$saved_ldflags"
|
LDFLAGS="$saved_ldflags"
|
||||||
|
|
||||||
@ -28,12 +30,14 @@
|
|||||||
AC_SUBST(GDK_EXTRA_LIBS)
|
AC_SUBST(GDK_EXTRA_LIBS)
|
||||||
AC_SUBST(GDK_EXTRA_CFLAGS)
|
AC_SUBST(GDK_EXTRA_CFLAGS)
|
||||||
AC_SUBST(GDK_DEP_LIBS)
|
AC_SUBST(GDK_DEP_LIBS)
|
||||||
--- a/gdk-3.0.pc.in
|
Index: gtk+-3.0.0/gdk-3.0.pc.in
|
||||||
+++ b/gdk-3.0.pc.in
|
===================================================================
|
||||||
|
--- gtk+-3.0.0.orig/gdk-3.0.pc.in 2011-02-11 06:25:43.000000000 +1100
|
||||||
|
+++ gtk+-3.0.0/gdk-3.0.pc.in 2011-02-14 11:29:26.737459339 +1100
|
||||||
@@ -8,5 +8,6 @@
|
@@ -8,5 +8,6 @@
|
||||||
Description: GTK+ Drawing Kit
|
Description: GTK+ Drawing Kit
|
||||||
Version: @VERSION@
|
Version: @VERSION@
|
||||||
Requires: @GDK_PACKAGES@
|
Requires: @GDK_PACKAGES@
|
||||||
+Requires.private: @GDK_PRIVATE_PACKAGES@
|
+Requires.private: @GDK_PRIVATE_PACKAGES@
|
||||||
Libs: -L${libdir} -lgdk-@GTK_API_VERSION@ @GDK_EXTRA_LIBS@
|
Libs: -L${libdir} -lgdk-3 @GDK_EXTRA_LIBS@
|
||||||
Cflags: -I${includedir}/gtk-@GTK_API_VERSION@ @GDK_EXTRA_CFLAGS@
|
Cflags: -I${includedir}/gtk-@GTK_API_VERSION@ @GDK_EXTRA_CFLAGS@
|
||||||
|
@ -1,6 +1,8 @@
|
|||||||
--- a/gtk/gtksettings.c
|
Index: gtk+3.0-2.99.3/gtk/gtksettings.c
|
||||||
+++ b/gtk/gtksettings.c
|
===================================================================
|
||||||
@@ -385,7 +385,7 @@
|
--- gtk+3.0-2.99.3.orig/gtk/gtksettings.c
|
||||||
|
+++ gtk+3.0-2.99.3/gtk/gtksettings.c
|
||||||
|
@@ -414,7 +414,7 @@
|
||||||
g_param_spec_string ("gtk-fallback-icon-theme",
|
g_param_spec_string ("gtk-fallback-icon-theme",
|
||||||
P_("Fallback Icon Theme Name"),
|
P_("Fallback Icon Theme Name"),
|
||||||
P_("Name of a icon theme to fall back to"),
|
P_("Name of a icon theme to fall back to"),
|
||||||
|
@ -1,6 +1,8 @@
|
|||||||
--- a/gtk/gtktreeview.c
|
Index: gtk+-3.0.0/gtk/gtktreeview.c
|
||||||
+++ b/gtk/gtktreeview.c
|
===================================================================
|
||||||
@@ -10096,7 +10096,8 @@
|
--- gtk+-3.0.0.orig/gtk/gtktreeview.c 2011-02-10 23:27:24.000000000 +1100
|
||||||
|
+++ gtk+-3.0.0/gtk/gtktreeview.c 2011-02-14 11:29:32.687354277 +1100
|
||||||
|
@@ -10120,7 +10120,8 @@
|
||||||
|
|
||||||
if (cursor_path)
|
if (cursor_path)
|
||||||
{
|
{
|
||||||
|
2
debian/rules
vendored
2
debian/rules
vendored
@ -25,7 +25,7 @@ LDFLAGS += -Wl,-O1
|
|||||||
|
|
||||||
APIVER := 3.0
|
APIVER := 3.0
|
||||||
SONAME := 0
|
SONAME := 0
|
||||||
SHVER := 2.99.2
|
SHVER := 3.0.0
|
||||||
|
|
||||||
ifneq (,$(findstring multiarch,$(DEB_BUILD_OPTIONS)))
|
ifneq (,$(findstring multiarch,$(DEB_BUILD_OPTIONS)))
|
||||||
LIBDIR := usr/lib/$(DEB_HOST_GNU_TYPE)
|
LIBDIR := usr/lib/$(DEB_HOST_GNU_TYPE)
|
||||||
|
Loading…
Reference in New Issue
Block a user