[Pkg-xfce-commits] r3380 - in desktop/trunk/xfce4-terminal/debian: . patches
Yves-Alexis Perez
corsac at alioth.debian.org
Mon Jul 13 04:56:10 UTC 2009
Author: corsac
Date: 2009-07-13 16:56:08 +0000 (Mon, 13 Jul 2009)
New Revision: 3380
Removed:
desktop/trunk/xfce4-terminal/debian/patches/02_dont-refresh-prefs-too-much.patch
desktop/trunk/xfce4-terminal/debian/patches/03_terminal-nil-value-fix+always_show_tabs-fix.patch
desktop/trunk/xfce4-terminal/debian/patches/04_fix_activity_on_size_change.patch
Modified:
desktop/trunk/xfce4-terminal/debian/changelog
desktop/trunk/xfce4-terminal/debian/control
desktop/trunk/xfce4-terminal/debian/patches/00_binary-name-fix-xfce4-terminal.1.patch
Log:
* New upstream alpha release.
- now use keyboard-friendly preferences window. closes: #401417
* debian/patches/
- 00_binary-name-fix-xfce4-terminal.1 refreshed.
- 02_dont-refresh-prefs-too-much dropped, xfce4-terminal now uses file
monitoring.
- 03_terminal-nil-value-fix+always_show_tabs-fix dropped, included upstream.
- 04_fix_activity_on_size_change as well.
* debian/control:
- update standards version to 3.8.2.
- update vte and gtk build-deps.
Modified: desktop/trunk/xfce4-terminal/debian/changelog
===================================================================
--- desktop/trunk/xfce4-terminal/debian/changelog 2009-07-13 16:55:59 UTC (rev 3379)
+++ desktop/trunk/xfce4-terminal/debian/changelog 2009-07-13 16:56:08 UTC (rev 3380)
@@ -1,3 +1,19 @@
+xfce4-terminal (0.2.90-1) UNRELEASED; urgency=low
+
+ * New upstream alpha release.
+ - now use keyboard-friendly preferences window. closes: #401417
+ * debian/patches/
+ - 00_binary-name-fix-xfce4-terminal.1 refreshed.
+ - 02_dont-refresh-prefs-too-much dropped, xfce4-terminal now uses file
+ monitoring.
+ - 03_terminal-nil-value-fix+always_show_tabs-fix dropped, included upstream.
+ - 04_fix_activity_on_size_change as well.
+ * debian/control:
+ - update standards version to 3.8.2.
+ - update vte and gtk build-deps.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Mon, 13 Jul 2009 18:49:34 +0200
+
xfce4-terminal (0.2.12-3) unstable; urgency=low
* debian/menu:
Modified: desktop/trunk/xfce4-terminal/debian/control
===================================================================
--- desktop/trunk/xfce4-terminal/debian/control 2009-07-13 16:55:59 UTC (rev 3379)
+++ desktop/trunk/xfce4-terminal/debian/control 2009-07-13 16:56:08 UTC (rev 3380)
@@ -5,9 +5,10 @@
Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>,
Yves-Alexis Perez <corsac at debian.org>
Build-Depends: debhelper (>= 7), libdbus-glib-1-dev,
- libexo-0.3-dev (>= 0.3.100), libvte-dev (>= 1:0.14), libxml-perl,
- libstartup-notification0-dev, cdbs, chrpath, intltool
-Standards-Version: 3.8.1
+ libexo-0.3-dev (>= 0.3.100), libvte-dev (>= 1:0.17.1), libxml-perl,
+ libstartup-notification0-dev, cdbs, chrpath, intltool,
+ libgtk2.0-dev (>= 2.14)
+Standards-Version: 3.8.2
Homepage: http://terminal.os-cillation.com/
Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-terminal/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-terminal/
Modified: desktop/trunk/xfce4-terminal/debian/patches/00_binary-name-fix-xfce4-terminal.1.patch
===================================================================
--- desktop/trunk/xfce4-terminal/debian/patches/00_binary-name-fix-xfce4-terminal.1.patch 2009-07-13 16:55:59 UTC (rev 3379)
+++ desktop/trunk/xfce4-terminal/debian/patches/00_binary-name-fix-xfce4-terminal.1.patch 2009-07-13 16:56:08 UTC (rev 3380)
@@ -1,5 +1,7 @@
---- Terminal.1.old 2005-07-02 13:18:06.000000000 +0200
-+++ Terminal.1 2005-07-02 13:33:21.000000000 +0200
+diff --git a/Terminal.1 b/Terminal.1
+index 81611c7..feda48e 100644
+--- a/Terminal.1
++++ b/Terminal.1
@@ -1,29 +1,29 @@
-.TH Terminal 1 "Mar 19, 2005"
+.TH xfce4-terminal 1 "Mar 19, 2005"
@@ -19,16 +21,15 @@
-\fBTerminal\fP is what is known as an X terminal emulator, often referred
+\fBxfce4-terminal\fP is what is known as an X terminal emulator, often referred
to as terminal or shell. It provides an equivalent to the old fashioned text
--screen on your desktop, but on which can easily the screen with other
-+screen on your desktop, but on which can easily share the screen with other
+ screen on your desktop, but on which can easily the screen with other
graphical applications.
-\fBTerminal\fP emulates the xterm application developed by the X Consortium.
-+\fBxfce4-terminal\fP emulates the xterm application developed by the X Consortium.
++\fBxfc4-terminal\fP emulates the xterm application developed by the X Consortium.
In turn, the xterm applications emulates the DEC VT102 terminal and also
supports the DEC VT220 escape sequences. An escape sequence is a series of
-characters that with the Esc character. Terminal accepts all of the escape
-+characters that with the Esc character. \fBxfce4-terminal\fP accepts all of the escape
++characters that with the Esc character. xfce4-terminal accepts all of the escape
sequences that the VT102 and VT220 terminals use for functions such as to
position the cursor and to clear the screen.
@@ -39,7 +40,7 @@
.TP
.B \-\-help
Print a help screen and exit.
-@@ -33,7 +33,7 @@
+@@ -33,7 +33,7 @@ Output version information and exit.
.SH ENVIRONMENT
@@ -48,19 +49,21 @@
variables.
.PP
.TP
-@@ -61,9 +61,9 @@
+@@ -61,17 +61,17 @@ base directory. The directories should be separated with a colon.
.SH FILES
-\fBTerminal\fP reads its configuration from the files
+\fBxfce4-terminal\fP reads its configuration from the files
.IR $XDG_CONFIG_DIRS/Terminal/terminalrc .
--\fBTerminal\fP creates the main menubar and the popup
-+\fBxfce4-terminal\fP creates the main menubar and the popup
- menu from the files
- .IR $XDG_DATA_DIRS/Terminal/Terminal.ui
- and the toolbars layout from the files
-@@ -74,7 +74,7 @@
+-\fBTerminal\fP creates the toolbars layout from the files
+-.IR $XDG_DATA_DIRS/Terminal/Terminal-toolbars.ui .
++\fBxfce4-terminal\fP creates the toolbars layout from the files
++.IR $XDG_DATA_DIRS/xfce4-terminal/xfce4-terminal-toolbars.ui .
+ If you customize the toolbars, the new toolbars layout
+ is stored to
+-.IR $XDG_DATA_HOME/Terminal/Terminal-toolbars.ui .
++.IR $XDG_DATA_HOME/xfce4-terminal/xfce4-terminal-toolbars.ui .
.SH AUTHOR
Deleted: desktop/trunk/xfce4-terminal/debian/patches/02_dont-refresh-prefs-too-much.patch
===================================================================
--- desktop/trunk/xfce4-terminal/debian/patches/02_dont-refresh-prefs-too-much.patch 2009-07-13 16:55:59 UTC (rev 3379)
+++ desktop/trunk/xfce4-terminal/debian/patches/02_dont-refresh-prefs-too-much.patch 2009-07-13 16:56:08 UTC (rev 3380)
@@ -1,12 +0,0 @@
-diff -ur Terminal-0.2.6.orig/terminal/terminal-monitor.c Terminal-0.2.6/terminal/terminal-monitor.c
---- Terminal-0.2.6.orig/terminal/terminal-monitor.c 2007-01-20 15:30:51.000000000 +0100
-+++ Terminal-0.2.6/terminal/terminal-monitor.c 2007-11-05 15:15:49.000000000 +0100
-@@ -339,7 +339,7 @@
-
- if (G_UNLIKELY (monitor->idle_id == 0))
- {
-- monitor->idle_id = g_timeout_add_full (G_PRIORITY_LOW, 1000, terminal_monitor_idle,
-+ monitor->idle_id = g_timeout_add_full (G_PRIORITY_LOW, 60*1000, terminal_monitor_idle,
- monitor, terminal_monitor_idle_destroy);
- }
- }
Deleted: desktop/trunk/xfce4-terminal/debian/patches/03_terminal-nil-value-fix+always_show_tabs-fix.patch
===================================================================
--- desktop/trunk/xfce4-terminal/debian/patches/03_terminal-nil-value-fix+always_show_tabs-fix.patch 2009-07-13 16:55:59 UTC (rev 3379)
+++ desktop/trunk/xfce4-terminal/debian/patches/03_terminal-nil-value-fix+always_show_tabs-fix.patch 2009-07-13 16:56:08 UTC (rev 3380)
@@ -1,31 +0,0 @@
-Index: terminal/terminal-window.c
-===================================================================
---- terminal/terminal-window.c (révision 26581)
-+++ terminal/terminal-window.c (copie de travail)
-@@ -914,18 +914,20 @@
- /* change the visibility if the new status differs */
- if (((npages > 1) != tabs_shown) || (always_show_tabs && !tabs_shown))
- {
-+ /* show or hide the tabs */
-+ gtk_notebook_set_show_tabs (GTK_NOTEBOOK (window->notebook), always_show_tabs | !tabs_shown);
-+
-+ /* don't focus the notebook */
-+ GTK_WIDGET_UNSET_FLAGS (window->notebook, GTK_CAN_FOCUS);
-+
- /* get active screen */
- active = terminal_window_get_active (window);
-+ if (G_UNLIKELY (active == NULL))
-+ return;
-
- /* get screen grid size */
- terminal_screen_get_size (active, &grid_width, &grid_height);
-
-- /* show or hide the tabs */
-- gtk_notebook_set_show_tabs (GTK_NOTEBOOK (window->notebook), !tabs_shown);
--
-- /* don't focus the notebook */
-- GTK_WIDGET_UNSET_FLAGS (window->notebook, GTK_CAN_FOCUS);
--
- /* resize the window */
- terminal_screen_force_resize_window (active, GTK_WINDOW (window), grid_width, grid_height);
- }
Deleted: desktop/trunk/xfce4-terminal/debian/patches/04_fix_activity_on_size_change.patch
===================================================================
--- desktop/trunk/xfce4-terminal/debian/patches/04_fix_activity_on_size_change.patch 2009-07-13 16:55:59 UTC (rev 3379)
+++ desktop/trunk/xfce4-terminal/debian/patches/04_fix_activity_on_size_change.patch 2009-07-13 16:56:08 UTC (rev 3380)
@@ -1,29 +0,0 @@
-Index: terminal/terminal-screen.c
-===================================================================
---- terminal/terminal-screen.c (revision 27079)
-+++ terminal/terminal-screen.c (working copy)
-@@ -145,6 +145,7 @@
-
- gboolean activity;
- guint reset_activity_cb;
-+ time_t last_size_change;
- };
-
-
-@@ -873,6 +874,8 @@
-
- if (terminal_window_is_screen_active (screen))
- return;
-+ if (time(NULL) - screen->last_size_change <= 1)
-+ return;
-
- g_object_get (G_OBJECT (screen->preferences), "tab-activity-timeout", &timeout_seconds, NULL);
- if (timeout_seconds < 1.0)
-@@ -952,6 +955,7 @@
- }
- #endif
- }
-+ screen->last_size_change = time(NULL);
-
- GDK_THREADS_LEAVE ();
-
More information about the Pkg-xfce-commits
mailing list