Browse Source

Imported Debian patch 0.8.3-9

tags/debian/0.8.3-9^0
Daniel Baumann Laurent Bigonville 11 years ago
parent
commit
362fe89fc3
7 changed files with 78 additions and 39 deletions
  1. +18
    -1
      debian/changelog
  2. +2
    -4
      debian/control
  3. +36
    -26
      debian/local/plymouth.hook
  4. +21
    -0
      debian/patches/05-default-theme.patch
  5. +1
    -0
      debian/patches/series
  6. +0
    -2
      debian/plymouth.README.Debian
  7. +0
    -6
      debian/plymouth.postinst

+ 18
- 1
debian/changelog View File

@@ -1,7 +1,24 @@
plymouth (0.8.3-9) unstable; urgency=high

* Removing superfluous reference to intel_agp and drm in
README.Debian, thanks to Julien Cristau <jcristau@debian.org>.
* Shipping preconfigured plymouthd.conf instead of setting the default
theme in postinst which doesn't work reliable (Closes: #594999).
* Correcting typo in fontconfig-config package name in previous
changelog entry.
* Avoid kms bloat if text theme is used (the text theme only works in
non-kms mode anyway).
* Also setting default plugin to text in plymouthd.defaults.
* Downgrading fontconfig-config and ttf-dejavu-core depends to
recommends, they are not needed when running the default text
plugin.

-- Daniel Baumann <daniel@debian.org> Fri, 10 Sep 2010 22:06:46 +0200

plymouth (0.8.3-8) unstable; urgency=low

[ Anisse Astier ]
* Adding fontconfig-fontconfig to depends.
* Adding fontconfig-config to depends.

[ Daniel Baumann ]
* Updating postinst script to deal with not just with empty but also


+ 2
- 4
debian/control View File

@@ -13,10 +13,8 @@ Vcs-Git: git://git.debian-maintainers.org/git/daniel/plymouth.git

Package: plymouth
Architecture: amd64 i386
Depends:
${misc:Depends}, ${shlibs:Depends}, fontconfig-config, initramfs-tools,
ttf-dejavu-core
Recommends: plymouth-themes-all
Depends: ${misc:Depends}, ${shlibs:Depends}, initramfs-tools
Recommends: plymouth-themes-all, fontconfig-config, ttf-dejavu-core
Suggests: gdm
Description: Graphical Boot Animation and Logger
Plymouth provides an attractive graphical boot animation in place of the text


+ 36
- 26
debian/local/plymouth.hook View File

@@ -20,6 +20,7 @@ esac

THEME="$(/usr/sbin/plymouth-set-default-theme || true)"
THEMES="/usr/share/plymouth/themes"

if [ -n "${THEME}" ]
then
THEME="${THEMES}/${THEME}/${THEME}.plymouth"
@@ -54,22 +55,41 @@ done
cp -a "${THEMES}/details" "${DESTDIR}/${THEMES}"
cp -a "${THEMES}/text" "${DESTDIR}/${THEMES}"
cp /etc/debian_version "${DESTDIR}/etc"
cp /usr/share/plymouth/debian-logo.png "${DESTDIR}/usr/share/plymouth"

# copy files for font rendering
mkdir -p "${DESTDIR}/usr/share/fonts/truetype/ttf-dejavu"
mkdir -p "${DESTDIR}/usr/lib/pango/1.6.0/modules"
mkdir -p "${DESTDIR}/etc/fonts/conf.d"
mkdir -p "${DESTDIR}/var/cache/fontconfig"
cp -a /usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif.ttf "${DESTDIR}/usr/share/fonts/truetype/ttf-dejavu"
cp -a /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf "${DESTDIR}/usr/share/fonts/truetype/ttf-dejavu"
cp -a /etc/fonts/fonts.conf "${DESTDIR}/etc/fonts"
cp -rL /etc/fonts/conf.d/60-latin.conf "${DESTDIR}/etc/fonts/conf.d"
copy_exec /usr/lib/pango/1.6.0/modules/pango-basic-fc.so
copy_exec /usr/lib/pango/1.6.0/module-files.d/libpango1.0-0.modules
copy_exec /usr/lib/libpango-1.0.so.0
copy_exec /usr/lib/libpangoft2-1.0.so.0
copy_exec /usr/lib/libpangocairo-1.0.so.0

case "${THEME}" in
text)

;;

*)
cp /usr/share/plymouth/debian-logo.png "${DESTDIR}/usr/share/plymouth"

# copy files for font rendering
mkdir -p "${DESTDIR}/usr/share/fonts/truetype/ttf-dejavu"
mkdir -p "${DESTDIR}/usr/lib/pango/1.6.0/modules"
mkdir -p "${DESTDIR}/etc/fonts/conf.d"
mkdir -p "${DESTDIR}/var/cache/fontconfig"
cp -a /usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif.ttf "${DESTDIR}/usr/share/fonts/truetype/ttf-dejavu"
cp -a /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf "${DESTDIR}/usr/share/fonts/truetype/ttf-dejavu"
cp -a /etc/fonts/fonts.conf "${DESTDIR}/etc/fonts"
cp -rL /etc/fonts/conf.d/60-latin.conf "${DESTDIR}/etc/fonts/conf.d"
copy_exec /usr/lib/pango/1.6.0/modules/pango-basic-fc.so
copy_exec /usr/lib/pango/1.6.0/module-files.d/libpango1.0-0.modules
copy_exec /usr/lib/libpango-1.0.so.0
copy_exec /usr/lib/libpangoft2-1.0.so.0
copy_exec /usr/lib/libpangocairo-1.0.so.0

# copy renderers
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
;;
esac

# copy config files
mkdir -p "${DESTDIR}/etc/plymouth"
@@ -80,13 +100,3 @@ then
fi

cp -a /usr/share/plymouth/plymouthd.defaults "${DESTDIR}/usr/share/plymouth/"

# copy renderers
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

+ 21
- 0
debian/patches/05-default-theme.patch View File

@@ -0,0 +1,21 @@
Author: Daniel Baumann <daniel@debian.org>
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
@@ -1,4 +1,4 @@
# Distribution defaults. Changes to this file will get overwritten during
# upgrades.
[Daemon]
-Theme=fade-in
+Theme=text

+ 1
- 0
debian/patches/series View File

@@ -2,3 +2,4 @@
02-set-default-framebuffer-device-to-dev-fb0.patch
03-awk.patch
04-stderr.patch
05-default-theme.patch

+ 0
- 2
debian/plymouth.README.Debian View File

@@ -10,8 +10,6 @@ The following steps are required in order to enable the plymouth bootsplash:
system, add the following lines to /etc/initramfs-tools/modules:

# for KMS with Intel graphic cards
intel_agp
drm
i915 modeset=1

# for KMS with AMD (ATI) graphic cards


+ 0
- 6
debian/plymouth.postinst View File

@@ -4,12 +4,6 @@ set -e

case "${1}" in
configure)
case "$(plymouth-set-default-theme || true)" in
.plymouth|"")
plymouth-set-default-theme text
;;
esac

if [ -x /usr/sbin/update-initramfs ]
then
update-initramfs -u


Loading…
Cancel
Save