Merge lp:~cjwatson/frame/udeb into lp:frame/ubuntu

[Colin Watson]

Missing udeb support means that debian-installer fails to build (http://launchpadlibrarian.net/64612696/buildlog_ubuntu-natty-i386.debian-installer_20101020ubuntu16_FAILEDTOBUILD.txt.gz). After this is uploaded and has built and published everywhere, utouch-grail needs to be rebuilt against it, and then we can retry debian-installer.

[Stephen M. Webb (bregma)]

Yep, restores the udeb to the packaging. Please merge.

review: Approve

[Colin Watson (cjwatson)]

Done, thanks!

[Colin Watson (cjwatson)]

Wait, no, not done - I don't have write access to this branch, despite being in ~ubuntu-core-dev. Could somebody in ~utouch-packaging please merge this?

=== modified file 'debian/changelog'
--- debian/changelog	2011-02-07 17:48:03 +0000
+++ debian/changelog	2011-02-18 14:43:53 +0000
@@ -1,3 +1,10 @@
+utouch-frame (1.0.0-0ubuntu3) UNRELEASED; urgency=low
+
+  * Restore udeb support.  utouch-grail is in some d-i initrds, depends on
+    this library, and ships a udeb, so we have to as well.
+
+ -- Colin Watson <[e-mail]>  Fri, 18 Feb 2011 14:35:28 +0000
+
 utouch-frame (1.0.0-0ubuntu2) natty; urgency=low
 
   * Fixed a FTBFS due to indirect asciidoc dependencies

=== modified file 'debian/control'
--- debian/control	2011-02-07 17:47:11 +0000
+++ debian/control	2011-02-18 14:43:53 +0000
@@ -50,3 +50,16 @@
  for mtdev, frame and XI2.1.
  .
  This package provides some test tools for the frame library.
+
+Package: libutouch-frame1-udeb
+Section: debian-installer
+Architecture: any
+XC-Package-Type: udeb
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
+Description: Touch Frame Library
+ This library handles the buildup and synchronization of a set of
+ simultaneous touches. The library is input agnostic, with bindings
+ for mtdev, frame and XI2.1.
+ .
+ This is a udeb, or a microdeb, for the debian-installer.

=== added file 'debian/libutouch-frame1-udeb.install'
--- debian/libutouch-frame1-udeb.install	1970-01-01 00:00:00 +0000
+++ debian/libutouch-frame1-udeb.install	2011-02-18 14:43:53 +0000
@@ -0,0 +1,1 @@
+usr/lib/libutouch-frame.so.1*

=== modified file 'debian/rules'
--- debian/rules	2011-02-03 18:53:53 +0000
+++ debian/rules	2011-02-18 14:43:53 +0000
@@ -7,6 +7,8 @@
 
 LDFLAGS += -Wl,-z,defs -Wl,--as-needed
 
+DEB_DH_MAKESHLIBS_ARGS_libutouch-frame1 = --add-udeb=libutouch-frame1-udeb
+
 common-binary-post-install-arch::
 	find debian/tmp/usr/lib -name \*.la -exec rm {} \;
 	find debian/tmp/usr/lib -name \*.a -exec rm {} \;