Index: pkg/vinnie/main/gnome-terminal/trunk/debian/patches/01_onlyshowin.patch
===================================================================
--- pkg/vinnie/main/gnome-terminal/trunk/debian/patches/01_onlyshowin.patch	(revision 6743)
+++ pkg/vinnie/main/gnome-terminal/trunk/debian/patches/01_onlyshowin.patch	(revision 6746)
@@ -1,7 +1,8 @@
-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
+Only show gnome-terminal in GNOME menus
 
---- 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
+Index: gnome-terminal-2.30.2/gnome-terminal.desktop.in.in
+===================================================================
+--- gnome-terminal-2.30.2.orig/gnome-terminal.desktop.in.in	2010-06-22 20:27:42.711402866 +0200
++++ gnome-terminal-2.30.2/gnome-terminal.desktop.in.in	2010-06-22 20:27:39.947410271 +0200
 @@ -12,3 +12,4 @@
  X-GNOME-Bugzilla-Version=@VERSION@
Index: pkg/vinnie/main/gnome-terminal/trunk/debian/patches/series
===================================================================
--- pkg/vinnie/main/gnome-terminal/trunk/debian/patches/series	(revision 6746)
+++ pkg/vinnie/main/gnome-terminal/trunk/debian/patches/series	(revision 6746)
@@ -0,0 +1,1 @@
+01_onlyshowin.patch
Index: pkg/vinnie/main/gnome-terminal/trunk/debian/changelog
===================================================================
--- pkg/vinnie/main/gnome-terminal/trunk/debian/changelog	(revision 6743)
+++ pkg/vinnie/main/gnome-terminal/trunk/debian/changelog	(revision 6746)
@@ -1,7 +1,47 @@
-gnome-terminal (2.28.2-parsix1) unstable; urgency=low
-
-  * Sync'd with Debian 2.28.2-1
-
- -- Alan Baghumian <alan@technotux.org>  Mon, 14 Dec 2009 18:02:17 -0800
+gnome-terminal (2.30.2-parsix1) unstable; urgency=low
+
+  * Sync'd with Debian 2.30.2-1
+
+ -- Alan Baghumian <alan@technotux.org>  Sat, 10 Jul 2010 12:51:45 -0700
+
+gnome-terminal (2.30.2-1) unstable; urgency=low
+
+  * New upstream bugfix release.
+  * Switch to format 3.0 (quilt).
+  * Bump Standards-Version to 3.8.4, no changes required.
+
+ -- Luca Falavigna <dktrkranz@debian.org>  Tue, 22 Jun 2010 20:54:32 +0200
+
+gnome-terminal (2.30.1-1) unstable; urgency=low
+
+  * New upstream bugfix release.
+
+ -- Sebastian DrÃ¶ge <slomo@debian.org>  Tue, 04 May 2010 09:37:18 +0200
+
+gnome-terminal (2.30.0-1) unstable; urgency=low
+
+  * New upstream stable release:
+    + debian/control.in:
+      - Update build dependencies.
+
+ -- Sebastian DrÃ¶ge <slomo@debian.org>  Wed, 31 Mar 2010 11:18:11 +0200
+
+gnome-terminal (2.29.92-1) experimental; urgency=low
+
+  * New upstream development release:
+    + debian/control.in:
+      - Update build dependencies.
+
+ -- Sebastian DrÃ¶ge <slomo@debian.org>  Fri, 12 Mar 2010 17:52:12 +0100
+
+gnome-terminal (2.29.6-1) experimental; urgency=low
+
+  * New upstream development release:
+    + debian/control.in:
+      - Update build dependencies.
+    + debian/rules:
+      - Include check-dist.mk to prevent accidental uploads to unstable.
+
+ -- Sebastian DrÃ¶ge <slomo@debian.org>  Thu, 14 Jan 2010 08:29:30 +0100
 
 gnome-terminal (2.28.2-1) unstable; urgency=low
Index: pkg/vinnie/main/gnome-terminal/trunk/debian/rules
===================================================================
--- pkg/vinnie/main/gnome-terminal/trunk/debian/rules	(revision 6743)
+++ pkg/vinnie/main/gnome-terminal/trunk/debian/rules	(revision 6746)
@@ -4,5 +4,4 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/utils.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
Index: pkg/vinnie/main/gnome-terminal/trunk/debian/source/format
===================================================================
--- pkg/vinnie/main/gnome-terminal/trunk/debian/source/format	(revision 6746)
+++ pkg/vinnie/main/gnome-terminal/trunk/debian/source/format	(revision 6746)
@@ -0,0 +1,1 @@
+3.0 (quilt)
Index: pkg/vinnie/main/gnome-terminal/trunk/debian/control
===================================================================
--- pkg/vinnie/main/gnome-terminal/trunk/debian/control	(revision 6743)
+++ pkg/vinnie/main/gnome-terminal/trunk/debian/control	(revision 6746)
@@ -8,14 +8,14 @@
 Priority: optional
 Maintainer: Guilherme de S. Pastore <gpastore@debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Josselin Mouette <joss@debian.org>, Luca Falavigna <dktrkranz@debian.org>, Sebastian DrÃ¶ge <slomo@debian.org>
-Standards-Version: 3.8.3
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Luca Falavigna <dktrkranz@debian.org>, Sebastian DrÃ¶ge <slomo@debian.org>
+Standards-Version: 3.8.4
 Build-Depends: cdbs (>= 0.4.41),
                debhelper (>= 5),
                intltool (>= 0.40.0),
+               libx11-dev,
                libgtk2.0-dev (>= 2.14.0),
                libglib2.0-dev (>= 2.16.0),
-               libvte-dev (>= 1:0.22.0),
+               libvte-dev (>= 1:0.24.0),
                scrollkeeper,
-               libstartup-notification0-dev (>= 0.8),
                libsm-dev,
                gnome-pkg-tools (>= 0.10),
Index: pkg/vinnie/main/gnome-terminal/trunk/debian/gnome-terminal.install
===================================================================
--- pkg/vinnie/main/gnome-terminal/trunk/debian/gnome-terminal.install	(revision 6743)
+++ pkg/vinnie/main/gnome-terminal/trunk/debian/gnome-terminal.install	(revision 6746)
@@ -1,4 +1,3 @@
 debian/tmp/usr/bin
 debian/tmp/usr/share/applications
-
 debian/gnome-terminal.wrapper /usr/bin
Index: pkg/vinnie/main/gnome-terminal/trunk/debian/control.in
===================================================================
--- pkg/vinnie/main/gnome-terminal/trunk/debian/control.in	(revision 6743)
+++ pkg/vinnie/main/gnome-terminal/trunk/debian/control.in	(revision 6746)
@@ -4,13 +4,13 @@
 Maintainer: Guilherme de S. Pastore <gpastore@debian.org>
 Uploaders: @GNOME_TEAM@
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 Build-Depends: cdbs (>= 0.4.41),
                debhelper (>= 5),
                intltool (>= 0.40.0),
+               libx11-dev,
                libgtk2.0-dev (>= 2.14.0),
                libglib2.0-dev (>= 2.16.0),
-               libvte-dev (>= 1:0.22.0),
+               libvte-dev (>= 1:0.24.0),
                scrollkeeper,
-               libstartup-notification0-dev (>= 0.8),
                libsm-dev,
                gnome-pkg-tools (>= 0.10),
