r40735 - in /desktop/experimental/gnome-terminal/debian: changelog control control.in patches/10_kfreebsd-f_dupfd_cloexec.patch patches/git-add-quit.patch patches/nautilus-x11.patch patches/series rules
ah at users.alioth.debian.org
ah at users.alioth.debian.org
Mon Feb 24 20:56:40 UTC 2014
Author: ah
Date: Mon Feb 24 20:56:39 2014
New Revision: 40735
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=40735
Log:
* New upstream release.
* Bump build-dependencies according to configure.ac:
- intltool 0.50.0
- vte 0.35.1
- glib 2.39.2
* Make debian/patches/10_kfreebsd-f_dupfd_cloexec.patch apply again.
* Drop debian/patches/git-add-quit.patch, now included in upstream release.
* Add build-dependency on gnome-shell
- dbus interface xml needed by new search provider
* Add build-dependency on libnautilus-extension-dev
* Add new patch debian/patches/nautilus-x11.patch
- build fails because of -Wl,-z,defs missing -lX11 in nautilus extension
* Include autoreconf.mk cdbs snippet and build-depend on dh-autoreconf
Added:
desktop/experimental/gnome-terminal/debian/patches/nautilus-x11.patch
Removed:
desktop/experimental/gnome-terminal/debian/patches/git-add-quit.patch
Modified:
desktop/experimental/gnome-terminal/debian/changelog
desktop/experimental/gnome-terminal/debian/control
desktop/experimental/gnome-terminal/debian/control.in
desktop/experimental/gnome-terminal/debian/patches/10_kfreebsd-f_dupfd_cloexec.patch
desktop/experimental/gnome-terminal/debian/patches/series
desktop/experimental/gnome-terminal/debian/rules
Modified: desktop/experimental/gnome-terminal/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-terminal/debian/changelog?rev=40735&op=diff
==============================================================================
--- desktop/experimental/gnome-terminal/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-terminal/debian/changelog [utf-8] Mon Feb 24 20:56:39 2014
@@ -1,12 +1,27 @@
-gnome-terminal (3.10.1-2) UNRELEASED; urgency=medium
-
- * Team upload.
+gnome-terminal (3.11.3-1) experimental; urgency=medium
+
+ [ Fabian Greffrath ]
* debian/README.Debian: Document how to make new tabs opened within
Gnome Terminal have the same working directory as the current tab
(see #706065). Taken from the vte3 package, where this was already
documented but apparently not easily found.
- -- Fabian Greffrath <fabian+debian at greffrath.com> Tue, 21 Jan 2014 10:02:58 +0100
+ [ Andreas Henriksson ]
+ * New upstream release.
+ * Bump build-dependencies according to configure.ac:
+ - intltool 0.50.0
+ - vte 0.35.1
+ - glib 2.39.2
+ * Make debian/patches/10_kfreebsd-f_dupfd_cloexec.patch apply again.
+ * Drop debian/patches/git-add-quit.patch, now included in upstream release.
+ * Add build-dependency on gnome-shell
+ - dbus interface xml needed by new search provider
+ * Add build-dependency on libnautilus-extension-dev
+ * Add new patch debian/patches/nautilus-x11.patch
+ - build fails because of -Wl,-z,defs missing -lX11 in nautilus extension
+ * Include autoreconf.mk cdbs snippet and build-depend on dh-autoreconf
+
+ -- Andreas Henriksson <andreas at fatal.se> Mon, 24 Feb 2014 20:43:28 +0100
gnome-terminal (3.10.1-1) unstable; urgency=low
Modified: desktop/experimental/gnome-terminal/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-terminal/debian/control?rev=40735&op=diff
==============================================================================
--- desktop/experimental/gnome-terminal/debian/control [utf-8] (original)
+++ desktop/experimental/gnome-terminal/debian/control [utf-8] Mon Feb 24 20:56:39 2014
@@ -7,19 +7,20 @@
Section: gnome
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd at debian.org>
+Uploaders: Andreas Henriksson <andreas at fatal.se>, Emilio Pozuelo Monfort <pochu at debian.org>, Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd at debian.org>
Standards-Version: 3.9.4
Build-Depends: cdbs (>= 0.4.41),
debhelper (>= 8),
+ dh-autoreconf,
gnome-common,
autotools-dev,
- intltool (>= 0.40.0),
+ intltool (>= 0.50.0),
libx11-dev,
libdconf-dev (>= 0.14.0),
libgtk-3-dev (>= 3.6.0),
libgtk2.0-dev,
- libglib2.0-dev (>= 2.33.2),
- libvte-2.90-dev (>= 1:0.34.6),
+ libglib2.0-dev (>= 2.39.2),
+ libvte-2.90-dev (>= 1:0.35.1),
libsm-dev,
gnome-pkg-tools (>= 0.10),
docbook-to-man,
@@ -28,7 +29,9 @@
yelp-tools,
libgconf2-dev (>= 2.31.3),
desktop-file-utils,
- gsettings-desktop-schemas-dev (>= 0.1.0)
+ gsettings-desktop-schemas-dev (>= 0.1.0),
+ gnome-shell,
+ libnautilus-extension-dev
Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gnome-terminal/
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-terminal/
Modified: desktop/experimental/gnome-terminal/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-terminal/debian/control.in?rev=40735&op=diff
==============================================================================
--- desktop/experimental/gnome-terminal/debian/control.in [utf-8] (original)
+++ desktop/experimental/gnome-terminal/debian/control.in [utf-8] Mon Feb 24 20:56:39 2014
@@ -6,15 +6,16 @@
Standards-Version: 3.9.4
Build-Depends: cdbs (>= 0.4.41),
debhelper (>= 8),
+ dh-autoreconf,
gnome-common,
autotools-dev,
- intltool (>= 0.40.0),
+ intltool (>= 0.50.0),
libx11-dev,
libdconf-dev (>= 0.14.0),
libgtk-3-dev (>= 3.6.0),
libgtk2.0-dev,
- libglib2.0-dev (>= 2.33.2),
- libvte-2.90-dev (>= 1:0.34.8),
+ libglib2.0-dev (>= 2.39.2),
+ libvte-2.90-dev (>= 1:0.35.1),
libsm-dev,
gnome-pkg-tools (>= 0.10),
docbook-to-man,
@@ -23,7 +24,9 @@
yelp-tools,
libgconf2-dev (>= 2.31.3),
desktop-file-utils,
- gsettings-desktop-schemas-dev (>= 0.1.0)
+ gsettings-desktop-schemas-dev (>= 0.1.0),
+ gnome-shell,
+ libnautilus-extension-dev
Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gnome-terminal/
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-terminal/
Modified: desktop/experimental/gnome-terminal/debian/patches/10_kfreebsd-f_dupfd_cloexec.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-terminal/debian/patches/10_kfreebsd-f_dupfd_cloexec.patch?rev=40735&op=diff
==============================================================================
--- desktop/experimental/gnome-terminal/debian/patches/10_kfreebsd-f_dupfd_cloexec.patch [utf-8] (original)
+++ desktop/experimental/gnome-terminal/debian/patches/10_kfreebsd-f_dupfd_cloexec.patch [utf-8] Mon Feb 24 20:56:39 2014
@@ -9,7 +9,7 @@
--- a/src/terminal-screen.c
+++ b/src/terminal-screen.c
-@@ -190,6 +190,20 @@
+@@ -187,6 +187,20 @@
static TerminalURLFlavour *url_regex_flavors;
static guint n_url_regexes;
@@ -30,12 +30,12 @@
/* See bug #697024 */
#ifndef __linux__
-@@ -1338,7 +1352,7 @@
+@@ -1243,7 +1257,7 @@
for (j = 0; j < n_fds; j++) {
if (fds[j] == target_fd) {
do {
-- fd = fcntl (fds[j], F_DUPFD_CLOEXEC, 10);
-+ fd = dup_cloexec(fds[j], 10);
+- fd = fcntl (fds[j], F_DUPFD_CLOEXEC, 3);
++ fd = dup_cloexec(fds[j], 3);
} while (fd == -1 && errno == EINTR);
if (fd == -1)
_exit (127);
Added: desktop/experimental/gnome-terminal/debian/patches/nautilus-x11.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-terminal/debian/patches/nautilus-x11.patch?rev=40735&op=file
==============================================================================
--- desktop/experimental/gnome-terminal/debian/patches/nautilus-x11.patch (added)
+++ desktop/experimental/gnome-terminal/debian/patches/nautilus-x11.patch [utf-8] Mon Feb 24 20:56:39 2014
@@ -0,0 +1,27 @@
+From: Andreas Henriksson <andreas at fatal.se>
+Subject: Nautilus extension needs platform libraries (x11)
+
+
+libtool: link: gcc -shared -fPIC -DPIC .libs/libterminal_nautilus_la-terminal-client-utils.o .libs/libterminal_nautilus_la-terminal-i18n.o .libs/libterminal_nautilus_la-terminal-nautilus.o .libs/libterminal_nautilus_la-terminal-gdbus-generated.o .libs/libterminal_nautilus_la-terminal-type-builtins.o -lnautilus-extension -lgtk-3 -lgdk-3 -latk-1.0 -lpangocairo-1.0 -lgdk_pixbuf-2.0 /usr/lib/x86_64-linux-gnu/libcairo-gobject.so -lpango-1.0 /usr/lib/x86_64-linux-gnu/libcairo.so -lgio-2.0 -lgobject-2.0 -lglib-2.0 -pthread -O2 -Wl,-z -Wl,relro -Wl,-z -Wl,defs -Wl,-O1 -Wl,--as-needed -pthread -Wl,-soname -Wl,libterminal-nautilus.so -Wl,-version-script -Wl,.libs/libterminal-nautilus.ver -o .libs/libterminal-nautilus.so
+.libs/libterminal_nautilus_la-terminal-client-utils.o: In function `terminal_client_get_fallback_startup_id':
+/tmp/buildd/gnome-terminal-3.11.3/src/terminal-client-utils.c:161: undefined reference to `XCreateWindow'
+/tmp/buildd/gnome-terminal-3.11.3/src/terminal-client-utils.c:172: undefined reference to `XInternAtom'
+/tmp/buildd/gnome-terminal-3.11.3/src/terminal-client-utils.c:174: undefined reference to `XInternAtom'
+/tmp/buildd/gnome-terminal-3.11.3/src/terminal-client-utils.c:178: undefined reference to `XChangeProperty'
+/tmp/buildd/gnome-terminal-3.11.3/src/terminal-client-utils.c:184: undefined reference to `XWindowEvent'
+/tmp/buildd/gnome-terminal-3.11.3/src/terminal-client-utils.c:189: undefined reference to `XDestroyWindow'
+collect2: error: ld returned 1 exit status
+
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -195,7 +195,8 @@
+ PKG_CHECK_MODULES([NAUTILUS],[
+ libnautilus-extension >= $NAUTILUS_REQUIRED
+ gio-2.0
+- gio-unix-2.0])
++ gio-unix-2.0
++ $PLATFORM_DEPS])
+
+ AC_ARG_WITH([nautilus-dir],
+ [AS_HELP_STRING([--with-nautilus-dir=PATH],[Nautilus extensions directory])],
Modified: desktop/experimental/gnome-terminal/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-terminal/debian/patches/series?rev=40735&op=diff
==============================================================================
--- desktop/experimental/gnome-terminal/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gnome-terminal/debian/patches/series [utf-8] Mon Feb 24 20:56:39 2014
@@ -1,3 +1,3 @@
+nautilus-x11.patch
01_onlyshowin.patch
10_kfreebsd-f_dupfd_cloexec.patch
-git-add-quit.patch
Modified: desktop/experimental/gnome-terminal/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-terminal/debian/rules?rev=40735&op=diff
==============================================================================
--- desktop/experimental/gnome-terminal/debian/rules [utf-8] (original)
+++ desktop/experimental/gnome-terminal/debian/rules [utf-8] Mon Feb 24 20:56:39 2014
@@ -4,6 +4,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/utils.mk
include /usr/share/cdbs/1/class/gnome.mk
+include /usr/share/cdbs/1/rules/autoreconf.mk
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
More information about the pkg-gnome-commits
mailing list