r11585 - in /desktop/experimental/vte/debian: changelog control control.in libvte-common.install libvte-dev.install libvte-doc.install libvte9-udeb.install libvte9.install python-vte.install rules

lool at users.alioth.debian.org lool at users.alioth.debian.org
Mon Jun 18 21:25:59 UTC 2007 

Author: lool
Date: Mon Jun 18 21:25:58 2007
New Revision: 11585

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=11585
Log:
* Add a new libvte9-udeb package.

Added:
    desktop/experimental/vte/debian/libvte9-udeb.install
Modified:
    desktop/experimental/vte/debian/changelog
    desktop/experimental/vte/debian/control
    desktop/experimental/vte/debian/control.in
    desktop/experimental/vte/debian/libvte-common.install
    desktop/experimental/vte/debian/libvte-dev.install
    desktop/experimental/vte/debian/libvte-doc.install
    desktop/experimental/vte/debian/libvte9.install
    desktop/experimental/vte/debian/python-vte.install
    desktop/experimental/vte/debian/rules

Modified: desktop/experimental/vte/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/vte/debian/changelog?rev=11585&op=diff
==============================================================================
--- desktop/experimental/vte/debian/changelog (original)
+++ desktop/experimental/vte/debian/changelog Mon Jun 18 21:25:58 2007
@@ -1,3 +1,9 @@
+vte (1:0.16.5-2) experimental; urgency=low
+
+  * Add a new libvte9-udeb package.
+
+ -- Loic Minier <lool at dooz.org>  Mon, 18 Jun 2007 23:10:47 +0200
+
 vte (1:0.16.5-1) unstable; urgency=low
 
   * New upstream release

Modified: desktop/experimental/vte/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/vte/debian/control?rev=11585&op=diff
==============================================================================
--- desktop/experimental/vte/debian/control (original)
+++ desktop/experimental/vte/debian/control Mon Jun 18 21:25:58 2007
@@ -34,6 +34,25 @@
  uses it to determine if data received from a pseudo-terminal is a control
  sequence or just random data. The sample program "interpret" illustrates
  more or less what the widget sees after it filters incoming data.
+
+Package: libvte9-udeb
+XC-Package-Type: udeb
+Section: debian-installer
+Priority: extra
+Architecture: any
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         libvte-common
+Description: Terminal emulator widget for GTK+ 2.0 - minimal runtime
+ This is a udeb, or a microdeb, for the debian-installer.
+ .
+ The VTE library inserts terminal capability strings into a trie, and then
+ uses it to determine if data received from a pseudo-terminal is a control
+ sequence or just random data. The sample program "interpret" illustrates
+ more or less what the widget sees after it filters incoming data.
+ .
+ This package contains the minimal runtime library needed by the Debian
+ installer.
 
 Package: libvte-dev
 Architecture: any

Modified: desktop/experimental/vte/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/vte/debian/control.in?rev=11585&op=diff
==============================================================================
--- desktop/experimental/vte/debian/control.in (original)
+++ desktop/experimental/vte/debian/control.in Mon Jun 18 21:25:58 2007
@@ -34,6 +34,25 @@
  uses it to determine if data received from a pseudo-terminal is a control
  sequence or just random data. The sample program "interpret" illustrates
  more or less what the widget sees after it filters incoming data.
+
+Package: libvte9-udeb
+XC-Package-Type: udeb
+Section: debian-installer
+Priority: extra
+Architecture: any
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         libvte-common
+Description: Terminal emulator widget for GTK+ 2.0 - minimal runtime
+ This is a udeb, or a microdeb, for the debian-installer.
+ .
+ The VTE library inserts terminal capability strings into a trie, and then
+ uses it to determine if data received from a pseudo-terminal is a control
+ sequence or just random data. The sample program "interpret" illustrates
+ more or less what the widget sees after it filters incoming data.
+ .
+ This package contains the minimal runtime library needed by the Debian
+ installer.
 
 Package: libvte-dev
 Architecture: any

Modified: desktop/experimental/vte/debian/libvte-common.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/vte/debian/libvte-common.install?rev=11585&op=diff
==============================================================================
--- desktop/experimental/vte/debian/libvte-common.install (original)
+++ desktop/experimental/vte/debian/libvte-common.install Mon Jun 18 21:25:58 2007
@@ -1,2 +1,2 @@
-debian/tmp/usr/share/locale
-debian/tmp/usr/share/vte/termcap
+usr/share/locale
+usr/share/vte/termcap

Modified: desktop/experimental/vte/debian/libvte-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/vte/debian/libvte-dev.install?rev=11585&op=diff
==============================================================================
--- desktop/experimental/vte/debian/libvte-dev.install (original)
+++ desktop/experimental/vte/debian/libvte-dev.install Mon Jun 18 21:25:58 2007
@@ -1,4 +1,4 @@
-debian/tmp/usr/include
-debian/tmp/usr/lib/pkgconfig
-debian/tmp/usr/lib/libvte.a
-debian/tmp/usr/lib/libvte.so
+usr/include
+usr/lib/pkgconfig
+usr/lib/libvte.a
+usr/lib/libvte.so

Modified: desktop/experimental/vte/debian/libvte-doc.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/vte/debian/libvte-doc.install?rev=11585&op=diff
==============================================================================
--- desktop/experimental/vte/debian/libvte-doc.install (original)
+++ desktop/experimental/vte/debian/libvte-doc.install Mon Jun 18 21:25:58 2007
@@ -1,1 +1,1 @@
-debian/tmp/usr/share/gtk-doc
+usr/share/gtk-doc

Added: desktop/experimental/vte/debian/libvte9-udeb.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/vte/debian/libvte9-udeb.install?rev=11585&op=file
==============================================================================
--- desktop/experimental/vte/debian/libvte9-udeb.install (added)
+++ desktop/experimental/vte/debian/libvte9-udeb.install Mon Jun 18 21:25:58 2007
@@ -1,0 +1,1 @@
+usr/lib/libvte.so.*

Modified: desktop/experimental/vte/debian/libvte9.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/vte/debian/libvte9.install?rev=11585&op=diff
==============================================================================
--- desktop/experimental/vte/debian/libvte9.install (original)
+++ desktop/experimental/vte/debian/libvte9.install Mon Jun 18 21:25:58 2007
@@ -1,3 +1,3 @@
-debian/tmp/usr/lib/libvte.so.*
-debian/tmp/usr/lib/vte/* usr/lib/libvte9/
-debian/tmp/usr/lib/libvte9/*
+usr/lib/libvte.so.*
+usr/lib/vte/* usr/lib/libvte9/
+usr/lib/libvte9/*

Modified: desktop/experimental/vte/debian/python-vte.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/vte/debian/python-vte.install?rev=11585&op=diff
==============================================================================
--- desktop/experimental/vte/debian/python-vte.install (original)
+++ desktop/experimental/vte/debian/python-vte.install Mon Jun 18 21:25:58 2007
@@ -1,1 +1,1 @@
-debian/tmp/usr/lib/python*/site-packages/gtk-2.0/*
+usr/lib/python*/site-packages/gtk-2.0/*

Modified: desktop/experimental/vte/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/vte/debian/rules?rev=11585&op=diff
==============================================================================
--- desktop/experimental/vte/debian/rules (original)
+++ desktop/experimental/vte/debian/rules Mon Jun 18 21:25:58 2007
@@ -1,5 +1,11 @@
 #!/usr/bin/make -f
-# -*- mode: makefile; coding: utf-8 -*-
+
+libvteN := $(shell sed -n 's/Package: \(.*\)/\1/p' debian/control | head -n 1)
+udeb := $(libvteN)-udeb
+
+buildbasedir := $(CURDIR)/debian/build
+DEB_BUILDDIR := $(buildbasedir)/main
+DEB_BUILDDIR_$(udeb) := $(buildbasedir)/udeb
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
@@ -8,19 +14,41 @@
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
-version := $(shell sed -n 's/Package: \(.*\)/\1/p' debian/control | head -n 1)
-
 PY_VERSIONS = $(shell pyversions --requested debian/control)
 
-DEB_CONFIGURE_LIBEXECDIR := \$${prefix}/lib/${version}
+DEB_CONFIGURE_LIBEXECDIR := \$${prefix}/lib/$(libvteN)
 DEB_FIXPERMS_EXCLUDE := gnome-pty-helper
-DEB_DH_MAKESHLIBS_ARGS_ALL = -V 'libvte9 (>= 1:0.16.0)'
+DEB_DH_MAKESHLIBS_ARGS_ALL = -V '$(libvteN) (>= 1:0.16.0)'
 
-DEB_BUILDDIR := build
+DEB_DESTDIR := $(CURDIR)/debian/tmp/main
+DEB_DESTDIR_$(udeb) := $(CURDIR)/debian/tmp/udeb
 
+DEB_DH_INSTALL_ARGS = --sourcedir=$(if $(findstring $(udeb),$(cdbs_curpkg)),$(DEB_DESTDIR_$(udeb)),$(DEB_DESTDIR))
+
+######
+# udeb rules
+configure/$(udeb):: $(DEB_BUILDDIR_$(udeb))/config.status
+$(DEB_BUILDDIR_$(udeb))/config.status:
+	cd $(DEB_BUILDDIR_$(udeb)) && \
+		$(DEB_CONFIGURE_SCRIPT_ENV) \
+			$(DEB_CONFIGURE_SCRIPT) \
+				$(DEB_CONFIGURE_NORMAL_ARGS) \
+				$(cdbs_configure_flags) \
+				$(DEB_CONFIGURE_EXTRA_FLAGS) \
+				$(DEB_CONFIGURE_USER_FLAGS)
+
+build/$(udeb)::
+	make -C $(DEB_BUILDDIR_$(udeb))
+
+install/$(udeb)::
+	make -C $(DEB_BUILDDIR_$(udeb)) install DESTDIR=$(DEB_DESTDIR_$(udeb))
+
+
+######
+# Python rules
 configure-stamp-%:
-	mkdir build-$*
-	cd build-$* && PYTHON=`which $*` $(DEB_CONFIGURE_SCRIPT_ENV) \
+	mkdir $(buildbasedir)/$*
+	cd $(buildbasedir)/$* && PYTHON=`which $*` $(DEB_CONFIGURE_SCRIPT_ENV) \
 	    $(DEB_CONFIGURE_SCRIPT) \
 		$(DEB_CONFIGURE_NORMAL_ARGS) \
 		--disable-maintainer-mode \
@@ -32,17 +60,17 @@
 configure/python-vte:: $(addprefix configure-stamp-, $(PY_VERSIONS))
 
 build-stamp-%:
-	make -C build-$*
+	make -C $(buildbasedir)/$*
 	touch $@
 
 build/python-vte:: $(addprefix build-stamp-, $(PY_VERSIONS))
 
 install-stamp-%:
-	make -C build-$* install DESTDIR=$(CURDIR)/debian/tmp
+	make -C $(buildbasedir)/$* install DESTDIR=$(DEB_DESTDIR)
 	# stop shipping *.a and *.la files for the Python module;
 	# python-support moves them anyway (#412477)
-	find $(CURDIR)/debian/tmp/usr/lib/$* -name \*.a -exec rm -f '{}' \;
-	find $(CURDIR)/debian/tmp/usr/lib/$* -name \*.la -exec rm -f '{}' \;
+	find $(DEB_DESTDIR)/usr/lib/$* -name \*.a -exec rm -f '{}' \;
+	find $(DEB_DESTDIR)/usr/lib/$* -name \*.la -exec rm -f '{}' \;
 	touch $@
 
 install/python-vte:: $(addprefix install-stamp-, $(PY_VERSIONS))
@@ -50,9 +78,11 @@
 binary-install/python-vte::
 	dh_pysupport -d
 
+
+######
+# common cleanup
 clean::
-	-rm -rf $(DEB_BUILDDIR)
-	-rm -rf $(addprefix build-, $(PY_VERSIONS))
+	-rm -rf $(buildbasedir)
 	-rm -rf $(addprefix configure-stamp-, $(PY_VERSIONS))
 	-rm -rf $(addprefix build-stamp-, $(PY_VERSIONS))
 	-rm -rf $(addprefix install-stamp-, $(PY_VERSIONS))

More information about the pkg-gnome-commits mailing list