r33105 - in /desktop/unstable/vte3/debian: changelog control control.in libvte-2.90-common.install libvte-2.90-dev.install patches/03_glade-catalog-library-name.patch patches/series

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Tue Mar 13 13:49:04 UTC 2012 

Author: biebl
Date: Tue Mar 13 13:49:03 2012
New Revision: 33105

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=33105
Log:
* debian/patches/03_glade-catalog-library-name.patch: Use the correct
  vte library name in the glade catalog file.
* Move the glade catalog file from libvte-2.90-common into libvte-2.90-dev
  alongside the .so it references.
* Add the necessary Breaks/Replaces.

Added:
    desktop/unstable/vte3/debian/patches/03_glade-catalog-library-name.patch
Modified:
    desktop/unstable/vte3/debian/changelog
    desktop/unstable/vte3/debian/control
    desktop/unstable/vte3/debian/control.in
    desktop/unstable/vte3/debian/libvte-2.90-common.install
    desktop/unstable/vte3/debian/libvte-2.90-dev.install
    desktop/unstable/vte3/debian/patches/series

Modified: desktop/unstable/vte3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vte3/debian/changelog?rev=33105&op=diff
==============================================================================
--- desktop/unstable/vte3/debian/changelog [utf-8] (original)
+++ desktop/unstable/vte3/debian/changelog [utf-8] Tue Mar 13 13:49:03 2012
@@ -1,3 +1,13 @@
+vte3 (1:0.30.1-4) UNRELEASED; urgency=low
+
+  * debian/patches/03_glade-catalog-library-name.patch: Use the correct
+    vte library name in the glade catalog file.
+  * Move the glade catalog file from libvte-2.90-common into libvte-2.90-dev
+    alongside the .so it references.
+  * Add the necessary Breaks/Replaces.
+
+ -- Michael Biebl <biebl at debian.org>  Mon, 12 Dec 2011 16:39:13 +0100
+
 vte3 (1:0.30.1-3) unstable; urgency=low
 
   * debian/control.in:

Modified: desktop/unstable/vte3/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vte3/debian/control?rev=33105&op=diff
==============================================================================
--- desktop/unstable/vte3/debian/control [utf-8] (original)
+++ desktop/unstable/vte3/debian/control [utf-8] Tue Mar 13 13:49:03 2012
@@ -85,6 +85,8 @@
          libglib2.0-dev (>= 2.22.0),
          libvte-2.90-common
 Recommends: libvte-2.90-doc
+Replaces: libvte-2.90-common (<< 1:0.30.1-4)
+Breaks: libvte-2.90-common (<< 1:0.30.1-4)
 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/unstable/vte3/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vte3/debian/control.in?rev=33105&op=diff
==============================================================================
--- desktop/unstable/vte3/debian/control.in [utf-8] (original)
+++ desktop/unstable/vte3/debian/control.in [utf-8] Tue Mar 13 13:49:03 2012
@@ -80,6 +80,8 @@
          libglib2.0-dev (>= 2.22.0),
          libvte-2.90-common
 Recommends: libvte-2.90-doc
+Replaces: libvte-2.90-common (<< 1:0.30.1-4)
+Breaks: libvte-2.90-common (<< 1:0.30.1-4)
 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/unstable/vte3/debian/libvte-2.90-common.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vte3/debian/libvte-2.90-common.install?rev=33105&op=diff
==============================================================================
--- desktop/unstable/vte3/debian/libvte-2.90-common.install [utf-8] (original)
+++ desktop/unstable/vte3/debian/libvte-2.90-common.install [utf-8] Tue Mar 13 13:49:03 2012
@@ -1,3 +1,2 @@
 usr/share/locale
-usr/share/glade
 usr/share/vte/termcap-2.90

Modified: desktop/unstable/vte3/debian/libvte-2.90-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vte3/debian/libvte-2.90-dev.install?rev=33105&op=diff
==============================================================================
--- desktop/unstable/vte3/debian/libvte-2.90-dev.install [utf-8] (original)
+++ desktop/unstable/vte3/debian/libvte-2.90-dev.install [utf-8] Tue Mar 13 13:49:03 2012
@@ -3,3 +3,4 @@
 usr/lib/libvte2_90.a
 usr/lib/libvte2_90.so
 usr/share/gir-1.0
+usr/share/glade

Added: desktop/unstable/vte3/debian/patches/03_glade-catalog-library-name.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vte3/debian/patches/03_glade-catalog-library-name.patch?rev=33105&op=file
==============================================================================
--- desktop/unstable/vte3/debian/patches/03_glade-catalog-library-name.patch (added)
+++ desktop/unstable/vte3/debian/patches/03_glade-catalog-library-name.patch [utf-8] Tue Mar 13 13:49:03 2012
@@ -1,0 +1,14 @@
+Description: Use correct name library name in glade catalog file
+ https://bugzilla.gnome.org/show_bug.cgi?id=671760
+Author: Michael Biebl <biebl at debian.org>
+Index: vte-0.30.1/glade/vte.xml
+===================================================================
+--- vte-0.30.1.orig/glade/vte.xml	2012-03-13 12:53:40.854115129 +0100
++++ vte-0.30.1/glade/vte.xml	2012-03-13 12:53:53.406114683 +0100
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+-<glade-catalog supports="gtkbuilder" name="vte" library="vte" domain="vte" depends="gtk+" book="vte">
++<glade-catalog supports="gtkbuilder" name="vte" library="vte2_90" domain="vte" depends="gtk+" book="vte">
+   <glade-widget-classes>
+     <glade-widget-class title="VTE Terminal" name="VteTerminal" generic-name="terminal">
+       <properties>

Modified: desktop/unstable/vte3/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vte3/debian/patches/series?rev=33105&op=diff
==============================================================================
--- desktop/unstable/vte3/debian/patches/series [utf-8] (original)
+++ desktop/unstable/vte3/debian/patches/series [utf-8] Tue Mar 13 13:49:03 2012
@@ -1,4 +1,5 @@
 01_scroll_notebook.patch
 02_meta.patch
+03_glade-catalog-library-name.patch
 25_optional-ncurses.patch
 60_termcap-home-end.patch

More information about the pkg-gnome-commits mailing list