← Back to branch summary

~ubuntu-branches/ubuntu/quantal/gnome-terminal/quantal

« back to all changes in this revision

Viewing changes to debian/patches/01_lpi.patch

  • Committer: Package Import Robot
  • Author(s): Rico Tzschichholz, Rico Tzschichholz, Martin Pitt
  • Date: 2011-12-15 15:07:34 UTC
  • mfrom: (1.3.47) (2.1.12 sid)
  • Revision ID: package-import@ubuntu.com-20111215150734-sizp9ugqesip4swb
Tags: 3.2.1-2ubuntu1
https://launchpad.net/bugs/803519
[ Rico Tzschichholz ]
* 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

[ Martin Pitt ]
* debian/watch: Look for tar.xz tarballs.
* debian/watch: Fix syntax.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/01_lpi.patch
1
1
Description: Launchpad integration
2
2
Author: ?
3
3
 
4
 
Index: gnome-terminal-2.33.90/configure.ac
 
4
Index: gnome-terminal-3.2.1/configure.ac
5
5
===================================================================
6
 
--- gnome-terminal-2.33.90.orig/configure.ac
7
 
+++ gnome-terminal-2.33.90/configure.ac
8
 
@@ -92,6 +92,7 @@
 
6
--- gnome-terminal-3.2.1.orig/configure.ac
 
7
+++ gnome-terminal-3.2.1/configure.ac
 
8
@@ -87,6 +87,7 @@
9
9
    gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
10
10
    gconf-2.0 >= $GCONF_REQUIRED
11
11
    gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
13
13
    $PLATFORM_DEPS])
14
14
 
15
15
 # ********
16
 
Index: gnome-terminal-2.33.90/src/terminal-window.c
 
16
Index: gnome-terminal-3.2.1/src/terminal-window.c
17
17
===================================================================
18
 
--- gnome-terminal-2.33.90.orig/src/terminal-window.c
19
 
+++ gnome-terminal-2.33.90/src/terminal-window.c
 
18
--- gnome-terminal-3.2.1.orig/src/terminal-window.c
 
19
+++ gnome-terminal-3.2.1/src/terminal-window.c
20
20
@@ -32,6 +32,7 @@
21
21
 #include <gdk/gdkkeysyms.h>
22
22
 #define GDK_KEY(symbol) GDK_##symbol
25
25
 
26
26
 #include "terminal-accels.h"
27
27
 #include "terminal-app.h"
28
 
@@ -2123,6 +2124,7 @@
 
28
@@ -2114,6 +2115,7 @@
29
29
   gtk_box_pack_start (GTK_BOX (main_vbox),
30
30
                      priv->menubar,
31
31
                      FALSE, FALSE, 0);
33
33
 
34
34
   /* Add tabs menu */
35
35
   priv->tabs_menu = terminal_tabs_menu_new (window);
36
 
Index: gnome-terminal-2.33.90/src/terminal.xml
 
36
Index: gnome-terminal-3.2.1/src/terminal.xml
37
37
===================================================================
38
 
--- gnome-terminal-2.33.90.orig/src/terminal.xml
39
 
+++ gnome-terminal-2.33.90/src/terminal.xml
 
38
--- gnome-terminal-3.2.1.orig/src/terminal.xml
 
39
+++ gnome-terminal-3.2.1/src/terminal.xml
40
40
@@ -73,6 +73,7 @@
41
41
     </menu>
42
42
     <menu action="Help">