Merge lp:~ricotz/gnome-terminal/ubuntu into lp:~ubuntu-desktop/gnome-terminal/ubuntu

[Rico Tzschichholz]

New upsteam 3.2.1 merged with debian unstable

[Martin Pitt (pitti)]

Thank you! this looks fine

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-07-19 22:22:23 +0000
+++ debian/changelog	2011-12-15 12:47:35 +0000
@@ -1,46 +1,56 @@
-gnome-terminal (3.0.1-0ubuntu3) oneiric; urgency=low
-
-  * debian/patches/01_onlyshowin.patch:
-    - Add Unity to OnlyShowIn value (LP: #803519)
-
- -- Michael Terry <[e-mail]>  Tue, 19 Jul 2011 18:21:19 -0400
-
-gnome-terminal (3.0.1-0ubuntu2) oneiric; urgency=low
-
-  * debian/patches/50_add_unity_quicklist.patch:
-    - add unity quicklist support
-
- -- Didier Roche <[e-mail]>  Tue, 31 May 2011 11:49:45 +0200
-
-gnome-terminal (3.0.1-0ubuntu1) oneiric; urgency=low
-
-  * New upstream release
-
- -- Rodrigo Moya <[e-mail]>  Wed, 25 May 2011 10:36:19 +0200
-
-gnome-terminal (3.0.0-2ubuntu1) oneiric; urgency=low
+gnome-terminal (3.2.1-2ubuntu1) precise; urgency=low
+
+  * Sync with debian, remaining changes:
+    - debian/control:
+      + Build-Depend on liblaunchpad-integration-3.0-dev, dh-autoreconf
+        and gnome-common
+    - debian/patches:
+      + 01_lpi.patch: Launchpad integration patch
+      + 01_onlyshowin.patch: Add Unity to OnlyShowIn value (LP: #803519)
+      + 02_add_transparency_properties.patch: Allow background
+        transparency to be controlled from the GTK theme. Needs rebase
+      + 20_add_alt_screen_toggle_ui.patch: Hook new vte
+        alternate screen scrolling toggle via UI
+      + 50_add_unity_quicklist.patch: Add unity quicklist support
+    - debian/rules: Include autoreconf.mk
+    - debian/watch: Allow retrieving of unstable releases
+
+ -- Rico Tzschichholz <[e-mail]>  Thu, 15 Dec 2011 13:04:33 +0100
+
+gnome-terminal (3.2.1-2) unstable; urgency=low
+
+  * Reintroduce gtk2 build-dependency, it’s required for 
+    gtk-builder-convert.
+
+ -- Josselin Mouette <[e-mail]>  Sun, 20 Nov 2011 00:25:02 +0100
+
+gnome-terminal (3.2.1-1) experimental; urgency=low
+
+  * New upstream release.
+  * Bump vte requirement.
+  * Stop forcing gtk+ version, only gtk+ 3.x is supported now.
+
+ -- Josselin Mouette <[e-mail]>  Sat, 12 Nov 2011 17:52:40 +0100
+
+gnome-terminal (3.0.1-1) unstable; urgency=low
 
   [ Raphaël Hertzog ]
   * Add lintian overrides for menu-icon-missing.
 
-  [ Rodrigo Moya ]
-  * Rebase on Debian and the GNOME3 PPA (Thanks to Rico Tzschichholz).
-    Remaining Ubuntu-specific changes:
-  * debian/control:
-    - Build-Depend on liblaunchpad-integration-3.0-dev, dh-autoreconf and gnome-common
-    - Replaces: gnome-terminal-data (<< 2.28.1-1ubuntu1)
-  * debian/patches/01_lpi.patch:
-    - Launchpad integration patch
-  * debian/patches/02_add_transparency_properties.patch:
-    - Allow background transparency to be controlled from the GTK theme. Needs rebase
-  * debian/patches/20_add_alt_screen_toggle_ui.patch:
-    - Hook new vte alternate screen scrolling toggle via UI
-  * debian/rules:
-    - Include autoreconf.mk
-  * debian/watch:
-    - Allow retrieving of unstable releases
+  [ Michael Biebl ]
+  * debian/watch: Switch to .bz2 tarballs.
+  * New upstream release.
+  * debian/control.in
+    - Drop Build-Depends on libdbus-glib-1-dev.
+    - Drop Build-Depends on dpkg-dev (>= 1.13.19), even the version from lenny
+      is recent enough.
+    - Add Vcs-* fields.
+  * Bump debhelper compatibility level to 8.
+    - Update Build-Depends on debhelper.
+    - Strip debian/tmp/ from .install files.
+  * Remove debian/fonts.conf, unused.
 
- -- Rodrigo Moya <[e-mail]>  Tue, 17 May 2011 16:17:22 +0200
+ -- Michael Biebl <[e-mail]>  Thu, 16 Jun 2011 16:19:04 +0200
 
 gnome-terminal (3.0.0-1) experimental; urgency=low
 

=== modified file 'debian/compat'
--- debian/compat	2008-06-18 08:31:47 +0000
+++ debian/compat	2011-12-15 12:47:35 +0000
@@ -1,1 +1,1 @@
-5
+8

=== modified file 'debian/control'
--- debian/control	2011-05-17 14:38:48 +0000
+++ debian/control	2011-12-15 12:47:35 +0000
@@ -6,28 +6,26 @@
 Source: gnome-terminal
 Section: gnome
 Priority: optional
+Maintainer: Ubuntu Desktop Team <[e-mail]>
 XSBC-Original-Maintainer: Guilherme de S. Pastore <[e-mail]>
-Maintainer: Ubuntu Desktop Team <[e-mail]>
-Uploaders: Debian GNOME Maintainers <[e-mail]>, Luca Falavigna <[e-mail]>, Sebastian Dröge <[e-mail]>
+Uploaders: Debian GNOME Maintainers <[e-mail]>, Frederic Peters <[e-mail]>, Josselin Mouette <[e-mail]>, Michael Biebl <[e-mail]>, Sebastian Dröge <[e-mail]>
 Standards-Version: 3.9.2
 Build-Depends: cdbs (>= 0.4.41),
-               debhelper (>= 5),
+               debhelper (>= 8),
                dh-autoreconf,
                gnome-common,
                intltool (>= 0.40.0),
                libx11-dev,
                libgtk-3-dev (>= 3.0.0),
-               libgtk2.0-dev (>= 2.24.0),
+               libgtk2.0-dev,
                libglib2.0-dev (>= 2.26.0),
-               libvte-2.90-dev (>= 0.27.3),
+               libvte-2.90-dev (>= 1:0.30.0),
                scrollkeeper,
                libsm-dev,
                gnome-pkg-tools (>= 0.10),
-               dpkg-dev (>= 1.13.19),
                docbook-to-man,
                gnome-doc-utils,
                libgconf2-dev (>= 2.31.3),
-               libdbus-glib-1-dev (>= 0.6),
                gsettings-desktop-schemas-dev (>= 0.1.0),
                liblaunchpad-integration-3.0-dev
 Vcs-Bzr: http://code.launchpad.net/~ubuntu-desktop/gnome-terminal/ubuntu
@@ -39,7 +37,7 @@
          gsettings-desktop-schemas (>= 0.1.0),
          gnome-terminal-data (>= ${gnome:Version}),
          gnome-terminal-data (<< ${gnome:NextVersion})
-Replaces: gnome-terminal-data (<< 2.28.1-1ubuntu1)
+Replaces: gnome-terminal-data (<< 2.26.2-3)
 Provides: x-terminal-emulator
 Recommends: yelp,
             gvfs

=== modified file 'debian/control.in'
--- debian/control.in	2011-05-17 14:38:48 +0000
+++ debian/control.in	2011-12-15 12:47:35 +0000
@@ -1,28 +1,26 @@
 Source: gnome-terminal
 Section: gnome
 Priority: optional
+Maintainer: Ubuntu Desktop Team <[e-mail]>
 XSBC-Original-Maintainer: Guilherme de S. Pastore <[e-mail]>
-Maintainer: Ubuntu Desktop Team <[e-mail]>
 Uploaders: @GNOME_TEAM@
 Standards-Version: 3.9.2
 Build-Depends: cdbs (>= 0.4.41),
-               debhelper (>= 5),
+               debhelper (>= 8),
                dh-autoreconf,
                gnome-common,
                intltool (>= 0.40.0),
                libx11-dev,
                libgtk-3-dev (>= 3.0.0),
-               libgtk2.0-dev (>= 2.24.0),
+               libgtk2.0-dev,
                libglib2.0-dev (>= 2.26.0),
-               libvte-2.90-dev (>= 0.27.3),
+               libvte-2.90-dev (>= 1:0.30.0),
                scrollkeeper,
                libsm-dev,
                gnome-pkg-tools (>= 0.10),
-               dpkg-dev (>= 1.13.19),
                docbook-to-man,
                gnome-doc-utils,
                libgconf2-dev (>= 2.31.3),
-               libdbus-glib-1-dev (>= 0.6),
                gsettings-desktop-schemas-dev (>= 0.1.0),
                liblaunchpad-integration-3.0-dev
 Vcs-Bzr: http://code.launchpad.net/~ubuntu-desktop/gnome-terminal/ubuntu
@@ -34,7 +32,7 @@
          gsettings-desktop-schemas (>= 0.1.0),
          gnome-terminal-data (>= ${gnome:Version}),
          gnome-terminal-data (<< ${gnome:NextVersion})
-Replaces: gnome-terminal-data (<< 2.28.1-1ubuntu1)
+Replaces: gnome-terminal-data (<< 2.26.2-3)
 Provides: x-terminal-emulator
 Recommends: yelp,
             gvfs

=== removed file 'debian/fonts.conf'
--- debian/fonts.conf	2008-06-18 08:31:47 +0000
+++ debian/fonts.conf	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-<match target="font">
-        <test qual="any" name="size" compare="more">
-                <int>7</int>
-        </test>
-        <test qual="any" name="size" compare="less">
-                <int>12</int>
-        </test>
-        <edit name="antialias" mode="assign">
-                <bool>false</bool>
-        </edit>
-</match>

=== modified file 'debian/gnome-terminal-data.install'
--- debian/gnome-terminal-data.install	2009-12-01 06:50:13 +0000
+++ debian/gnome-terminal-data.install	2011-12-15 12:47:35 +0000
@@ -1,7 +1,7 @@
-debian/tmp/etc
-debian/tmp/usr/share/gnome-terminal
-debian/tmp/usr/share/locale
-debian/tmp/usr/share/gnome
-debian/tmp/usr/share/omf
+etc
+usr/share/gnome-terminal
+usr/share/locale
+usr/share/gnome
+usr/share/omf
 
 debian/gnome-terminal.xpm /usr/share/pixmaps

=== modified file 'debian/gnome-terminal.install'
--- debian/gnome-terminal.install	2010-06-25 03:38:38 +0000
+++ debian/gnome-terminal.install	2011-12-15 12:47:35 +0000
@@ -1,3 +1,4 @@
-debian/tmp/usr/bin
-debian/tmp/usr/share/applications
+usr/bin
+usr/share/applications
+
 debian/gnome-terminal.wrapper /usr/bin

=== modified file 'debian/patches/01_lpi.patch'
--- debian/patches/01_lpi.patch	2011-05-17 14:38:48 +0000
+++ debian/patches/01_lpi.patch	2011-12-15 12:47:35 +0000
@@ -1,11 +1,11 @@
 Description: Launchpad integration
 Author: ?
 
-Index: gnome-terminal-2.33.90/configure.ac
+Index: gnome-terminal-3.2.1/configure.ac
 ===================================================================
---- gnome-terminal-2.33.90.orig/configure.ac
-+++ gnome-terminal-2.33.90/configure.ac
-@@ -92,6 +92,7 @@
+--- gnome-terminal-3.2.1.orig/configure.ac
++++ gnome-terminal-3.2.1/configure.ac
+@@ -87,6 +87,7 @@
     gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
     gconf-2.0 >= $GCONF_REQUIRED
     gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
@@ -13,10 +13,10 @@
     $PLATFORM_DEPS])
  
  # ********
-Index: gnome-terminal-2.33.90/src/terminal-window.c
+Index: gnome-terminal-3.2.1/src/terminal-window.c
 ===================================================================
---- gnome-terminal-2.33.90.orig/src/terminal-window.c
-+++ gnome-terminal-2.33.90/src/terminal-window.c
+--- gnome-terminal-3.2.1.orig/src/terminal-window.c
++++ gnome-terminal-3.2.1/src/terminal-window.c
 @@ -32,6 +32,7 @@
  #include <gdk/gdkkeysyms.h>
  #define GDK_KEY(symbol) GDK_##symbol
@@ -25,7 +25,7 @@
  
  #include "terminal-accels.h"
  #include "terminal-app.h"
-@@ -2123,6 +2124,7 @@
+@@ -2114,6 +2115,7 @@
    gtk_box_pack_start (GTK_BOX (main_vbox),
  		      priv->menubar,
  		      FALSE, FALSE, 0);
@@ -33,10 +33,10 @@
  
    /* Add tabs menu */
    priv->tabs_menu = terminal_tabs_menu_new (window);
-Index: gnome-terminal-2.33.90/src/terminal.xml
+Index: gnome-terminal-3.2.1/src/terminal.xml
 ===================================================================
---- gnome-terminal-2.33.90.orig/src/terminal.xml
-+++ gnome-terminal-2.33.90/src/terminal.xml
+--- gnome-terminal-3.2.1.orig/src/terminal.xml
++++ gnome-terminal-3.2.1/src/terminal.xml
 @@ -73,6 +73,7 @@
      </menu>
      <menu action="Help">

=== modified file 'debian/patches/20_add_alt_screen_toggle_ui.patch'
--- debian/patches/20_add_alt_screen_toggle_ui.patch	2011-05-17 14:38:48 +0000
+++ debian/patches/20_add_alt_screen_toggle_ui.patch	2011-12-15 12:47:35 +0000
@@ -1,10 +1,10 @@
 Description: Hook new vte alternate screen scrolling toggle via UI
 Author: ?
 
-Index: gnome-terminal-2.33.90/src/gnome-terminal.schemas.in
+Index: gnome-terminal-3.2.1/src/gnome-terminal.schemas.in
 ===================================================================
---- gnome-terminal-2.33.90.orig/src/gnome-terminal.schemas.in
-+++ gnome-terminal-2.33.90/src/gnome-terminal.schemas.in
+--- gnome-terminal-3.2.1.orig/src/gnome-terminal.schemas.in
++++ gnome-terminal-3.2.1/src/gnome-terminal.schemas.in
 @@ -418,6 +418,23 @@
      </schema>
  
@@ -29,10 +29,10 @@
        <key>/schemas/apps/gnome-terminal/profiles/Default/exit_action</key>
        <applyto>/apps/gnome-terminal/profiles/Default/exit_action</applyto>
        <owner>gnome-terminal</owner>
-Index: gnome-terminal-2.33.90/src/profile-editor.c
+Index: gnome-terminal-3.2.1/src/profile-editor.c
 ===================================================================
---- gnome-terminal-2.33.90.orig/src/profile-editor.c
-+++ gnome-terminal-2.33.90/src/profile-editor.c
+--- gnome-terminal-3.2.1.orig/src/profile-editor.c
++++ gnome-terminal-3.2.1/src/profile-editor.c
 @@ -279,6 +279,10 @@
      SET_SENSITIVE ("scroll-on-output-checkbutton",
                     !terminal_profile_property_locked (profile, TERMINAL_PROFILE_SCROLL_ON_OUTPUT));
@@ -44,7 +44,7 @@
    if (!prop_name || prop_name == I_(TERMINAL_PROFILE_EXIT_ACTION))
      SET_SENSITIVE ("exit-action-combobox",
                     !terminal_profile_property_locked (profile, TERMINAL_PROFILE_EXIT_ACTION));
-@@ -899,6 +903,7 @@
+@@ -914,6 +918,7 @@
    CONNECT ("scrollbar-position-combobox", TERMINAL_PROFILE_SCROLLBAR_POSITION);
    CONNECT ("scroll-on-keystroke-checkbutton", TERMINAL_PROFILE_SCROLL_ON_KEYSTROKE);
    CONNECT ("scroll-on-output-checkbutton", TERMINAL_PROFILE_SCROLL_ON_OUTPUT);
@@ -52,10 +52,10 @@
    CONNECT ("show-menubar-checkbutton", TERMINAL_PROFILE_DEFAULT_SHOW_MENUBAR);
    CONNECT ("solid-radiobutton", TERMINAL_PROFILE_BACKGROUND_TYPE);
    CONNECT ("system-font-checkbutton", TERMINAL_PROFILE_USE_SYSTEM_FONT);
-Index: gnome-terminal-2.33.90/src/profile-preferences.glade
+Index: gnome-terminal-3.2.1/src/profile-preferences.glade
 ===================================================================
---- gnome-terminal-2.33.90.orig/src/profile-preferences.glade
-+++ gnome-terminal-2.33.90/src/profile-preferences.glade
+--- gnome-terminal-3.2.1.orig/src/profile-preferences.glade
++++ gnome-terminal-3.2.1/src/profile-preferences.glade
 @@ -2416,6 +2416,27 @@
  		</packing>
  	      </child>
@@ -84,10 +84,10 @@
  	      <child>
  		<widget class="GtkCheckButton" id="scroll-on-keystroke-checkbutton">
  		  <property name="visible">True</property>
-Index: gnome-terminal-2.33.90/src/terminal-profile.c
+Index: gnome-terminal-3.2.1/src/terminal-profile.c
 ===================================================================
---- gnome-terminal-2.33.90.orig/src/terminal-profile.c
-+++ gnome-terminal-2.33.90/src/terminal-profile.c
+--- gnome-terminal-3.2.1.orig/src/terminal-profile.c
++++ gnome-terminal-3.2.1/src/terminal-profile.c
 @@ -75,6 +75,7 @@
    PROP_SCROLLBAR_POSITION,
    PROP_SCROLL_ON_KEYSTROKE,
@@ -120,10 +120,10 @@
    TERMINAL_PROFILE_PROPERTY_BOOLEAN (SILENT_BELL, DEFAULT_SILENT_BELL, KEY_SILENT_BELL);
    TERMINAL_PROFILE_PROPERTY_BOOLEAN (UPDATE_RECORDS, DEFAULT_UPDATE_RECORDS, KEY_UPDATE_RECORDS);
    TERMINAL_PROFILE_PROPERTY_BOOLEAN (USE_CUSTOM_COMMAND, DEFAULT_USE_CUSTOM_COMMAND, KEY_USE_CUSTOM_COMMAND);
-Index: gnome-terminal-2.33.90/src/terminal-profile.h
+Index: gnome-terminal-3.2.1/src/terminal-profile.h
 ===================================================================
---- gnome-terminal-2.33.90.orig/src/terminal-profile.h
-+++ gnome-terminal-2.33.90/src/terminal-profile.h
+--- gnome-terminal-3.2.1.orig/src/terminal-profile.h
++++ gnome-terminal-3.2.1/src/terminal-profile.h
 @@ -93,6 +93,7 @@
  #define TERMINAL_PROFILE_SCROLLBAR_POSITION     "scrollbar-position"
  #define TERMINAL_PROFILE_SCROLL_ON_KEYSTROKE    "scroll-on-keystroke"
@@ -132,10 +132,10 @@
  #define TERMINAL_PROFILE_SILENT_BELL            "silent-bell"
  #define TERMINAL_PROFILE_TITLE_MODE             "title-mode"
  #define TERMINAL_PROFILE_TITLE                  "title"
-Index: gnome-terminal-2.33.90/src/terminal-screen.c
+Index: gnome-terminal-3.2.1/src/terminal-screen.c
 ===================================================================
---- gnome-terminal-2.33.90.orig/src/terminal-screen.c
-+++ gnome-terminal-2.33.90/src/terminal-screen.c
+--- gnome-terminal-3.2.1.orig/src/terminal-screen.c
++++ gnome-terminal-3.2.1/src/terminal-screen.c
 @@ -963,6 +963,9 @@
    if (!prop_name || prop_name == I_(TERMINAL_PROFILE_SCROLL_ON_OUTPUT))
      vte_terminal_set_scroll_on_output (vte_terminal,

=== modified file 'debian/rules'
--- debian/rules	2011-05-17 14:38:48 +0000
+++ debian/rules	2011-12-15 12:47:35 +0000
@@ -1,17 +1,17 @@
 #!/usr/bin/make -f
 # -*- mode: makefile; coding: utf-8 -*-
 
+include /usr/share/cdbs/1/rules/autoreconf.mk
 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
 
 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
 
-DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --with-gtk=3.0
+DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper
 
 build/gnome-terminal::
 	/usr/bin/docbook-to-man debian/gnome-terminal.sgml > debian/gnome-terminal.1

=== modified file 'debian/watch'
--- debian/watch	2010-05-24 04:52:45 +0000
+++ debian/watch	2011-12-15 12:47:35 +0000
@@ -1,3 +1,3 @@
-version=2
+version=3
 http://ftp.gnome.org/pub/GNOME/sources/gnome-terminal/([\d\.]+)\d/ \
-        gnome-terminal-(.*)\.tar\.gz
+        gnome-terminal-(.*)\.tar\.bz2