r20487 - in /desktop/unstable/gnome-terminal/debian: changelog control control.in gnome-terminal-data.install gnome-terminal-data.menu gnome-terminal.install gnome-terminal.menu patches/01_onlyshowin.patch patches/02_let_gconf_autostart.patch watch

pochu-guest at users.alioth.debian.org pochu-guest at users.alioth.debian.org
Sat Jun 27 15:21:10 UTC 2009 

Author: pochu-guest
Date: Sat Jun 27 15:21:09 2009
New Revision: 20487

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=20487
Log:
* debian/watch: don't uupdate.
* Add descriptions and links to patch headers.
* debian/control.in:
  - Standards-Version is 3.8.2, no changes needed.
  - Extend gnome-terminal-data's long description.
  - No need to replace/conflict gnome-terminal2, that's gone for good.
  - gnome-terminal 2.10 is not even in oldstable, no need to replace it
    in gnome-terminal-data.
* Move the menu and desktop files to the gnome-terminal package, add
  replaces accordingly.

Added:
    desktop/unstable/gnome-terminal/debian/gnome-terminal.menu
      - copied unchanged from r20482, desktop/unstable/gnome-terminal/debian/gnome-terminal-data.menu
Removed:
    desktop/unstable/gnome-terminal/debian/gnome-terminal-data.menu
Modified:
    desktop/unstable/gnome-terminal/debian/changelog
    desktop/unstable/gnome-terminal/debian/control
    desktop/unstable/gnome-terminal/debian/control.in
    desktop/unstable/gnome-terminal/debian/gnome-terminal-data.install
    desktop/unstable/gnome-terminal/debian/gnome-terminal.install
    desktop/unstable/gnome-terminal/debian/patches/01_onlyshowin.patch
    desktop/unstable/gnome-terminal/debian/patches/02_let_gconf_autostart.patch
    desktop/unstable/gnome-terminal/debian/watch

Modified: desktop/unstable/gnome-terminal/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-terminal/debian/changelog?rev=20487&op=diff
==============================================================================
--- desktop/unstable/gnome-terminal/debian/changelog (original)
+++ desktop/unstable/gnome-terminal/debian/changelog Sat Jun 27 15:21:09 2009
@@ -1,3 +1,18 @@
+gnome-terminal (2.26.2-3) UNRELEASED; urgency=low
+
+  * debian/watch: don't uupdate.
+  * Add descriptions and links to patch headers.
+  * debian/control.in:
+    - Standards-Version is 3.8.2, no changes needed.
+    - Extend gnome-terminal-data's long description.
+    - No need to replace/conflict gnome-terminal2, that's gone for good.
+    - gnome-terminal 2.10 is not even in oldstable, no need to replace it
+      in gnome-terminal-data.
+  * Move the menu and desktop files to the gnome-terminal package, add
+    replaces accordingly.
+
+ -- Emilio Pozuelo Monfort <pochu at ubuntu.com>  Sat, 27 Jun 2009 16:22:22 +0200
+
 gnome-terminal (2.26.2-2) unstable; urgency=low
 
   * 02_let_gconf_autostart.patch: Don’t exit if there is no GConf daemon 

Modified: desktop/unstable/gnome-terminal/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-terminal/debian/control?rev=20487&op=diff
==============================================================================
--- desktop/unstable/gnome-terminal/debian/control (original)
+++ desktop/unstable/gnome-terminal/debian/control Sat Jun 27 15:21:09 2009
@@ -2,8 +2,8 @@
 Section: gnome
 Priority: optional
 Maintainer: Guilherme de S. Pastore <gpastore at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Sebastian Dröge <slomo at debian.org>
-Standards-Version: 3.8.1
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at ubuntu.com>, Josselin Mouette <joss at debian.org>, Sebastian Dröge <slomo at debian.org>
+Standards-Version: 3.8.2
 Build-Depends: cdbs (>= 0.4.41),
                debhelper (>= 5),
                intltool (>= 0.40.0),
@@ -26,8 +26,7 @@
          ${misc:Depends},
          gnome-terminal-data (>= ${gnome:Version}),
          gnome-terminal-data (<< ${gnome:NextVersion})
-Conflicts: gnome-terminal2
-Replaces: gnome-terminal2
+Replaces: gnome-terminal-data (<< 2.26.2-3)
 Provides: x-terminal-emulator
 Recommends: yelp,
             gvfs
@@ -47,5 +46,11 @@
 Recommends: gnome-terminal
 Depends: ${misc:Depends}
 Description: Data files for the GNOME terminal emulator
+ GNOME Terminal is a terminal emulation application that you can use to
+ perform the following actions:
+  - Access a UNIX shell in the GNOME environment.
+  - Run any application that is designed to run on VT102, VT220, and xterm
+ terminals.
+ .
  This package contains data, help files and localization settings for
  gnome-terminal, the GNOME terminal emulator application.

Modified: desktop/unstable/gnome-terminal/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-terminal/debian/control.in?rev=20487&op=diff
==============================================================================
--- desktop/unstable/gnome-terminal/debian/control.in (original)
+++ desktop/unstable/gnome-terminal/debian/control.in Sat Jun 27 15:21:09 2009
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Guilherme de S. Pastore <gpastore at debian.org>
 Uploaders: @GNOME_TEAM@
-Standards-Version: 3.8.1
+Standards-Version: 3.8.2
 Build-Depends: cdbs (>= 0.4.41),
                debhelper (>= 5),
                intltool (>= 0.40.0),
@@ -26,8 +26,7 @@
          ${misc:Depends},
          gnome-terminal-data (>= ${gnome:Version}),
          gnome-terminal-data (<< ${gnome:NextVersion})
-Conflicts: gnome-terminal2
-Replaces: gnome-terminal2
+Replaces: gnome-terminal-data (<< 2.26.2-3)
 Provides: x-terminal-emulator
 Recommends: yelp,
             gvfs
@@ -43,9 +42,14 @@
 
 Package: gnome-terminal-data
 Architecture: all
-Replaces: gnome-terminal (<< 2.10-1)
 Recommends: gnome-terminal
 Depends: ${misc:Depends}
 Description: Data files for the GNOME terminal emulator
+ GNOME Terminal is a terminal emulation application that you can use to
+ perform the following actions:
+  - Access a UNIX shell in the GNOME environment.
+  - Run any application that is designed to run on VT102, VT220, and xterm
+ terminals.
+ .
  This package contains data, help files and localization settings for
  gnome-terminal, the GNOME terminal emulator application.

Modified: desktop/unstable/gnome-terminal/debian/gnome-terminal-data.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-terminal/debian/gnome-terminal-data.install?rev=20487&op=diff
==============================================================================
--- desktop/unstable/gnome-terminal/debian/gnome-terminal-data.install (original)
+++ desktop/unstable/gnome-terminal/debian/gnome-terminal-data.install Sat Jun 27 15:21:09 2009
@@ -3,6 +3,5 @@
 debian/tmp/usr/share/locale
 debian/tmp/usr/share/gnome
 debian/tmp/usr/share/omf
-debian/tmp/usr/share/applications
 
 debian/gnome-terminal.xpm /usr/share/pixmaps

Modified: desktop/unstable/gnome-terminal/debian/gnome-terminal.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-terminal/debian/gnome-terminal.install?rev=20487&op=diff
==============================================================================
--- desktop/unstable/gnome-terminal/debian/gnome-terminal.install (original)
+++ desktop/unstable/gnome-terminal/debian/gnome-terminal.install Sat Jun 27 15:21:09 2009
@@ -1,3 +1,4 @@
 debian/tmp/usr/bin
+debian/tmp/usr/share/applications
 
 debian/gnome-terminal.wrapper /usr/bin

Modified: desktop/unstable/gnome-terminal/debian/patches/01_onlyshowin.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-terminal/debian/patches/01_onlyshowin.patch?rev=20487&op=diff
==============================================================================
--- desktop/unstable/gnome-terminal/debian/patches/01_onlyshowin.patch (original)
+++ desktop/unstable/gnome-terminal/debian/patches/01_onlyshowin.patch Sat Jun 27 15:21:09 2009
@@ -1,3 +1,6 @@
+Description: Only show g-t in GNOME, as other DE have their own terminal emulators
+Bug: http://bugzilla.gnome.org/show_bug.cgi?id=587132
+
 --- gnome-terminal.desktop.in.in.orig	2009-06-01 11:31:40.396545651 +0200
 +++ gnome-terminal.desktop.in.in	2009-06-01 11:32:01.080542492 +0200
 @@ -12,3 +12,4 @@

Modified: desktop/unstable/gnome-terminal/debian/patches/02_let_gconf_autostart.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-terminal/debian/patches/02_let_gconf_autostart.patch?rev=20487&op=diff
==============================================================================
--- desktop/unstable/gnome-terminal/debian/patches/02_let_gconf_autostart.patch (original)
+++ desktop/unstable/gnome-terminal/debian/patches/02_let_gconf_autostart.patch Sat Jun 27 15:21:09 2009
@@ -1,3 +1,7 @@
+Description: allow gnome-terminal to run as root
+Bug: http://bugzilla.gnome.org/show_bug.cgi?id=564649
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=531702
+
 --- src/terminal.c.orig	2009-06-27 14:48:41.740115657 +0200
 +++ src/terminal.c	2009-06-27 14:49:37.573407952 +0200
 @@ -234,9 +234,6 @@

Modified: desktop/unstable/gnome-terminal/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-terminal/debian/watch?rev=20487&op=diff
==============================================================================
--- desktop/unstable/gnome-terminal/debian/watch (original)
+++ desktop/unstable/gnome-terminal/debian/watch Sat Jun 27 15:21:09 2009
@@ -1,4 +1,3 @@
 version=2
 http://ftp.gnome.org/pub/GNOME/sources/gnome-terminal/([\d\.]+)[02468]/ \
-        gnome-terminal-(.*)\.tar\.gz \
-	        debian uupdate
+        gnome-terminal-(.*)\.tar\.gz

More information about the pkg-gnome-commits mailing list