On Thu, Jun 5, 2014 at 23:34:00 +0200, Stephen Kitt wrote: > Hi Julien, > > On Thu, 5 Jun 2014 22:53:34 +0200, Julien Cristau <[email protected]> wrote: > > recent versions of xf86-input-evdev require libevdev, which means we're > > going to need a libevdev2-udeb package to include in debian-installer > > builds. I can prepare a patch if needed, just let me know. > > This is new territory for me... Could you take a look at the attached patch > and see if it does the right thing? In particular I'm not sure if the > "Provides: libevdev2" is required given that the shlibs file is generated > with the added udeb line. > Nope, provides shouldn't be needed.
> diff --git a/debian/control b/debian/control
> index 6228b5b..f81451a 100644
> --- a/debian/control
> +++ b/debian/control
> @@ -45,6 +45,25 @@ Description: wrapper library for evdev devices
> This package contains the files required to run software using
> libevdev.
>
> +Package: libevdev2-udeb
> +Package-Type: udeb
> +Architecture: linux-any
> +Section: debian-installer
> +Provides:
> + libevdev2
> +Pre-Depends:
> + ${misc:Pre-Depends}
> +Depends:
> + ${misc:Depends},
> + ${shlibs:Depends}
> +Description: wrapper library for evdev devices - udeb
> + libevdev is a wrapper library for evdev devices. It provides
> + functions covering the common tasks when dealing with evdev devices,
> + thus avoiding erroneous ioctls and other errors.
> + .
> + This package contains the files required for the Debian Installer.
> + Do not install it on a normal system.
> +
You can probably skip the first paragraph of the long description, these
aren't exposed anywhere AFAIK.
> Package: libevdev-tools
> Section: utils
> Architecture: linux-any
> diff --git a/debian/libevdev2-udeb.install b/debian/libevdev2-udeb.install
> new file mode 100644
> index 0000000..3ddde58
> --- /dev/null
> +++ b/debian/libevdev2-udeb.install
> @@ -0,0 +1 @@
> +usr/lib/*/lib*.so.*
you might want to make that
usr/lib/*/lib*.so.* usr/lib
as udebs typically don't need to install to the multiarch path. Not a
big deal though, I believe it works either way.
> diff --git a/debian/rules b/debian/rules
> index d5ed1e4..eabe135 100755
> --- a/debian/rules
> +++ b/debian/rules
> @@ -21,3 +21,6 @@ override_dh_auto_configure:
>
> override_dh_gencontrol:
> dh_gencontrol -- -Vdoxygen:Version=$(doxygen_version)
> +
> +override_dh_makeshlibs:
> + dh_makeshlibs --add-udeb=libevdev2-udeb
Thanks a lot for the quick reply!
Cheers,
Julien
signature.asc
Description: Digital signature
