Changeset 7371 for pkg


Ignore:
Timestamp:
02/13/11 23:13:33 (2 years ago)
Author:
alanbach-guest
Message:
  • New upstream stable release
    • build-dep on dh-autoreconf and removed 90_autoreconf.patch
    • merged updates from Ubuntu
Location:
pkg/raul/main/vte/trunk/debian
Files:
5 added
1 deleted
9 edited

Legend:

Unmodified
Added
Removed

  • pkg/raul/main/vte/trunk/debian/changelog

    r6648 r7371  
     1vte (1:0.26.2-parsix1) unstable; urgency=low 
     2 
     3  * New upstream stable release 
     4    - build-dep on dh-autoreconf and removed 90_autoreconf.patch 
     5    - merged updates from Ubuntu 
     6 
     7 -- Alan Baghumian <alan@technotux.org>  Sun, 13 Feb 2011 14:12:41 -0800 
     8 
    19vte (1:0.24.1-parsix1) unstable; urgency=low 
    210 

  • pkg/raul/main/vte/trunk/debian/control

    r6648 r7371  
    77Section: libs 
    88Priority: optional 
    9 Maintainer: Guilherme de S. Pastore <gpastore@debian.org> 
    10 Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu@debian.org>, Josselin Mouette <joss@debian.org>, Sebastian Dröge <slomo@debian.org> 
     9Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com> 
     10XSBC-Original-Maintainer: Guilherme de S. Pastore <gpastore@debian.org> 
     11Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org> 
    1112Standards-Version: 3.8.4 
    1213XS-Python-Version: >= 2.3 
    1314Build-Depends: cdbs (>= 0.4.43), 
    1415               debhelper (>= 5.0.37.2), 
     16               dh-autoreconf, 
    1517               libglib2.0-dev (>= 2.22.0), 
    1618               libcairo2-dev, 
    1719               libx11-dev, 
    1820               libgtk2.0-dev (>= 2.19.7-2), 
     21               gobject-introspection (>= 0.6.7), 
     22               libgirepository1.0-dev (>= 0.6.7), 
    1923               gettext, 
    2024               python-gtk2-dev, 
    … …  
    2933               intltool (>= 0.35) 
    3034Build-Depends-Indep: libglib2.0-doc, libgtk2.0-doc, libatk1.0-doc 
     35Vcs-Bzr: http://code.launchpad.net/~ubuntu-desktop/vte/ubuntu 
    3136 
    3237Package: libvte9 
    … …  
    5964 This package contains the minimal runtime library needed by the Debian 
    6065 installer. 
     66 
     67Package: gir1.2-vte-1.0 
     68Section: libs 
     69Architecture: any 
     70Depends: ${gir:Depends}, 
     71         ${shlibs:Depends}, 
     72         ${misc:Depends} 
     73Conflicts: gobject-introspection-repository 
     74Description: GObject introspection data for the VTE library 
     75 This package contains introspection data for VTE, a terminal emulator 
     76 widget for GTK+. 
     77 . 
     78 It can be used by packages using the GIRepository format to generate 
     79 dynamic bindings. 
    6180 
    6281Package: libvte-dev 

  • pkg/raul/main/vte/trunk/debian/control.in

    r6648 r7371  
    22Section: libs 
    33Priority: optional 
    4 Maintainer: Guilherme de S. Pastore <gpastore@debian.org> 
     4Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com> 
     5XSBC-Original-Maintainer: Guilherme de S. Pastore <gpastore@debian.org> 
    56Uploaders: @GNOME_TEAM@ 
    67Standards-Version: 3.8.4 
    … …  
    89Build-Depends: cdbs (>= 0.4.43), 
    910               debhelper (>= 5.0.37.2), 
     11               dh-autoreconf, 
    1012               libglib2.0-dev (>= 2.22.0), 
    1113               libcairo2-dev, 
    1214               libx11-dev, 
    1315               libgtk2.0-dev (>= 2.19.7-2), 
     16               gobject-introspection (>= 0.6.7), 
     17               libgirepository1.0-dev (>= 0.6.7), 
    1418               gettext, 
    1519               python-gtk2-dev, 
    … …  
    2428               intltool (>= 0.35) 
    2529Build-Depends-Indep: libglib2.0-doc, libgtk2.0-doc, libatk1.0-doc 
     30Vcs-Bzr: http://code.launchpad.net/~ubuntu-desktop/vte/ubuntu 
    2631 
    2732Package: libvte9 
    … …  
    5459 This package contains the minimal runtime library needed by the Debian 
    5560 installer. 
     61 
     62Package: gir1.0-vte-1.0 
     63Section: libs 
     64Architecture: any 
     65Depends: ${gir:Depends}, 
     66         ${shlibs:Depends}, 
     67         ${misc:Depends} 
     68Conflicts: gobject-introspection-repository 
     69Description: GObject introspection data for the VTE library 
     70 This package contains introspection data for VTE, a terminal emulator 
     71 widget for GTK+. 
     72 . 
     73 It can be used by packages using the GIRepository format to generate 
     74 dynamic bindings. 
    5675 
    5776Package: libvte-dev 

  • pkg/raul/main/vte/trunk/debian/libvte-dev.install

    r5246 r7371  
    44usr/lib/libvte.so 
    55usr/share/pygtk/2.0/defs 
     6usr/share/gir-1.0 

  • pkg/raul/main/vte/trunk/debian/libvte9.install

    r1828 r7371  
    11usr/lib/libvte.so.* 
    2 usr/lib/vte/* usr/lib/libvte9/ 
     2usr/lib/vte-0.0/* usr/lib/libvte9/ 
    33usr/lib/libvte9/* 

  • pkg/raul/main/vte/trunk/debian/patches/12_python_reaper.patch

    r6648 r7371  
    44gdebi: #574168 
    55 
    6 diff -urN vte-0.20.0.orig/python/vte.defs vte-0.20.0/python/vte.defs 
    7 --- vte-0.20.0.orig/python/vte.defs     2009-03-05 15:06:07.000000000 +0100 
    8 +++ vte-0.20.0/python/vte.defs  2009-04-07 20:17:08.000000000 +0200 
     6Index: vte-0.25.90/python/vte.defs 
     7=================================================================== 
     8--- vte-0.25.90.orig/python/vte.defs    2009-04-18 02:51:43.000000000 +1000 
     9+++ vte-0.25.90/python/vte.defs 2010-08-17 17:35:04.300563000 +1000 
    910@@ -7,6 +7,14 @@ 
    1011   (gtype-id "VTE_TYPE_TERMINAL") 
    … …  
    4041  
    4142  
    42 diff -urN vte-0.20.0.orig/python/vtemodule.c vte-0.20.0/python/vtemodule.c 
    43 --- vte-0.20.0.orig/python/vtemodule.c  2009-03-05 15:06:07.000000000 +0100 
    44 +++ vte-0.20.0/python/vtemodule.c       2009-04-07 20:18:05.000000000 +0200 
    45 @@ -25,6 +25,7 @@ 
     43Index: vte-0.25.90/python/vtemodule.c 
     44=================================================================== 
     45--- vte-0.25.90.orig/python/vtemodule.c 2010-07-16 03:08:44.000000000 +1000 
     46+++ vte-0.25.90/python/vtemodule.c      2010-08-17 17:35:04.300563000 +1000 
     47@@ -23,6 +23,7 @@ 
    4648 #include <pygobject.h> 
    4749 #include <pygtk/pygtk.h> 
    … …  
    5153 extern void pyvte_register_classes(PyObject * d); 
    5254 extern void pyvte_add_constants(PyObject *module, const gchar *strip_prefix); 
    53 diff -urN vte-0.20.0.orig/python/vte.override vte-0.20.0/python/vte.override 
    54 --- vte-0.20.0.orig/python/vte.override 2009-03-05 15:06:07.000000000 +0100 
    55 +++ vte-0.20.0/python/vte.override      2009-04-07 20:17:45.000000000 +0200 
     55Index: vte-0.25.90/python/vte.override 
     56=================================================================== 
     57--- vte-0.25.90.orig/python/vte.override        2010-07-16 03:08:44.000000000 +1000 
     58+++ vte-0.25.90/python/vte.override     2010-08-17 17:35:04.300563000 +1000 
    5659@@ -7,6 +7,7 @@ 
    5760 #include <pygobject.h> 

  • pkg/raul/main/vte/trunk/debian/patches/25_optional-ncurses.patch

    r6648 r7371  
    1 --- a/configure.in 
    2 +++ b/configure.in 
    3 @@ -295,45 +295,52 @@ 
     1Index: vte-0.25.90/configure.in 
     2=================================================================== 
     3--- vte-0.25.90.orig/configure.in       2010-08-16 23:07:06.000000000 +1000 
     4+++ vte-0.25.90/configure.in    2010-08-17 17:35:08.670563000 +1000 
     5@@ -336,45 +336,52 @@ 
    46 AC_CHECK_FUNC(floor,,AC_CHECK_LIB(m,floor,LIBS=["$LIBS -lm"])) 
    57 AC_CHECK_FUNCS([ceil floor]) 
    … …  
    9294 # Search for the required modules. 
    9395  
    94 --- a/src/keymap.c 
    95 +++ b/src/keymap.c 
     96Index: vte-0.25.90/src/keymap.c 
     97=================================================================== 
     98--- vte-0.25.90.orig/src/keymap.c       2010-07-16 03:08:44.000000000 +1000 
     99+++ vte-0.25.90/src/keymap.c    2010-08-17 17:35:08.670563000 +1000 
    96100@@ -44,7 +44,7 @@ 
    97101 #include <termcap.h> 
    … …  
    130134        _vte_debug_print(VTE_DEBUG_KEYBOARD, 
    131135                        " (ignoring, no match for modifier state).\n"); 
    132 --- a/src/ssfe.c 
    133 +++ b/src/ssfe.c 
     136Index: vte-0.25.90/src/ssfe.c 
     137=================================================================== 
     138--- vte-0.25.90.orig/src/ssfe.c 2010-01-14 07:49:48.000000000 +1100 
     139+++ vte-0.25.90/src/ssfe.c      2010-08-17 17:35:08.670563000 +1000 
    134140@@ -38,7 +38,7 @@ 
    135141 #include <termcap.h> 

  • pkg/raul/main/vte/trunk/debian/patches/series

    r6028 r7371  
    2225_optional-ncurses.patch 
    3360_termcap-home-end.patch 
    4 90_autoreconf.patch 
     491_keep_fds.patch 
     593_add_alt_screen_scroll_toggle.patch 

  • pkg/raul/main/vte/trunk/debian/rules

    r6648 r7371  
    1111include /usr/share/cdbs/1/rules/utils.mk 
    1212include /usr/share/cdbs/1/class/gnome.mk 
     13include /usr/share/cdbs/1/rules/autoreconf.mk 
    1314include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk 
    1415-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk 
    … …  
    2122 
    2223DEB_CONFIGURE_EXTRA_FLAGS += \ 
    23         --enable-glade-catalogue 
     24        --enable-glade-catalogue \ 
     25        --enable-introspection 
    2426 
    2527UDEB_CONFIGURE_EXTRA_FLAGS += \ 
    … …  
    99101        -rm -rf $(addprefix install-stamp-, $(PY_VERSIONS)) 
    100102 
     103common-binary-fixup-arch:: 
     104        t=libvte-common; \ 
     105        for p in $$(dh_listpackages -a -N$$t); do \ 
     106          rm -rf debian/$$p/usr/share/doc/$$p; \ 
     107          ln -s $$t debian/$$p/usr/share/doc/$$p; \ 
     108          if [ -f debian/$$p.docs ]; then \ 
     109            mkdir -p debian/$$p/usr/share/doc/$$t; \ 
     110            cp -a $$(eval echo $$(cat debian/$$p.docs)) debian/$$p/usr/share/doc/$$t/; \ 
     111            dh_compress -p$$p; \ 
     112          fi; \ 
     113          ( \ 
     114            echo "# doc dir is now a symlink to $$p"; \ 
     115            echo 'if [ "$$1" = upgrade ] && [ ! -L /usr/share/doc/'$$p' ]; then'; \ 
     116            echo "    rm -rf /usr/share/doc/$$p"; \ 
     117            echo "fi"; \ 
     118          ) >> debian/$$p.preinst.debhelper; \ 
     119        done 
Note: See TracChangeset for help on using the changeset viewer.