--- splashy-0.3.13.orig/configure +++ splashy-0.3.13/configure @@ -22001,9 +22001,9 @@ # All warnings are errors. # when in --enable-debug mode, we need to enable assert in glib... if test x$enable_debug = x1; then - CFLAGS="$CFLAGS -Wall -Werror" + CFLAGS="$CFLAGS -Wall" else - CFLAGS="$CFLAGS -Wall -Werror -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS" + CFLAGS="$CFLAGS -Wall -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS" fi # we used to compile splashy statically --- splashy-0.3.13.orig/configure.ac +++ splashy-0.3.13/configure.ac @@ -48,9 +48,9 @@ # All warnings are errors. # when in --enable-debug mode, we need to enable assert in glib... if test x$enable_debug = x1; then - CFLAGS="$CFLAGS -Wall -Werror" + CFLAGS="$CFLAGS -Wall" else - CFLAGS="$CFLAGS -Wall -Werror -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS" + CFLAGS="$CFLAGS -Wall -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS" fi # we used to compile splashy statically --- splashy-0.3.13.orig/debian/splashy.postinst +++ splashy-0.3.13/debian/splashy.postinst @@ -0,0 +1,36 @@ +#!/bin/sh + +set -e + +case "$1" in + configure) + if dpkg --compare-versions "$2" lt "0.3.12-1"; then + sed -i "s|/etc/splashy/themes|/usr/share/splashy/themes|" /etc/splashy/config.xml + fi + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +if [ -x "/etc/init.d/splashy" ]; then + # This is needed to put the splashy links in the new location + # if they exist already + update-rc.d -f splashy remove > /dev/null + update-rc.d splashy start 03 S . stop 02 6 0 . > /dev/null +fi + +[ -r /etc/default/splashy ] && . /etc/default/splashy + +if [ "x$ENABLE_INITRAMFS" = "x1" ]; then + update-initramfs -u; +fi + +#DEBHELPER# + +exit 0 --- splashy-0.3.13.orig/debian/splashy.prerm +++ splashy-0.3.13/debian/splashy.prerm @@ -0,0 +1,12 @@ +#!/bin/sh + +set -e + +# removes theme legacy old directory +if [ -e /etc/splashy/themes.old ]; then + rm -fr /etc/splashy/themes.old +fi + +#DEBHELPER# + +exit 0 --- splashy-0.3.13.orig/debian/compat +++ splashy-0.3.13/debian/compat @@ -0,0 +1 @@ +5 --- splashy-0.3.13.orig/debian/splashy.README.Debian +++ splashy-0.3.13/debian/splashy.README.Debian @@ -0,0 +1,26 @@ +Splashy: +--------------------------------------------------------------------------------------- +A complete user-space boot splash system + +A boot splash program that doesn't require patching the Linux kernel. +It paints graphic images directly to framebuffers using libdirectfb. + +You can enable splashy by adding splash to the kernel's command line. +See your bootmanagers configuration file (/boot/grub/menu.lst, /etc/lilo.conf). + +Ubuntu: + +If you are going to install Splashy on Ubuntu Dapper / Breezy you should +REMOVE ubuntu-desktop and usplash. + +For more info and known issues see: +--------------------------------------------------------------------------------------- + /usr/share/doc/splashy/README.gz + +and + + http://splashy.alioth.debian.org + +and the FAQ + + http://splashy.alioth.debian.org/wiki/faq --- splashy-0.3.13.orig/debian/libsplashy1.install +++ splashy-0.3.13/debian/libsplashy1.install @@ -0,0 +1 @@ +lib/libsplashy*.so.* --- splashy-0.3.13.orig/debian/splashy.manpages +++ splashy-0.3.13/debian/splashy.manpages @@ -0,0 +1,5 @@ +debian/tmp/usr/share/man/man1/splashy.1 +debian/tmp/usr/share/man/man1/splashy_config.1 +debian/tmp/usr/share/man/man5/splashy-config.xml.5 +debian/tmp/usr/share/man/man5/splashy-theme.xml.5 +debian/tmp/usr/share/man/man1/splashy_update.1 --- splashy-0.3.13.orig/debian/rules +++ splashy-0.3.13/debian/rules @@ -0,0 +1,37 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk + +DEB_CONFIGURE_EXTRA_FLAGS := --prefix= --libdir=/lib --sbindir=/sbin --sysconfdir=/etc \ + --includedir=/usr/include --datarootdir=/usr/share --mandir=/usr/share/man +DEB_DH_SHLIBDEPS_ARGS := -L libsplashy1 -l debian/libsplashy1/lib +DEB_DH_INSTALL_ARGS := --sourcedir=debian/tmp + +binary-predeb/splashy:: + chmod 0755 \ + debian/splashy/usr/share/initramfs-tools/hooks/splashy \ + debian/splashy/usr/share/initramfs-tools/hooks/libsplashy \ + debian/splashy/usr/share/initramfs-tools/scripts/init-bottom/splashy \ + debian/splashy/usr/share/initramfs-tools/scripts/local-premount/splashy \ + debian/splashy/usr/share/initramfs-tools/scripts/local-premount/libsplashy \ + debian/splashy/etc/console-tools/config.d/splashy + chrpath -d $(CURDIR)/debian/splashy/sbin/splashy + +make-snapshot: + if ! dpkg-parsechangelog | grep -q 'Distribution: UNRELEASED'; then \ + echo 'Current release is not a unreleased version. Aborting...'; \ + exit 1; \ + elif dpkg-parsechangelog | grep -q 'Version:' | grep ~svn; then \ + echo 'Your last release is already a development snapshot, edit' \ + echo 'your changelog and remove that entry before continue'; \ + exit 1; \ + elif [ -d $(CURDIR)/.git ]; then \ + REV=$(shell LC_ALL=C git log HEAD^..HEAD | grep svn.debian.org | sed 's,.*@\(.*\) .*,\1,g'); \ + elif [ -d $(CURDIR)/.svn ]; then \ + REV=$(shell LC_ALL=C svn info | grep Revision | sed 's,.*\: \(.*\),\1,g'); \ + fi; \ + dch -b -v $(shell dpkg-parsechangelog | grep Version | sed 's,.*\: \(.*\),\1,g')~svn.$$REV \ + 'New development snapshot.'; \ + debian/rules binary --- splashy-0.3.13.orig/debian/splashy.preinst +++ splashy-0.3.13/debian/splashy.preinst @@ -0,0 +1,33 @@ +#!/bin/sh + +set -e + +# There was a bug in 0.2.x, it didn't remove /lib/splashy in postrm +if [ -d /lib/splashy ]; then + rm -fr /lib/splashy +fi + +# Remove splashy-init if it is still here. It's a file from the 0.1.8 era +if [ -f /etc/init.d/splashy-init ]; then + rm -f /etc/init.d/splashy-init + update-rc.d -f splashy-init remove >/dev/null +fi + +# /etc/splashy/themes is the old path for this directory +# We don't want to mess with whatever themes were here already. +# Just move them out of harms way: +if [ -d /etc/splashy ]; then + if [ -e /etc/splashy/themes ] && [ ! -L /etc/splashy/themes ]; then + if [ -e /etc/splashy/themes.old ]; then + echo + echo "/etc/splashy/themes.old already exist, please remove this directory or file" + echo + exit 1 + fi + mv /etc/splashy/themes /etc/splashy/themes.old + echo "Warning: Old themes directory moved to /etc/splashy/themes.old" + fi +fi +#DEBHELPER# + +exit 0 --- splashy-0.3.13.orig/debian/splashy-themes.install +++ splashy-0.3.13/debian/splashy-themes.install @@ -0,0 +1,6 @@ +debian/tmp/etc/splashy/themes/debian3/ etc/splashy/themes/ +debian/tmp/etc/splashy/themes/debian4/ etc/splashy/themes/ +debian/tmp/etc/splashy/themes/ubuntusplashy/ etc/splashy/themes/ +debian/tmp/etc/splashy/themes/debiansplashy/ etc/splashy/themes/ +debian/tmp/etc/splashy/themes/kubuntusplashy/ etc/splashy/themes/ +debian/tmp/etc/splashy/themes/crux/ etc/splashy/themes/ --- splashy-0.3.13.orig/debian/splashy.links +++ splashy-0.3.13/debian/splashy.links @@ -0,0 +1,3 @@ +usr/share/man/man1/splashy.1 usr/share/man/man1/splashy_chvt.1 +etc/console-tools/config.d/splashy etc/kbd/config.d/splashy +usr/share/splashy/themes etc/splashy/themes --- splashy-0.3.13.orig/debian/splashy.install +++ splashy-0.3.13/debian/splashy.install @@ -0,0 +1,11 @@ +sbin/* +etc/splashy/* +etc/lsb-base-logging.sh +etc/init.d/splashy +etc/default/splashy +etc/console-tools/config.d/splashy +usr/share/splashy/schemas +usr/share/splashy/themes +usr/share/locale/* +# initramfs support +usr/share/initramfs-tools/* --- splashy-0.3.13.orig/debian/control +++ splashy-0.3.13/debian/control @@ -0,0 +1,57 @@ +Source: splashy +Section: graphics +Priority: optional +Maintainer: Splashy Devel +Uploaders: Otavio Salvador , Luis Mondesi , Tim Dijkstra , Fathi Boudra +Homepage: http://splashy.alioth.debian.org/ +# Reasons of build-dependencies: +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# - libdirectfb-dev (>= 1.0.1-9) - due the need of static library and 92_reopen_console.patch +# included on that specific version +# - libglib2.0-dev (>> 2.0.1-2) - due the need of static library +# - perl - pod2man used to generate man pages +# - libmagic-dev - needed to detect mimetypes +# - chrpath - for removing the rpath defined in /sbin/splashy +# +Build-Depends: cdbs (>= 0.4.23-1.1), quilt, autotools-dev, debhelper (>= 5), + libdirectfb-dev (>= 1.0.1-9), libglib2.0-dev (>> 2.0.1-2), libtool, perl, + libmagic-dev, chrpath +Standards-Version: 3.8.1 +XS-Vcs-Git: git://git.debian.org/git/splashy/debian/splashy.git +XS-Vcs-Browser: http://git.debian.org/?p=splashy/debian/splashy.git;a=summary + +# console-common is needed to not run keymap.sh on Debian earlier than Sid +Package: splashy +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base, initramfs-tools +Provides: bootsplash +Replaces: debsplash-utils, bootsplash, usplash +Conflicts: debsplash-utils, bootsplash, usplash, console-common (<= 0.7.76), desktop-base (<< 5.0.2) +Suggests: splashy-themes, upstart, console-common (>= 0.7.77) +Description: A complete user-space boot splash system + A boot splash program that doesn't require patching the Linux kernel. + It paints graphic images directly to framebuffers using libdirectfb. + +# Package: splashy-themes +# Architecture: all +# Depends: ${shlibs:Depends}, splashy +# Description: A complete user-space boot splash system +# This package contains extra themes to be used with splashy. + +Package: libsplashy1 +Architecture: any +Section: libs +Depends: ${shlibs:Depends}, ${misc:Depends}, libdirectfb-extra +Description: Library to draw splash screen on boot, shutdown, resume or suspend + A boot splash library that doesn't require patching the Linux kernel. + +Package: libsplashy1-dev +Architecture: any +Section: libdevel +Provides: libsplashy-dev +Conflicts: libsplashy-dev +Depends: ${shlibs:Depends}, ${misc:Depends}, libsplashy1 (= ${binary:Version}), + libglib2.0-dev, libdirectfb-dev +Description: Library to draw splash screen on boot, shutdown, resume or suspend + A boot splash library that doesn't require patching the Linux kernel. --- splashy-0.3.13.orig/debian/libsplashy1-dev.install +++ splashy-0.3.13/debian/libsplashy1-dev.install @@ -0,0 +1,3 @@ +lib/libsplashy*.so +lib/libsplashy*.la +usr/include/* --- splashy-0.3.13.orig/debian/splashy.postrm +++ splashy-0.3.13/debian/splashy.postrm @@ -0,0 +1,27 @@ +#!/bin/sh + +set -e + +# until we have a debconf question, we won't do this: +# for file in /boot/grub/menu.lst /boot/boot/grub/menu.lst; do +# if [ -f $file ] +# then +# cp $file $file.old +# sed -e '/^\# nonaltoptions/s/ vga=... //g' $file.old > $file +# update-grub +# fi +# done + +if [ "$1" = "purge" ] ; then + update-rc.d splashy remove >/dev/null || exit $? +fi + +[ -r /etc/default/splashy ] && . /etc/default/splashy + +if [ "x$ENABLE_INITRAMFS" = "x1" ]; then + update-initramfs -u; +fi + +#DEBHELPER# + +exit 0 --- splashy-0.3.13.orig/debian/copyright +++ splashy-0.3.13/debian/copyright @@ -0,0 +1,38 @@ +This package was debianized by Otavio Salvador on +Mon, 24 Jan 2005 21:41:20 +0100. + +It was downloaded from http://alioth.debian.org/projects/splashy + +Upstream Authors: + + Alban Browaeys + Luis Mondesi + Otavio Salvador + Vicenzo Ampolo + +Copyright: + + © 2005-2008 Luis Mondesi + © 2005-2008 Otavio Salvador + © 2005-2007 Vincent Amouret + © 2006 Tim Dijkstra + © 2006 Andrew Williams + +License: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 dated June, 1991. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02110-1301, USA. + +On Debian systems, the complete text of the GNU General +Public License version 2 can be found in `/usr/share/common-licenses/GPL-2'. --- splashy-0.3.13.orig/debian/changelog +++ splashy-0.3.13/debian/changelog @@ -0,0 +1,499 @@ +splashy (0.3.13-5.1ubuntu1) oneiric; urgency=low + + * Remove the Debian hack for #297741. LP: #831285. + * Don't build with -Werror. Closes: #625406. + + -- Matthias Klose Tue, 13 Sep 2011 12:41:01 +0200 + +splashy (0.3.13-5.1) unstable; urgency=low + + * Non-maintainer upload. + * Test for /etc/splashy/themes in preinst before mv (Closes: 547690) + + -- Robert Grimm Sat, 28 Nov 2009 13:38:33 +0100 + +splashy (0.3.13-5) unstable; urgency=low + + * Update 02_lsb-base-logging.sh_bug512951.diff patch: + exiting with 1 breaks other daemons when people have Splashy installed but + disabled for one reason or the other. Only in explicit instances when + we need splashy_update called we will return 1. + (Closes: #522104, #523187, #523449, #523823, #524275, #524276, #524286, + #524314, #524316, #524317, #524433) + + -- Fathi Boudra Sat, 18 Apr 2009 21:12:39 +0200 + +splashy (0.3.13-4) unstable; urgency=low + + [ Luis Mondesi ] + * debian/control: + - Drop hard-coded libdirectfb dependency. Splashy does not requires any + source code changes to work with libdirectfb 1.2.x. + (Closes: #494315, #519711) + - Update standards version to 3.8.1, no changes needed. + * debian/splashy.postinst: + - Ensure xdm is done before Splashy starts at shutdown. (Closes: #513927) + * debian/copyright: + - Add versioned license file GPL-2. Thanks to lintian. + * Add 02_lsb-base-logging.sh_bug512951.diff patch: + - This patch makes sure that Splashy's lsb-base-logging.sh script does not + get in the way of other service scripts when splashy is removed but not + purged. (Closes: #512951) + + -- Fathi Boudra Mon, 06 Apr 2009 17:05:53 +0200 + +splashy (0.3.13-3) unstable; urgency=low + + * Increase the delay to 1s as busybox accepts only whole numbers. + + -- Fathi Boudra Mon, 05 Jan 2009 22:45:17 +0100 + +splashy (0.3.13-2) unstable; urgency=low + + * Add 01_fix_splashy_fails_at_boot_bug505270.diff patch. + It introduces a delay to avoid splashy failure on some machines. + Thanks to Tim Richardson and Matthijs Kooijman. (Closes: #505270) + + -- Fathi Boudra Mon, 05 Jan 2009 17:29:47 +0100 + +splashy (0.3.13-1) unstable; urgency=low + + [ Luis Mondesi ] + * New upstream release: + - Fix KDM doesn't display login screen when splashy is enabled. + (Closes: #465729) + - Wait for all gdm servers to exit. Splashy tries chvt 8 before gdm has + finished, stalls shutdown. Thanks to Tim Richardson. (Closes: #504389) + - When using fonts, try the full path it looks like we were never using + the font supplied by the theme. this fixes this problem by building + a path to the full file. (Closes: #505270) + - Set SPL_PRG before using it. It fixes a bug with mysqld when upgrading + mysql-server-5.0, restarting the service halts the update process with + an error: SPL_PRG unbound variable. (Closes: # 509025) + * Remove 01_fix_themes_path patch. Merged upstream. + * debian/control: + - Add conficts against desktop-base (<< 5.0.2). (Closes: #506057) + * debian/splashy.preinst: + - Move /etc/splashy/themes to /etc/splashy/themes.old . (Closes: #503566) + We introduced a preinst stage that will move /etc/splashy/themes out of + the way to /etc/splashy/themes.old. The user would need to dig into this + directory to manually copy any customized themes + into /usr/share/splashy/themes. Sorry about this but this seems to be + the best way to avoid pissing too many people off (or loosing data). + Note that if Splashy is removed/purged, this themes.old directory will + be removed also. + * debian/splashy.prerm: + - Remove it. deprecated. + + [ Fathi Boudra] + * Fix lintian warning: debhelper-but-no-misc-depends. + + -- Fathi Boudra Mon, 29 Dec 2008 11:51:20 +0100 + +splashy (0.3.12-1) unstable; urgency=low + + [ Luis Mondesi ] + * New upstream release: + - Updates in uswsusp. (Closes: #498861) + - Fix desktop-base breaks Splashy. (Closes: #501315) + - Splashy displays note about running update-initramfs. (Closes: #478313) + - (Closes: #486400, #485307, #411061, #454917, #490068, #492643) + (Closes: #497118, #499972, #411061, #454917, #496621, #497313) + * Remove 01_lsb-base-logging.sh_bug486139 patch. Merged upstream. + * Remove 02_add_missing_headers patch. Merged upstream. (Closes: #501997) + Fix FTBFBS with DEB_BUILD_OPTIONS=noopt,nostrip. Thanks to Bradley Smith. + + [ Fathi Boudra ] + * Add 01_fix_themes_path patch: fix config.xml.in path. + * debian/splashy.postinst: make sure we use /usr/share/splashy/themes in + /etc/splashy config.xml file. + + [ Yves-Alexis Perez ] + * debian/splashy.{preinst,postinst,postrm}: use sh -e to make sure errors are + caught. + * debian/control: + - update standards version to 3.8.0, no changes needed. + - add build-dep on rpath. + - use the debian splashy repository instead of upstream one. + * debian/rules: + - remove rpath on /sbin/splashy. + + -- Fathi Boudra Sun, 09 Nov 2008 12:21:19 +0100 + +splashy (0.3.10-2) unstable; urgency=low + + * Add build-depends on quilt. + * Add patch cherry picked from trunk: if log_daemon_message has a second + argument that's empty, it breaks our printing of the log message. + This patch by Alban Browaeys checks whether this parameter is empty before + checking for "?dm". (Closes: #486139) + + -- Fathi Boudra Sat, 14 Jun 2008 10:49:36 +0200 + +splashy (0.3.10-1) unstable; urgency=low + + [ Luis Mondesi ] + * New upstream release. + (Closes: #455685, #459457, #459447) + (Closes: #458959, #458203, #473109, #462626, #472497) + (Closes: #473112, #470816, #338405, #472612) + (Closes: #482017, #455872, #469640, #421442, #478305) + (Closes: #478300, #478299) + * debian/control: added missing dependencies + - Splashy depends on libdirectfb-1.0-0 >> 1.0.1-8. + + [ Fathi Boudra ] + * Add myself in Uploaders field. + * Bump Standards-Version to 3.7.3. Nothing to do. + * Update copyrights. + + -- Fathi Boudra Thu, 29 May 2008 20:03:42 +0200 + +splashy (0.3.8-1) unstable; urgency=low + + [ Luis Mondesi ] + * Splashy doesn't work if libdirectfb-0.9.25 is installed at + the same time as libdirectfb-1.0.x (Closes: #455872) + * initrc scripts check whether it needs to umount /lib/init/rw/splashy + and whether it needs to restart keymap.sh/console-screen.sh + (Closes: #455685,#455259,#447802,#451846) + * maintainer's email fixed (Closes: #447624) + * Splashy shutsdown properly (Closes: #414668) + * Splashy needs newer libdirectfb (1.0.x) (Closes: #454917) + * poll events fixed in newer version from upstream (Closes: #448183) + + [ Otavio Salvador ] + * Use the new Homepage control field + * redo debian package the right way (Closes: #455472,#453349) + + -- Otavio Salvador Wed, 26 Dec 2007 18:26:50 -0200 + +splashy (0.3.7-1) unstable; urgency=low + + [ Luis Mondesi ] + * new upstream release (Closes: #440560, #410438, #422930, #405532, #410438, #422930) + * libsplashy-dev.install: removed .a files + * splashy.install: installs locale files (Closes: #388330, #451492) + * default/splashy: ENABLE_INITRAMFS=1 (Closes: #383060) + * splashy.post{inst,rm}: update-initramfs -u if initramfs is enabled + * control: needs patched version of directfb. depends on initramfs-tools + * splashy.{install,links}: puts themes in /usr/share/splashy/themes + + -- Otavio Salvador Sat, 08 Dec 2007 20:55:31 -0200 + +splashy (0.3.5) unstable; urgency=low + + * /etc/lsb-base-logging.sh: GDM wouldn't start if splashy wasn't running + (closes: #433382) + + -- Tim Dijkstra Mon, 16 Jul 2007 21:56:30 +0200 + +splashy (0.3.4) unstable; urgency=low + + * Conflict with usplash (closes: #424732) + * Stop splashy before ?dm starts (closes: #421441) + * Fix FTBFS with gcc-4.2 (closes: #424567) + * Mention website in README.Debian (closes: #422070) + + -- Tim Dijkstra Fri, 18 May 2007 12:38:14 +0200 + +splashy (0.3.3) unstable; urgency=low + + * Add debhelper token to preinst + * Splashy depends on lsb-base (closes: #411062) + * libsplashy depends on libdirectfb-extra, needed for png support + (closes: #411523) + * Add XS-Vcs-* and Homepage fields to debian/control + * init_splashy in libsplashy has changed, bump soname. + + -- Tim Dijkstra Wed, 14 Mar 2007 13:38:09 +0100 + +splashy (0.3.2) unstable; urgency=low + + The 'mbiebl is our favorite beta-tester' release + + [ Tim Dijkstra ] + * Start /etc/init.d/splashy after we have /proc. That is at S03. + also first remove the links in postinst. We have changed the + location. (closes: #410897, #410623, #410861) + * Really remove splashy-init. (closes: #410898) + * Source lsb functions before using them (closes: #410896) + * Fix autogen.sh to also accept automake 10 + * Install the right /etc/default/splashy + * Don't fade in the default theme + * initramfs-tools/hooks/libsplashy: don't yell if uswsusp.conf is not there + + -- Tim Dijkstra Thu, 15 Feb 2007 00:39:39 +0100 + +splashy (0.3.1) unstable; urgency=low + + [ Otavio Salvador ] + * Disable JPEG support since doesn't make sense since we already do for + GIF and PNG: + - debian/control: libsplashy0 doesn't need libdirectfb-extra anymore; + - src/Makefile.am: + . remove jpeg com directfb-config calls; + . remove JPEG symbols from DFBHACK variable; + - themes/default: + . convert all jpeg files to png; + . themes.xml changed according; + - Makefile.am: change theme files according; + - scripts/initramfs-tools/hooks/libsplashy.in: remove jpeg library; + * debian/rules: create make-snapshot target to be easier to make + development snapshots; + + [ Tim Dijkstra ] + * Add libsplashy to the depends of libsplashy-dev (closes: #410348) + * Fix 64bit build (Use socklen_t instead of size_t) (closes: #410395) + * Make init script trigger on (no)splash on the kernel command line + (closes: #410662) + * Remove GIF support too. + * Add a suspend.png image. + + -- Tim Dijkstra Tue, 13 Feb 2007 17:12:15 +0100 + +splashy (0.3.0) unstable; urgency=low + + [ Otavio Salvador ] + * Drop all patches since they were merged in upstream repository. + * Don't use CDBS tarball mode anymore. + * Fix a control Depends invalid field. + * Stop using control.in file. + * Use debhelper compatibility level 5. + * Simplify initramfs support installation on package. + * Include libdirectfb-extra as dependency. + * Make this a native package + * Prevent kbd (a console-tools altenative) from being run when splashy + is running. + + [ Tim Dijkstra ] + * Build libsplahy0 and libsplashy0-dev. + * Build only splashy statically + * Rewrite initramfs-scripts/hook to install all necessary + files and libraries. + * Fix install targets (closes: 404303) + * Use /lib/init/rw/splashy for storage of steps file (closes: 405240) + * Reimplement steps calculation with things present in /bin + * Prevent console-tools from being run when splashy is (closes: 405235) + * Install /etc/directfbrc on initramfs (closes: 406110) + * Remove splashy_pgrep, it is obsolete + * Install manpages in correct place + * Lots of autofoo cleanups + * The themes have a new XML schema + + -- Tim Dijkstra Wed, 17 Jan 2007 15:10:56 +0100 + +splashy (0.2.2) unstable; urgency=low + + [ Luis Mondesi ] + * New upstream release: + - mysql-server-5.0: Fail to start or stop mysql-server with Splashy installed. RUNLEVEL not defined. Closes: #400598, #401324 + - instead of showing a nice splash image, it just shows an error message. Closes: #381594 + - progress bar doesn't work : "Cannot test file /proc/cmdline". Closes: #401270 + - F2 doesn't work. Closes: #378322 + - reboot from kde and kdm splashy not displayed, slow reboot. Closes: #352108 + - lib/splashy added to debian/dirs and upstream sources Makefile.am. Closes: #401394 + * debian/splashy.postrm: removes old init.d/splashy symlinks when purging package + + -- Otavio Salvador Sat, 5 Dec 2006 05:05:04 -0300 + +splashy (0.2.1) unstable; urgency=low + + [ Luis Mondesi ] + * Turns off splashy-themes package + * splashy.postinst: + - adds splashy to runlevel 0 and 6 at S01* + + [ Otavio Salvador ] + * Fix compilation problem with GCC 4.2. Closes: #380235 + * Remove doubled build-depends on debhelper. + * Remove build-essential from build-depends. + * New upstream version. Closes: #400347 + + -- Otavio Salvador Fri, 28 Jul 2006 14:05:04 -0300 + +splashy (0.1.9-1) unstable; urgency=low + + [ Luis Mondesi ] + * Turns off splashy-themes package + + [ Otavio Salvador ] + * Fix compilation problem with GCC 4.2. Closes: #380235 + * Remove doubled build-depends on debhelper. + * Remove build-essential from build-depends. + + -- Otavio Salvador Fri, 28 Jul 2006 14:05:04 -0300 + +splashy (0.1.8.1-3) unstable; urgency=low + + [ Otavio Salvador ] + * Fix stupid error in rules file that made our binary empty. + + -- Otavio Salvador Wed, 26 Jul 2006 13:29:44 -0300 + +splashy (0.1.8.1-2) unstable; urgency=low + + [ Otavio Salvador ] + * Use DEB_UPSTREAM_VERSION to choose the directory to use while + building; + * Make package privides, conflicts and replaces 'bootsplash'. uplash is + going to be uploaded to Debian and will use same behaviour. + * Bump libdirectfb-dev build-dependency to 0.9.25.1-2 since it solved + some problems that we workarounded about static linking. + * Grab two minor fixes from SVN head. + + -- Otavio Salvador Wed, 26 Jul 2006 10:49:34 -0300 + +splashy (0.1.8.1-1) experimental; urgency=low + + [ Otavio Salvador ] + * Change splashy-themes to be architecture independent; + * New upstream version: + - Fix FTBFS on amd64. Closes: #354856 + - Add possibility to behave as chvt; + * Remove console-tools dependency. Closes: #373987; + * Do not run update-initramfs on postinst since we can break the user + boot process. The users will need to take care of initramfs by themselves. + * Add libmagic-dev as build-dependency. + + -- Otavio Salvador Sat, 22 Jul 2006 15:23:25 -0300 + +splashy (0.1.8-1) experimental; urgency=low + + [ Jacobo Vilella ] + * Wrong test command. Closes: #365836 + * No more use of /usr/bin/pgrep. Closes: #354027 + + [ Luis Mondesi ] + * new test package + * includes splashy_update + - adds man page for splashy_update + * debian/splashy.postrm/postinst/prerm: + - simplified + - adds initramfs support + - code cleanups + - Splashy is started in rcS (S01) and again in rc0 and rc6 (K01) only + * debian/control{,.in}: + - adds initramfs suggestion + - adds libsysfs-dev build-dep for dfb 0.9.24 support + - adds bzip2 to build-depends + * debian/splashy.default: + - initramfs turned off by default + * debian/splashy.README.Debian: + - removed old known bug + - adds information on initramfs support and README.gz instructions + * This release closes assorted bugs: Closes: #367571, #354856, #352109, #352109 + * Sid installation problem fixed. Closes: #349517 + + [ Otavio Salvador ] + * Simplified splashy.postrm and splashy.postinst to remove a useless + function that will be used once. + * Add debhelper token in splashy.{pre,post}rm scripts. + * Remove lintian override since it isn't need anymore. + * Add console-tools as depends due our use of chvt. + * Bump Standards-Version to 3.7.2 (no changes). + + -- Otavio Salvador Wed, 7 Jun 2006 11:18:04 -0300 + +splashy (0.1.7) experimental; urgency=low + + [Luis Mondesi] + * Remove "is" from message. Some themes need to retype the message. Closes: #325654 + * Binary is compiled statically and does not depend on libdirectfb any more. Closes: #337486 + * We don't patch grub's menu.lst file anymore. Closes: #309806, #314162 + * Init scripts use LSB functions. Closes: #314474 + * Fixes searching path for config.xml. Closes: #329436 + * All themes and their files are self-contained in /etc/splashy/themes/*. Closes: #309715 + * Splashy's threaded now and exits cleanly after boot is done. Closes: #319447 + * splashy-init is used as init script. Closes: #339574 + * splashy rebuilt using libdirectfb-dev 0.9.22. Also, the binary package doesn't depend on + libdirectfb-0.9.x at all. Closes: #349520 + * README includes information about what to append to Grub/Lilo. Closes: #349492 + * debian/rules: + - removes dependency on libdirectfb.so and libglib-2.0.so + * debian/splashy.postrm: + - removes old splashy* and new splashy-init rc links from rc-levels + * debian/splashy.postinst: + - installs new splashy-init to rcS.d and rcN.d + * build against libdirectfb 0.9.24 on Ubuntu/Unstable on Sarge is 0.9.22 + * debian/control{.in}: + - removed lsb dependency as splashy-init script doesn't depend on lsb's init-functions. + This is now simply Recommended + + -- Otavio Salvador Mon, 6 Feb 2006 20:31:00 -0200 + +splashy (0.1.6) experimental; urgency=low + + [Luis Mondesi] + * Edited previous changelog entry of 0.1.5 to fix the bug was close. We + closed the wrong but by mistake. The right one is #314162. + * debian/control.in: + - Replace all depends for ${shlibs:Depends} since it's auto-generated; + - Add build-dependency of libglib2.0-dev at least at version 2.0.1-2 + since it included the static library needed for our build; + - Add build-dependency to use libdirectfb-dev at least at version 0.9.22 + since it included the static library needed for our build; + - Add build-dependency on Perl because we need pod2man to generate man + pages + - Add build-dependency on libjpeg62-dev because libdirectfb-dev needs it + but it's missing from its dependancy list + - Add package splashy-themes + - Add Suggests: for the splashy-themes package + - splashy-themes package has no binaries + * debian/control: updated likewise; + * debian/rules: pod2man use to generate splashy man pages + * debian/splashy-themes.install: + - themes we install. The default theme is installed together with + the splashy package, so no need to mention it here. + - added debian4 and crux themes + * debian/splashy.postinst: + - smarter when editing grub files has been turned off until debconf question is set + - /etc/rcS.d/S01splashy -> /etc/rcS.d/S02splashy because it needs + mountvirtfs to run first. + * Little build system cleanup + * debian/splashy.install: since adding an extra package, cdbs puts sources + in debian/tmp causing the system to fail. This corrects that problem. + + -- Otavio Salvador Wed, 28 Dec 2005 14:10:59 -0200 + +splashy (0.1.5) experimental; urgency=low + + * debian/splashy.postinst: + - corrected comments; + - (really) fixed warning about grub not installed when it's indeed found; + - added support for 1280x1024 resolutions; + - fixes typo while checking for XFree86 config file. It's XF86Config-4. + Closes: #314162 + * scripts/*: remove bashism. Closes: #314474; + + -- Otavio Salvador Thu, 16 Jun 2005 15:33:42 -0300 + +splashy (0.1.4) experimental; urgency=low + + * debian/splashy.postinst: + - changed less to use cat instead + - package attempts to find XF86Config-4 if xorg.conf is not found and then + falls back if everything fails. This can be done better i believe. + - check multiple patch to look for grub. Closes: #309806; + * debian/splashy.install: stop to install the images using it; + * Makefile.am: Change the place to install the image inside of + themes/default directory. Closes: #309715; + * debian/splashy.README.Debian: Added with know issues; + + -- Otavio Salvador Tue, 7 Jun 2005 12:34:48 -0300 + +splashy (0.1.3) experimental; urgency=low + + * debian/rules: + - Don't change debian/control on every build; + - Add 'update-control' target to allow us to update it; + + -- Otavio Salvador Wed, 18 May 2005 11:36:54 -0300 + +splashy (0.1.2) experimental; urgency=low + + * Initial release. + [ It'll be keep on experimental while we aren't sure about it's + stability ] + + -- Otavio Salvador Mon, 16 May 2005 17:43:20 -0300 --- splashy-0.3.13.orig/debian/patches/01_fix_splashy_fails_at_boot_bug505270.diff +++ splashy-0.3.13/debian/patches/01_fix_splashy_fails_at_boot_bug505270.diff @@ -0,0 +1,9 @@ +--- a/scripts/initramfs-tools/scripts/local-premount/splashy ++++ b/scripts/initramfs-tools/scripts/local-premount/splashy +@@ -35,3 +35,6 @@ test $SPLASH = "true" || exit + grep -q '\(VESA\|VGA\)' /proc/fb || exit + + /sbin/splashy boot ++ ++# workaround for Debian bug #505270 ++sleep 1 --- splashy-0.3.13.orig/debian/patches/02_lsb-base-logging.sh_bug512951.diff +++ splashy-0.3.13/debian/patches/02_lsb-base-logging.sh_bug512951.diff @@ -0,0 +1,130 @@ +--- a/scripts/lsb-base-logging.sh ++++ b/scripts/lsb-base-logging.sh +@@ -159,7 +159,7 @@ log_success_msg () { + # load some default variables + [ -r "/etc/default/splashy" ] && . "/etc/default/splashy" + if log_use_splashy; then +- [ -x $SPL_UPD ] || return $1; ++ [ -x $SPL_UPD ] || return 1; + $SPL_UPD "scroll $*" || true # STATUS + fi + +@@ -173,7 +173,7 @@ log_failure_msg () { + # load some default variables + [ -r "/etc/default/splashy" ] && . "/etc/default/splashy" + if log_use_splashy; then +- [ -x $SPL_UPD ] || return $1; ++ [ -x $SPL_UPD ] || return 1; + + $SPL_UPD "scroll $*" || true # STATUS + fi +@@ -194,7 +194,7 @@ log_warning_msg () { + # load some default variables + [ -r "/etc/default/splashy" ] && . "/etc/default/splashy" + if log_use_splashy; then +- [ -x $SPL_UPD ] || return $1; ++ [ -x $SPL_UPD ] || return 1; + + $SPL_UPD "scroll $*" || true # STATUS + fi +@@ -224,7 +224,7 @@ log_daemon_msg () { + # load some default variables + [ -r "/etc/default/splashy" ] && . "/etc/default/splashy" + if log_use_splashy; then +- [ -x $SPL_UPD ] || return $1; ++ [ -x $SPL_UPD ] || return 1; + $SPL_UPD "scroll $*" || true + fi + +@@ -266,7 +266,7 @@ log_daemon_msg () { + + # sanity check: + # yes, check again to see if Splashy is installed before we proceed +- [ -x $SPL_UPD ] || return $1; ++ [ -x $SPL_UPD ] || return 0; + + if [ -z "${RUNLEVEL:-}" ]; then + # we need only the current level +@@ -275,7 +275,7 @@ log_daemon_msg () { + if [ -z "$RUNLEVEL" ]; then + # if we can't figure out the runlevel (such as when run + # from a cron job) then don't do anything with Splashy +- exit $1 ++ exit 1 + fi + fi + if [ "x$RUNLEVEL" = "x6" ] || [ "x$RUNLEVEL" = "x0" ]; then +@@ -303,7 +303,7 @@ log_end_msg () { + # load some default variables + [ -r "/etc/default/splashy" ] && . "/etc/default/splashy" + if log_use_splashy; then +- [ -x $SPL_UPD ] || return $1; ++ [ -x $SPL_UPD ] || return 1; + if [ "$1" -eq 0 ]; then + $SPL_UPD "scroll OK" || true # SUCCESS + else +@@ -335,10 +335,10 @@ log_end_msg () { + ############################################################## + # Start splashy code + # sanity check: +- [ -x $SPL_UPD ] || return $1; ++ [ -x $SPL_UPD ] || return 0; + [ ! -d $STEPS_DIR ] && mkdir -p $STEPS_DIR + SPL_PRG=$STEPS_DIR/$RUNLEVEL-progress +- [ -f $SPL_PRG ] || return $1; ++ [ -f $SPL_PRG ] || return 0; + + # Bug #400598,#401999 + if [ -z "${RUNLEVEL:-}" ]; then +@@ -348,20 +348,20 @@ log_end_msg () { + if [ -z "$RUNLEVEL" ]; then + # if we can't figure out the runlevel (such as when run + # from a cron job) then don't do anything with Splashy +- exit $1 ++ exit 1 + fi + fi + + # It makes no sense for us to send this step if splashy is not running + # Although then splashy_update would just return +- pidof splashy > /dev/null || return $1; ++ pidof splashy > /dev/null || return 0; + + # Get progress percentage of this script + # was calculated by update-progress-steps + PER=`sed -n 's+'${0}' ++ p' $SPL_PRG` + +- # This can not happen ... +- [ -n "$PER" ] || return $1; ++ # This cannot happen ... ++ [ -n "$PER" ] || return 0; + + # in Sid 2006-10-08 05:57 EDT the scripts after S99rc.local + # do not call lsb* functions. So we don't know when the boot process +@@ -382,7 +382,7 @@ log_end_msg () { + + # if we are shutting down or rebooting, there is no need to go further + if [ "x$RUNLEVEL" = "x6" ] || [ "x$RUNLEVEL" = "x0" ]; then +- return $1 ++ return 0 + fi + + if [ "x$PER" != "x100" ]; then +@@ -411,7 +411,7 @@ log_end_msg () { + # If we're at 100% stop splashy nicely + [ "$PER" = "100" ] && stop_splashy + +- return $1 ++ return 0 + } + + log_action_msg () { +@@ -419,7 +419,7 @@ log_action_msg () { + # load some default variables + [ -r "/etc/default/splashy" ] && . "/etc/default/splashy" + if log_use_splashy; then +- [ -x $SPL_UPD ] || return $1; ++ [ -x $SPL_UPD ] || return 1; + + $SPL_UPD "scroll $*" || true + fi --- splashy-0.3.13.orig/debian/patches/series +++ splashy-0.3.13/debian/patches/series @@ -0,0 +1,2 @@ +01_fix_splashy_fails_at_boot_bug505270.diff +02_lsb-base-logging.sh_bug512951.diff