Browse Source

Imported Debian patch 0.8.3-10

tags/debian/0.8.3-10^0
Daniel Baumann Laurent Bigonville 11 years ago
parent
commit
a559e66d9f
9 changed files with 90 additions and 63 deletions
  1. +7
    -14
      debian/changelog
  2. +56
    -38
      debian/control
  3. +12
    -2
      debian/local/plymouth.hook
  4. +9
    -0
      debian/plymouth-drm.install
  5. +1
    -0
      debian/plymouth-x11.install
  6. +0
    -2
      debian/plymouth.init
  7. +3
    -5
      debian/plymouth.install
  8. +1
    -0
      debian/rules
  9. +1
    -2
      src/libply-splash-core/ply-terminal.c

+ 7
- 14
debian/changelog View File

@@ -1,19 +1,12 @@
plymouth (0.8.3-9.2) squeeze; urgency=low
plymouth (0.8.3-10) experimental; urgency=low

* Fix the init script to not do anything if the plymouth package is removed
(closes: #617857).
* Making pango build-depends unversioned, not needed anymore.
* Splitting out kms stuff into plymouth-drm, this allows to have the
plymouth package containing everything for the text splash without
any depends other than libc6 and initramfs-tools.
* Correcting conditionals for text theme in initramfs hook.

-- Julien Cristau <jcristau@debian.org> Wed, 04 Jul 2012 20:51:56 +0200

plymouth (0.8.3-9.1) testing; urgency=low

* Non-maintainer upload.
* Cherry-pick "[terminal] don't stomp over original tty lock settings".
Prevents setting tty1 in 'echo' mode after boot (closes: 595178).
* Set myself as maintainer for squeeze, Daniel doesn't want to support this
package there.

-- Julien Cristau <jcristau@debian.org> Wed, 13 Oct 2010 17:20:32 +0200
-- Daniel Baumann <daniel@debian.org> Sat, 11 Sep 2010 00:01:15 +0200

plymouth (0.8.3-9) unstable; urgency=high



+ 56
- 38
debian/control View File

@@ -1,10 +1,11 @@
Source: plymouth
Section: misc
Priority: optional
Maintainer: Julien Cristau <jcristau@debian.org>
Maintainer: Daniel Baumann <daniel@lists.debian-maintainers.org>
Uploaders: Daniel Baumann <daniel@debian.org>
Build-Depends:
debhelper (>= 7.0.50~), autotools-dev, libdrm-dev, libgtk2.0-dev,
libpango1.0-dev (>= 1.21), libpng-dev, pkg-config, sharutils, quilt (>= 0.46-7)
libpango1.0-dev, libpng-dev, pkg-config, sharutils, quilt (>= 0.46-7)
Standards-Version: 3.9.1
Homepage: http://www.freedesktop.org/wiki/Software/Plymouth
Vcs-Browser: http://git.debian-maintainers.org/?p=daniel/plymouth.git
@@ -13,31 +14,48 @@ Vcs-Git: git://git.debian-maintainers.org/git/daniel/plymouth.git
Package: plymouth
Architecture: amd64 i386
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
messages that normally get shown. Text messages are instead redirected to a log
file for viewing after boot.
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
viewing after boot.

Package: plymouth-drm
Architecture: amd64 i386
Depends:
${misc:Depends}, ${shlibs:Depends}, plymouth (= ${binary:Version}),
plymouth-theme | plymouth-themes-fade-in (= ${binary:Version}),
fontconfig-config, ttf-dejavu-core
Conflicts: plymouth (<< 0.8.3-10)
Replaces: plymouth
Recommends: plymouth-themes-all
Description: Graphical Boot Animation and Logger (DRM)
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
viewing after boot.
.
This package contains the DRM backend for systems supporting Kernel Mode
Setting (KMS).

Package: plymouth-x11
Architecture: amd64 i386
Depends: ${misc:Depends}, ${shlibs:Depends}, plymouth (= ${binary:Version})
Depends: ${misc:Depends}, ${shlibs:Depends}, plymouth-drm (= ${binary:Version})
Suggests: gdm
Description: Graphical Boot Animation and Logger
Plymouth provides an attractive graphical boot animation in place of the text
messages that normally get shown. Text messages are instead redirected to a log
file for viewing after boot.
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
viewing after boot.
.
This package contains the x11 renderer and the log viewer.

Package: plymouth-dev
Architecture: amd64 i386
Depends: ${misc:Depends}, plymouth (= ${binary:Version})
Depends:
${misc:Depends}, plymouth (= ${binary:Version}),
plymouth-drm (= ${binary:Version}), plymouth-x11 (= ${binary:Version})
Description: Graphical Boot Animation and Logger (development)
Plymouth provides an attractive graphical boot animation in place of the text
messages that normally get shown. Text messages are instead redirected to a log
file for viewing after boot.
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
viewing after boot.
.
This package contains the development files.

@@ -47,67 +65,67 @@ Depends:
${misc:Depends}, plymouth-themes-fade-in, plymouth-themes-glow,
plymouth-themes-script, plymouth-themes-solar, plymouth-themes-spinfinity
Description: Graphical Boot Animation and Logger (themes metapackage)
Plymouth provides an attractive graphical boot animation in place of the text
messages that normally get shown. Text messages are instead redirected to a log
file for viewing after boot.
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
viewing after boot.
.
This package is a metapackage depending on all available themes.

Package: plymouth-themes-fade-in
Architecture: all
Depends: ${misc:Depends}, plymouth (>= ${source:Version})
Depends: ${misc:Depends}
Provides: plymouth-theme
Description: Graphical Boot Animation and Logger (fade-in theme)
Plymouth provides an attractive graphical boot animation in place of the text
messages that normally get shown. Text messages are instead redirected to a log
file for viewing after boot.
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
viewing after boot.
.
This package contains the fade-in theme. It features a centered logo that
fades in and out while stars twinkle around the logo during system boot up.

Package: plymouth-themes-glow
Architecture: all
Depends: ${misc:Depends}, plymouth (>= ${source:Version})
Depends: ${misc:Depends}
Provides: plymouth-theme
Description: Graphical Boot Animation and Logger (glow theme)
Plymouth provides an attractive graphical boot animation in place of the text
messages that normally get shown. Text messages are instead redirected to a log
file for viewing after boot.
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
viewing after boot.
.
This package contains the glow theme. It features a pie chart as progress
indicator.

Package: plymouth-themes-script
Architecture: all
Depends: ${misc:Depends}, plymouth (>= ${source:Version})
Depends: ${misc:Depends}
Provides: plymouth-theme
Description: Graphical Boot Animation and Logger (script theme)
Plymouth provides an attractive graphical boot animation in place of the text
messages that normally get shown. Text messages are instead redirected to a log
file for viewing after boot.
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
viewing after boot.
.
This package contains the script theme. It features a simple base theme.

Package: plymouth-themes-solar
Architecture: all
Depends: ${misc:Depends}, plymouth (>= ${source:Version})
Depends: ${misc:Depends}
Provides: plymouth-theme
Description: Graphical Boot Animation and Logger (solar theme)
Plymouth provides an attractive graphical boot animation in place of the text
messages that normally get shown. Text messages are instead redirected to a log
file for viewing after boot.
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
viewing after boot.
.
This package contains the solar theme. It features a blue flamed sun with
animated solar flares.

Package: plymouth-themes-spinfinity
Architecture: all
Depends: ${misc:Depends}, plymouth (>= ${source:Version})
Depends: ${misc:Depends}
Provides: plymouth-theme
Description: Graphical Boot Animation and Logger (spinfinity theme)
Plymouth provides an attractive graphical boot animation in place of the text
messages that normally get shown. Text messages are instead redirected to a log
file for viewing after boot.
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
viewing after boot.
.
This package contains the spinfinity theme. It features a centered logo and
animated spinner that spins in the shape of an infinity sign.

+ 12
- 2
debian/local/plymouth.hook View File

@@ -29,7 +29,17 @@ else
fi

PLUGIN_PATH="$(plymouth --get-splash-plugin-path)"
PLUGINS="details.so text.so label.so"

case "$(basename ${THEME} .plymouth)" in
text)
PLUGINS="details.so text.so"
;;

*)
PLUGINS="details.so text.so label.so"
;;
esac

MODULE="${PLUGIN_PATH}/$(sed -n 's/^ModuleName=\(.*\)/\1/p' ${THEME}).so"

# copy plugin and images for current theme
@@ -56,7 +66,7 @@ cp -a "${THEMES}/details" "${DESTDIR}/${THEMES}"
cp -a "${THEMES}/text" "${DESTDIR}/${THEMES}"
cp /etc/debian_version "${DESTDIR}/etc"

case "${THEME}" in
case "$(basename ${THEME} .plymouth)" in
text)

;;


+ 9
- 0
debian/plymouth-drm.install View File

@@ -0,0 +1,9 @@
/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

+ 1
- 0
debian/plymouth-x11.install View File

@@ -1,2 +1,3 @@
/usr/bin/plymouth-log-viewer
/usr/lib/plymouth/renderers/x11.so
/usr/share/gdm

+ 0
- 2
debian/plymouth.init View File

@@ -16,8 +16,6 @@ NAME="plymouth"
DESC="Boot splash manager"
SPLASH="false"

test -x /sbin/plymouthd || exit 0

if [ -r "/etc/default/${NAME}" ]
then
. "/etc/default/${NAME}"


+ 3
- 5
debian/plymouth.install View File

@@ -2,13 +2,11 @@
/etc/plymouth
/lib/*.so.*
/sbin
/usr/lib/*.so.*
/usr/lib/plymouth/*.so
/usr/lib/libply-boot-client.so.*
/usr/lib/plymouth/details.so
/usr/lib/plymouth/text.so
/usr/lib/plymouth/plymouth/*-initrd
/usr/lib/plymouth/renderers/drm.so
/usr/lib/plymouth/renderers/frame-buffer.so
/usr/sbin
/usr/share/gdm
/usr/share/man/man8/plymouth.8
/usr/share/plymouth/plymouthd.defaults
/usr/share/plymouth/themes/text


+ 1
- 0
debian/rules View File

@@ -40,6 +40,7 @@ override_dh_install:

override_dh_makeshlibs:
dh_makeshlibs -p plymouth
dh_makeshlibs -p plymouth-drm

override_dh_installinit:
dh_installinit --no-start -- start 21 2 3 4 5 . stop 02 0 6 .

+ 1
- 2
src/libply-splash-core/ply-terminal.c View File

@@ -188,8 +188,7 @@ ply_terminal_set_unbuffered_input (ply_terminal_t *terminal)
if (tcsetattr (terminal->fd, TCSANOW, &term_attributes) != 0)
return false;

if (!terminal->original_locked_term_attributes_saved &&
ioctl (terminal->fd, TIOCGLCKTRMIOS, &locked_term_attributes) == 0)
if (ioctl (terminal->fd, TIOCGLCKTRMIOS, &locked_term_attributes) == 0)
{
terminal->original_locked_term_attributes = locked_term_attributes;
terminal->original_locked_term_attributes_saved = true;


Loading…
Cancel
Save