Package: plymouth Version: 0.8.5.1-2 Severity: normal Tags: patch pending Dear maintainer,
I've prepared an NMU for plymouth (versioned as 0.8.5.1-2.1) and will upload it to DELAYED/0 in a minute. Please find the NMU diff attached. Cheers, Julien
diff -Nru plymouth-0.8.5.1/debian/changelog plymouth-0.8.5.1/debian/changelog
--- plymouth-0.8.5.1/debian/changelog 2012-06-30 12:56:03.000000000 +0200
+++ plymouth-0.8.5.1/debian/changelog 2012-07-04 00:15:36.000000000 +0200
@@ -1,3 +1,26 @@
+plymouth (0.8.5.1-2.1) sid; urgency=low
+
+ * Non-maintainer upload.
+ * Revert multiarch change (closes: #679687). Multiarch plymouth makes no
+ sense.
+ * Use a configure option that actually exists for systemd integration
+ (closes: #679324).
+ * Fix use of --with-{boot,shutdown}-tty configure options (closes: #680124).
+ * Re-enable the libkms support. This should allow working with the squeeze
+ kernel, or with the vmwgfx driver (which doesn't do the dumb kms ioctls
+ yet).
+ * Make plymouth Recommend plymouth-drm and desktop-base. Without the former
+ the drm renderer would go away on upgrade from squeeze, and the latter
+ provides the debian themes.
+ * Stop setting the theme in /etc/plymouth/plymouthd.conf. The default
+ is already set in /usr/share/plymouth/plymouthd.defaults.
+ * Install plymouth-update-initrd to the right place so
+ plymouth-set-default-theme finds it.
+ * Copy all drm modules to the initramfs instead of just i915 and radeon.
+ * Run update-initramfs from plymouth-drm postinst in addition to plymouth's.
+
+ -- Julien Cristau <jcris...@debian.org> Wed, 04 Jul 2012 00:15:14 +0200
+
plymouth (0.8.5.1-2) unstable; urgency=low
* Switching to xz compression.
diff -Nru plymouth-0.8.5.1/debian/control plymouth-0.8.5.1/debian/control
--- plymouth-0.8.5.1/debian/control 2012-06-30 12:54:35.000000000 +0200
+++ plymouth-0.8.5.1/debian/control 2012-07-04 00:05:58.000000000 +0200
@@ -12,6 +12,9 @@
Architecture: linux-any
Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}, initramfs-tools
+Recommends:
+ plymouth-drm,
+ desktop-base,
Description: Graphical Boot Animation and Logger
Plymouth provides an attractive boot animation in place of the text messages
that normally get shown. Text messages are instead redirected to a logfile for
diff -Nru plymouth-0.8.5.1/debian/local/plymouth.hook plymouth-0.8.5.1/debian/local/plymouth.hook
--- plymouth-0.8.5.1/debian/local/plymouth.hook 2012-06-30 12:26:17.000000000 +0200
+++ plymouth-0.8.5.1/debian/local/plymouth.hook 2012-07-04 00:08:14.000000000 +0200
@@ -108,11 +108,9 @@
copy_exec /usr/lib/plymouth/renderers/frame-buffer.so
copy_exec /usr/lib/plymouth/renderers/drm.so
- # add drm/fb modules
- manual_add_modules intel-agp
- manual_add_modules ati-agp
- manual_add_modules i915
- manual_add_modules radeon
+ # add drm modules
+ copy_modules_dir kernel/drivers/gpu/drm \
+ mga r128 savage sis tdfx via
;;
esac
diff -Nru plymouth-0.8.5.1/debian/patches/03-default-theme.patch plymouth-0.8.5.1/debian/patches/03-default-theme.patch
--- plymouth-0.8.5.1/debian/patches/03-default-theme.patch 2012-06-27 16:06:31.000000000 +0200
+++ plymouth-0.8.5.1/debian/patches/03-default-theme.patch 2012-07-04 00:07:59.000000000 +0200
@@ -1,15 +1,6 @@
Author: Daniel Baumann <daniel.baum...@progress-technologies.net>
Description: Ship configuration file with default theme set (Closes: #594999).
-diff -Naurp plymouth.orig/src/plymouthd.conf plymouth/src/plymouthd.conf
---- plymouth.orig/src/plymouthd.conf 2010-06-04 18:55:14.000000000 +0200
-+++ plymouth/src/plymouthd.conf 2010-09-10 21:35:55.945741477 +0200
-@@ -1,3 +1,3 @@
- # Administrator customizations go in this file
--#[Daemon]
--#Theme=fade-in
-+[Daemon]
-+Theme=text
diff -Naurp plymouth.orig/src/plymouthd.defaults plymouth/src/plymouthd.defaults
--- plymouth.orig/src/plymouthd.defaults 2010-06-04 18:55:14.000000000 +0200
+++ plymouth/src/plymouthd.defaults 2010-09-10 21:35:05.466754551 +0200
diff -Nru plymouth-0.8.5.1/debian/plymouth-dev.install plymouth-0.8.5.1/debian/plymouth-dev.install
--- plymouth-0.8.5.1/debian/plymouth-dev.install 2012-06-30 12:27:16.000000000 +0200
+++ plymouth-0.8.5.1/debian/plymouth-dev.install 2012-07-03 20:23:44.000000000 +0200
@@ -1,16 +1,8 @@
-#!/bin/sh
-
-set -e
-
-DEB_HOST_MULTIARCH="$(dpkg-architecture -qDEB_HOST_MULTIARCH)"
-
-cat << EOF
-lib/${DEB_HOST_MULTIARCH}/*.a
-lib/${DEB_HOST_MULTIARCH}/*.so
+lib/*.a
+lib/*.so
usr/include
-usr/lib/${DEB_HOST_MULTIARCH}/*.a
-usr/lib/${DEB_HOST_MULTIARCH}/*.so
-usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig
-usr/lib/${DEB_HOST_MULTIARCH}/plymouth/*.a
-usr/lib/${DEB_HOST_MULTIARCH}/plymouth/*/*.a
-EOF
+usr/lib/*.a
+usr/lib/*.so
+usr/lib/pkgconfig
+usr/lib/plymouth/*.a
+usr/lib/plymouth/*/*.a
diff -Nru plymouth-0.8.5.1/debian/plymouth-drm.install plymouth-0.8.5.1/debian/plymouth-drm.install
--- plymouth-0.8.5.1/debian/plymouth-drm.install 2012-06-30 12:27:16.000000000 +0200
+++ plymouth-0.8.5.1/debian/plymouth-drm.install 2012-07-03 20:23:59.000000000 +0200
@@ -1,17 +1,9 @@
-#!/bin/sh
-
-set -e
-
-DEB_HOST_MULTIARCH="$(dpkg-architecture -qDEB_HOST_MULTIARCH)"
-
-cat << EOF
-usr/lib/${DEB_HOST_MULTIARCH}/libply-splash-graphics.so.*
-usr/lib/${DEB_HOST_MULTIARCH}/plymouth/fade-throbber.so
-usr/lib/${DEB_HOST_MULTIARCH}/plymouth/label.so
-usr/lib/${DEB_HOST_MULTIARCH}/plymouth/script.so
-usr/lib/${DEB_HOST_MULTIARCH}/plymouth/space-flares.so
-usr/lib/${DEB_HOST_MULTIARCH}/plymouth/throbgress.so
-usr/lib/${DEB_HOST_MULTIARCH}/plymouth/two-step.so
-usr/lib/${DEB_HOST_MULTIARCH}/plymouth/renderers/drm.so
-usr/lib/${DEB_HOST_MULTIARCH}/plymouth/renderers/frame-buffer.so
-EOF
+usr/lib/libply-splash-graphics.so.*
+usr/lib/plymouth/fade-throbber.so
+usr/lib/plymouth/label.so
+usr/lib/plymouth/script.so
+usr/lib/plymouth/space-flares.so
+usr/lib/plymouth/throbgress.so
+usr/lib/plymouth/two-step.so
+usr/lib/plymouth/renderers/drm.so
+usr/lib/plymouth/renderers/frame-buffer.so
diff -Nru plymouth-0.8.5.1/debian/plymouth-drm.postinst plymouth-0.8.5.1/debian/plymouth-drm.postinst
--- plymouth-0.8.5.1/debian/plymouth-drm.postinst 1970-01-01 01:00:00.000000000 +0100
+++ plymouth-0.8.5.1/debian/plymouth-drm.postinst 2012-07-04 00:12:10.000000000 +0200
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+set -e
+
+case "${1}" in
+ configure)
+ if [ -x /usr/sbin/update-initramfs ]
+ then
+ update-initramfs -u
+ fi
+ ;;
+
+ abort-upgrade|abort-remove|abort-deconfigure)
+
+ ;;
+
+ *)
+ echo "postinst called with unknown argument \`${1}'" >&2
+ exit 1
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
diff -Nru plymouth-0.8.5.1/debian/plymouth-x11.install plymouth-0.8.5.1/debian/plymouth-x11.install
--- plymouth-0.8.5.1/debian/plymouth-x11.install 2012-06-30 12:27:16.000000000 +0200
+++ plymouth-0.8.5.1/debian/plymouth-x11.install 2012-07-03 20:24:12.000000000 +0200
@@ -1,11 +1,3 @@
-#!/bin/sh
-
-set -e
-
-DEB_HOST_MULTIARCH="$(dpkg-architecture -qDEB_HOST_MULTIARCH)"
-
-cat << EOF
usr/bin/plymouth-log-viewer
-usr/lib/${DEB_HOST_MULTIARCH}/plymouth/renderers/x11.so
+usr/lib/plymouth/renderers/x11.so
usr/share/gdm
-EOF
diff -Nru plymouth-0.8.5.1/debian/plymouth.install plymouth-0.8.5.1/debian/plymouth.install
--- plymouth-0.8.5.1/debian/plymouth.install 2012-06-30 12:27:16.000000000 +0200
+++ plymouth-0.8.5.1/debian/plymouth.install 2012-07-03 22:44:46.000000000 +0200
@@ -1,21 +1,14 @@
-#!/bin/sh
-
-set -e
-
-DEB_HOST_MULTIARCH="$(dpkg-architecture -qDEB_HOST_MULTIARCH)"
-
-cat << EOF
bin
etc/plymouth
-lib/${DEB_HOST_MULTIARCH}/*.so.*
+lib/*.so.*
+lib/systemd
sbin
-usr/lib/${DEB_HOST_MULTIARCH}/libply-boot-client.so.*
-usr/lib/${DEB_HOST_MULTIARCH}/plymouth/details.so
-usr/lib/${DEB_HOST_MULTIARCH}/plymouth/text.so
-usr/lib/${DEB_HOST_MULTIARCH}/plymouth/*-initrd
+usr/lib/libply-boot-client.so.*
+usr/lib/plymouth/details.so
+usr/lib/plymouth/text.so
+usr/lib/plymouth/*-initrd
usr/sbin
usr/share/man/man8/plymouth.8
usr/share/plymouth/plymouthd.defaults
usr/share/plymouth/themes/text
usr/share/plymouth/themes/details
-EOF
diff -Nru plymouth-0.8.5.1/debian/rules plymouth-0.8.5.1/debian/rules
--- plymouth-0.8.5.1/debian/rules 2012-06-30 12:54:35.000000000 +0200
+++ plymouth-0.8.5.1/debian/rules 2012-07-04 00:08:14.000000000 +0200
@@ -16,7 +16,10 @@
dh_auto_configure -- \
--prefix=/usr --localstatedir=/var \
- --enable-pango --enable-systemd --enable-tracing \
+ --libdir=/usr/lib --libexecdir=/usr/lib \
+ --enable-pango --enable-systemd-integration \
+ --enable-tracing \
+ --enable-libkms \
--disable-gdm-transition --disable-tests \
--with-background-color=0x005a8a \
--with-gdm-autostart-file \
@@ -25,25 +28,18 @@
--with-release-file=/etc/os-release \
--with-system-root-install \
--without-rhgb-compat-link \
- --with-boot-tty=tty7 \
- --with-shutdown-tty=tty7
+ --with-boot-tty=/dev/tty7 \
+ --with-shutdown-tty=/dev/tty7
override_dh_builddeb:
dh_builddeb -- -Zxz -z9
-override_dh_gencontrol:
-ifeq ($(DEB_HOST_MULTIARCH),)
- dh_gencontrol
-else
- dh_gencontrol -- -Vmisc:Pre-Depends="multiarch-support"
-endif
-
override_dh_install:
# Removing useless files
- rm -f debian/tmp/lib/$(DEB_HOST_MULTIARCH)/*.la
- rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la
- rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/plymouth/*.la
- rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/plymouth/*/*.la
+ rm -f debian/tmp/lib/*.la
+ rm -f debian/tmp/usr/lib/*.la
+ rm -f debian/tmp/usr/lib/plymouth/*.la
+ rm -f debian/tmp/usr/lib/plymouth/*/*.la
dh_install --fail-missing
@@ -55,7 +51,7 @@
# Adding other debian specific files
install -D -m 0644 debian/local/debian-logo.png debian/plymouth/usr/share/plymouth/debian-logo.png
- install -D -m 0755 debian/local/plymouth-update-initrd debian/plymouth/usr/lib/plymouth/plymouth/plymouth-update-initrd
+ install -D -m 0755 debian/local/plymouth-update-initrd debian/plymouth/usr/lib/plymouth/plymouth-update-initrd
override_dh_installinit:
dh_installinit --no-start -- start 21 2 3 4 5 . stop 02 0 6 .
signature.asc
Description: Digital signature
