r42531 - in /desktop/experimental/vte2.91/debian: changelog control control.in

[sjoerd at users.alioth.debian.org]

Author: sjoerd
Date: Sat Sep  6 10:58:54 2014
New Revision: 42531

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=42531
Log:
Update b-d, Make libvte-2.91-dev conflict with libvte-2.90-dev

Modified:
    desktop/experimental/vte2.91/debian/changelog
    desktop/experimental/vte2.91/debian/control
    desktop/experimental/vte2.91/debian/control.in

Modified: desktop/experimental/vte2.91/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/vte2.91/debian/changelog?rev=42531&op=diff
==============================================================================
--- desktop/experimental/vte2.91/debian/changelog	[utf-8] (original)
+++ desktop/experimental/vte2.91/debian/changelog	[utf-8] Sat Sep  6 10:58:54 2014
@@ -8,8 +8,9 @@
     + Removed. ncurses is no longer used
   * debian/patches/fix-out-of-tree-build.patch
     + Added. Fix out of tree build
-
- -- Sjoerd Simons <sjoerd at debian.org>  Fri, 05 Sep 2014 23:53:40 +0200
+  * Make libvte-2.91-dev conflict with libvte-2.90-dev
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Sat, 06 Sep 2014 12:58:09 +0200
 
 vte3 (1:0.36.3-1) unstable; urgency=medium
 

Modified: desktop/experimental/vte2.91/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/vte2.91/debian/control?rev=42531&op=diff
==============================================================================
--- desktop/experimental/vte2.91/debian/control	[utf-8] (original)
+++ desktop/experimental/vte2.91/debian/control	[utf-8] Sat Sep  6 10:58:54 2014
@@ -15,15 +15,16 @@
                libglib2.0-dev (>= 2.31.13),
                libcairo2-dev,
                libx11-dev,
+               libxml2-utils,
                libgtk-3-dev (>= 3.1.9),
                gobject-introspection (>= 0.9.12-4~),
                libgirepository1.0-dev (>= 0.9.12),
                gettext,
-               libncurses5-dev,
                gtk-doc-tools,
                libpango1.0-dev (>= 1.22.0),
                libgladeui-dev,
-               intltool (>= 0.35)
+               intltool (>= 0.35),
+               valac
 Build-Depends-Indep: libglib2.0-doc, libgtk-3-doc, libatk1.0-doc
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/vte2.91
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/vte2.91
@@ -83,6 +84,7 @@
          libglib2.0-dev (>= 2.22.0),
          libvte-2.91-common
 Recommends: libvte-2.91-doc
+Conflicts: libvte-2.90-dev
 Description: Terminal emulator widget for GTK+ 3.0 - development files
  The VTE library provides a terminal emulator widget VteTerminal for
  applications using the GTK+ toolkit. It also provides the VtePTY object

Modified: desktop/experimental/vte2.91/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/vte2.91/debian/control.in?rev=42531&op=diff
==============================================================================
--- desktop/experimental/vte2.91/debian/control.in	[utf-8] (original)
+++ desktop/experimental/vte2.91/debian/control.in	[utf-8] Sat Sep  6 10:58:54 2014
@@ -80,6 +80,7 @@
          libglib2.0-dev (>= 2.22.0),
          libvte-2.91-common
 Recommends: libvte-2.91-doc
+Conflicts: libvte-2.90-dev
 Description: Terminal emulator widget for GTK+ 3.0 - development files
  The VTE library provides a terminal emulator widget VteTerminal for
  applications using the GTK+ toolkit. It also provides the VtePTY object