r27582 - in /desktop/unstable/gnome-terminal: ./ debian/changelog debian/control debian/control.in debian/rules

fpeters at users.alioth.debian.org fpeters at users.alioth.debian.org
Thu Apr 14 21:15:15 UTC 2011


Author: fpeters
Date: Thu Apr 14 21:14:54 2011
New Revision: 27582

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=27582
Log:
Revert to revision 24572

Modified:
    desktop/unstable/gnome-terminal/   (props changed)
    desktop/unstable/gnome-terminal/debian/changelog
    desktop/unstable/gnome-terminal/debian/control
    desktop/unstable/gnome-terminal/debian/control.in
    desktop/unstable/gnome-terminal/debian/rules

Propchange: desktop/unstable/gnome-terminal/
            ('svn:mergeinfo' removed)

Modified: desktop/unstable/gnome-terminal/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-terminal/debian/changelog?rev=27582&op=diff
==============================================================================
--- desktop/unstable/gnome-terminal/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-terminal/debian/changelog [utf-8] Thu Apr 14 21:14:54 2011
@@ -1,26 +1,3 @@
-gnome-terminal (3.0.0-1) experimental; urgency=low
-
-  * New upstream release.
-  * debian/control.in:
-    + remove article from description synopsis.
-    + bump Standards-Version to 3.9.2, no changes required.
-
- -- Frederic Peters <fpeters at debian.org>  Thu, 14 Apr 2011 22:16:36 +0200
-
-gnome-terminal (2.33.90-2) experimental; urgency=low
-
-  * debian/rules: bump libgconf2-dev build-dep.
-
- -- Frederic Peters <fpeters at debian.org>  Sun, 13 Mar 2011 15:27:35 +0100
-
-gnome-terminal (2.33.90-1) experimental; urgency=low
-
-  * New upstream release.
-    + debian/rules: build the GTK+ 3 version
-    + debian/control.in: update build-dependencies for the switch to GTK+ 3
-
- -- Frederic Peters <fpeters at debian.org>  Sun, 13 Mar 2011 13:21:50 +0100
-
 gnome-terminal (2.30.2-1) unstable; urgency=low
 
   * New upstream bugfix release.

Modified: desktop/unstable/gnome-terminal/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-terminal/debian/control?rev=27582&op=diff
==============================================================================
--- desktop/unstable/gnome-terminal/debian/control [utf-8] (original)
+++ desktop/unstable/gnome-terminal/debian/control [utf-8] Thu Apr 14 21:14:54 2011
@@ -7,38 +7,35 @@
 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>, Frederic Peters <fpeters at debian.org>, Luca Falavigna <dktrkranz at debian.org>, Sebastian Dröge <slomo at debian.org>
-Standards-Version: 3.9.2
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Luca Falavigna <dktrkranz at debian.org>, Sebastian Dröge <slomo at debian.org>
+Standards-Version: 3.8.4
 Build-Depends: cdbs (>= 0.4.41),
                debhelper (>= 5),
                intltool (>= 0.40.0),
                libx11-dev,
-               libgtk-3-dev (>= 3.0.0),
-               libgtk2.0-dev (>= 2.24.0),
-               libglib2.0-dev (>= 2.26.0),
-               libvte-2.90-dev (>= 0.27.3),
+               libgtk2.0-dev (>= 2.14.0),
+               libglib2.0-dev (>= 2.16.0),
+               libvte-dev (>= 1:0.24.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)
+               libgconf2-dev (>= 2.14.0),
+               libdbus-glib-1-dev (>= 0.6)
 
 Package: gnome-terminal
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         gsettings-desktop-schemas (>= 0.1.0),
          gnome-terminal-data (>= ${gnome:Version}),
          gnome-terminal-data (<< ${gnome:NextVersion})
 Replaces: gnome-terminal-data (<< 2.26.2-3)
 Provides: x-terminal-emulator
 Recommends: yelp,
             gvfs
-Description: GNOME terminal emulator application
+Description: The GNOME terminal emulator application
  GNOME Terminal is a terminal emulation application that you can use to
  perform the following actions:
   - Access a UNIX shell in the GNOME environment.

Modified: desktop/unstable/gnome-terminal/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-terminal/debian/control.in?rev=27582&op=diff
==============================================================================
--- desktop/unstable/gnome-terminal/debian/control.in [utf-8] (original)
+++ desktop/unstable/gnome-terminal/debian/control.in [utf-8] Thu Apr 14 21:14:54 2011
@@ -3,37 +3,34 @@
 Priority: optional
 Maintainer: Guilherme de S. Pastore <gpastore at debian.org>
 Uploaders: @GNOME_TEAM@
-Standards-Version: 3.9.2
+Standards-Version: 3.8.4
 Build-Depends: cdbs (>= 0.4.41),
                debhelper (>= 5),
                intltool (>= 0.40.0),
                libx11-dev,
-               libgtk-3-dev (>= 3.0.0),
-               libgtk2.0-dev (>= 2.24.0),
-               libglib2.0-dev (>= 2.26.0),
-               libvte-2.90-dev (>= 0.27.3),
+               libgtk2.0-dev (>= 2.14.0),
+               libglib2.0-dev (>= 2.16.0),
+               libvte-dev (>= 1:0.24.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)
+               libgconf2-dev (>= 2.14.0),
+               libdbus-glib-1-dev (>= 0.6)
 
 Package: gnome-terminal
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         gsettings-desktop-schemas (>= 0.1.0),
          gnome-terminal-data (>= ${gnome:Version}),
          gnome-terminal-data (<< ${gnome:NextVersion})
 Replaces: gnome-terminal-data (<< 2.26.2-3)
 Provides: x-terminal-emulator
 Recommends: yelp,
             gvfs
-Description: GNOME terminal emulator application
+Description: The GNOME terminal emulator application
  GNOME Terminal is a terminal emulation application that you can use to
  perform the following actions:
   - Access a UNIX shell in the GNOME environment.

Modified: desktop/unstable/gnome-terminal/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-terminal/debian/rules?rev=27582&op=diff
==============================================================================
--- desktop/unstable/gnome-terminal/debian/rules [utf-8] (original)
+++ desktop/unstable/gnome-terminal/debian/rules [utf-8] Thu Apr 14 21:14:54 2011
@@ -10,7 +10,7 @@
 
 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




More information about the pkg-gnome-commits mailing list