debian/0000775000000000000000000000000012322011557007166 5ustar debian/plymouth-theme-ubuntu-text.prerm0000664000000000000000000000034412310333016015513 0ustar #!/bin/sh set -e if [ "x$1" = xremove ]; then update-alternatives \ --remove text.plymouth /lib/plymouth/themes/ubuntu-text/ubuntu-text.plymouth rm -f /lib/plymouth/themes/ubuntu-text/ubuntu-text.plymouth fi #DEBHELPER# debian/source/0000775000000000000000000000000012322011556010465 5ustar debian/source/options0000664000000000000000000000002412310333016012072 0ustar single-debian-patch debian/source/format0000664000000000000000000000001412310333016011666 0ustar 3.0 (quilt) debian/source/include-binaries0000664000000000000000000000047012310333016013621 0ustar themes/ubuntu-logo/ubuntu_logo.png themes/ubuntu-logo/ubuntu_logo16.png themes/ubuntu-logo/password_field.png themes/ubuntu-logo/password_field16.png themes/ubuntu-logo/progress_dot_off.png themes/ubuntu-logo/progress_dot_off16.png themes/ubuntu-logo/progress_dot_on.png themes/ubuntu-logo/progress_dot_on16.png debian/copyright0000664000000000000000000000216312310333016011115 0ustar This package was debianized by Michael Vogt Sat, 07 Feb 2009 12:03:22 +0000. It was downloaded from git://git.freedesktop.org/git/plymouth Upstream Authors and Copyright Holder: Kristian Høgsberg Ray Strode Peter Jones 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; either version 2 of the License, or (at your option) any later version. 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA On Debian systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL'. debian/plymouth-theme-fade-in.postrm0000664000000000000000000000021312310333016014704 0ustar #!/bin/sh set -e if [ "x$1" = xremove ]; then if which update-initramfs >/dev/null 2>&1 then update-initramfs -u fi fi #DEBHELPER# debian/plymouth-theme-fade-in.install0000664000000000000000000000007512310333016015034 0ustar lib/*/plymouth/fade-throbber.so lib/plymouth/themes/fade-in/ debian/plymouth-theme-solar.postrm0000664000000000000000000000021312310333016014521 0ustar #!/bin/sh set -e if [ "x$1" = xremove ]; then if which update-initramfs >/dev/null 2>&1 then update-initramfs -u fi fi #DEBHELPER# debian/plymouth-theme-text.install0000664000000000000000000000006112310333016014510 0ustar lib/*/plymouth/text.so lib/plymouth/themes/text/ debian/libplymouth-dev.install0000775000000000000000000000051212310333016013675 0ustar #! /usr/bin/dh-exec lib/*/libply.a lib/*/libply.so lib/*/libply-boot-client.a lib/*/libply-boot-client.so lib/*/libply-splash-core.a lib/*/libply-splash-core.so lib/*/libply-splash-graphics.a lib/*/libply-splash-graphics.so usr/include/plymouth-1/ lib/${DEB_HOST_MULTIARCH}/pkgconfig/*.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/ debian/plymouth-theme-spinfinity.prerm0000664000000000000000000000024712310333016015405 0ustar #!/bin/sh set -e if [ "x$1" = xremove ]; then update-alternatives \ --remove default.plymouth /lib/plymouth/themes/spinfinity/spinfinity.plymouth fi #DEBHELPER# debian/plymouth-theme-fade-in.prerm0000664000000000000000000000024112310333016014506 0ustar #!/bin/sh set -e if [ "x$1" = xremove ]; then update-alternatives \ --remove default.plymouth /lib/plymouth/themes/fade-in/fade-in.plymouth fi #DEBHELPER# debian/plymouth.plymouth-splash.upstart0000664000000000000000000000160312310333016015635 0ustar # plymouth-splash - Show the splash screen # # plymouth must be started ASAP to avoid racing with gdm, but the splash # screen can't be spawned until our framebuffer is available. Wait for the # video device to be available before showing the screen, or, if udevtrigger # finishes without finding any video devices, bring up the fallback text # interface. # We also *should* wait for the filesystem to be up because of the libraries # being used from /usr/lib, but this would cause a circular dependency if # any interaction at all is required for mounting a filesystem; so these libs # need to be moved to /lib instead. description "userspace bootsplash" start on (started plymouth and (graphics-device-added PRIMARY_DEVICE_FOR_DISPLAY=1 or drm-device-added PRIMARY_DEVICE_FOR_DISPLAY=1 or stopped udev-fallback-graphics)) exec /bin/plymouth show-splash debian/plymouth-theme-ubuntu-logo.postrm0000664000000000000000000000021312310333016015661 0ustar #!/bin/sh set -e if [ "x$1" = xremove ]; then if which update-initramfs >/dev/null 2>&1 then update-initramfs -u fi fi #DEBHELPER# debian/plymouth-theme-glow.postrm0000664000000000000000000000021312310333016014351 0ustar #!/bin/sh set -e if [ "x$1" = xremove ]; then if which update-initramfs >/dev/null 2>&1 then update-initramfs -u fi fi #DEBHELPER# debian/plymouth-theme-spinfinity.postrm0000664000000000000000000000021312310333016015575 0ustar #!/bin/sh set -e if [ "x$1" = xremove ]; then if which update-initramfs >/dev/null 2>&1 then update-initramfs -u fi fi #DEBHELPER# debian/plymouth-theme-glow.install0000664000000000000000000000006512310333016014500 0ustar lib/*/plymouth/two-step.so lib/plymouth/themes/glow/ debian/libplymouth2.install0000664000000000000000000000021712310333016013202 0ustar lib/*/libply-boot-client.so.* lib/*/libply-splash-core.so.* lib/*/libply-splash-graphics.so.* lib/*/libply.so.* usr/share/apport/package-hooks debian/plymouth-theme-ubuntu-text.postrm0000664000000000000000000000021312310333016015705 0ustar #!/bin/sh set -e if [ "x$1" = xremove ]; then if which update-initramfs >/dev/null 2>&1 then update-initramfs -u fi fi #DEBHELPER# debian/changelog0000664000000000000000000015445612322010757011060 0ustar plymouth (0.8.8-0ubuntu17) trusty; urgency=medium * Suppress job-name update notifications to plymouthd from plymouth-upstart-bridge. (LP: #1303815) -- Dimitri John Ledkov Fri, 11 Apr 2014 17:01:51 +0100 plymouth (0.8.8-0ubuntu16) trusty; urgency=medium [ Steve Langasek ] * Fix debian/patches/tty1-after-boot.patch: when we have multiple non-default console options on the kernel commandline, local_console_terminal will not be set, so we should avoid the resulting assert. LP: #1160079, LP: #1235231. [ Dimitri John Ledkov ] LP: #1292458 * debian/patches/use-upstart-private-socket.patch: instead of using system dbus, use private upstart socket in the plymouth-upstart-bridge. * debian/plymouth.plymouth-upstart-bridge.upstart: start plymouth-upstart-bridge on startup, and thus gather a more complete boot.log. * debian/patches/dont-bail-on-dummy-terms.patch: don't bail plymouth-upstart-bridge if TERM is not set and/or running on a dummy terminal, as we can run on those. This makes console-log useful in lxc-containers and actually contain messages from upstart jobs starting and stopping. * debian/patches/no-print-empty-description.patch: do not store description when dbus returns empty string, and thus stop printing empty "Starting... done" messages. LP: #1185560. * debian/plymouth.plymouth-upstart-bridge.upstart: update stop on conditions to stop when plymouth-shutdown finishes. * Make ubuntu-logo theme support scale factor, provide one plymouth theme with scale 1 and another with scale 2, until scale factor can be dynamically detected. * Mark plymouth-upstart-bridge to respawn. -- Dimitri John Ledkov Thu, 03 Apr 2014 16:37:29 +0100 plymouth (0.8.8-0ubuntu15) trusty; urgency=medium * Update plymouth ubuntu logos to match installer bootsplash and design guidelines (circle of friends is white with orange, not white and transparent thus aubergine). -- Dimitri John Ledkov Thu, 20 Feb 2014 21:42:59 +0000 plymouth (0.8.8-0ubuntu14) trusty; urgency=medium * Implement message-less shutdown (LP: #967229): * Refactor plymouth job into plymouth (boot mode) and plymouth-shutdown (shutdown-mode), as the two are two different jobs. * If present, make plymouth-shutdown stop and wait for lightdm to stop. * Add versioned dependency on upstart, which has rc.conf start plymouth-shutdown on shutdown. -- Dimitri John Ledkov Tue, 04 Feb 2014 17:07:35 +0000 plymouth (0.8.8-0ubuntu13) trusty; urgency=medium * Fix initramfs hook to look in the right path for fonts, now that we don't depend on the transitional ttf-dejavu-core package. LP: #1262983. -- Steve Langasek Thu, 19 Dec 2013 22:29:18 -0800 plymouth (0.8.8-0ubuntu12) trusty; urgency=low * Build using dh-autoreconf. -- Matthias Klose Fri, 06 Dec 2013 16:40:26 +0100 plymouth (0.8.8-0ubuntu11) trusty; urgency=low * Implement update status (U) splash plugin function for details plugin, simply display those updates as text messages. (LP: #540645) -- Dmitrijs Ledkovs Wed, 04 Dec 2013 12:36:46 +0000 plymouth (0.8.8-0ubuntu10) trusty; urgency=low * Update font dependency from ttf-dejavu-core to fonts-dejavu-core. -- Benjamin Drung Thu, 28 Nov 2013 21:05:57 +0100 plymouth (0.8.8-0ubuntu9) trusty; urgency=low * Update plymouth.plymouth-stop.upstart: KDM does no longer support hand over; ensure plymouth quits accordingly. -- Harald Sitter Mon, 18 Nov 2013 02:33:27 +0100 plymouth (0.8.8-0ubuntu8) saucy; urgency=low * Tweak the description of the plymouth-ready upstart job. * debian/patches/Fix-missing-prototype-of-ply_get_timestamp.patch: Fix missing prototype of ply_get_timestamp(). LP: #1187318. * Build with -Werror, to prevent bugs like this from sneaking in in the future. * Drop -Wl,--as-needed from build flags, now used by default in the toolchain. * Fix the ubuntu-text plugin to build cleanly (no -Werror=format-security or -Werror=unused-but-set-variable problems). * debian/patches/Miscellaneous-fixes-for-compiler-warnings.patch: Miscellaneous fixes for compiler warnings. * debian/patches/nouveau-framebuffer.patch: we're no longer building with the nouveau backend at all; make the code build without warnings for this case, but leave the patch in place for right now. * src/client/ply-boot-client.c: fix possible uninitialized variable problems. -- Steve Langasek Thu, 01 Aug 2013 08:51:45 +0000 plymouth (0.8.8-0ubuntu7) saucy; urgency=low * debian/initramfs-tools/hooks/plymouth: Stop copying the pango modules and *-fc.so, these are included in the main pango shared lib now. -- Martin Pitt Mon, 27 May 2013 15:15:28 +0200 plymouth (0.8.8-0ubuntu6.1) raring-proposed; urgency=low * plymouth-ready.conf: Send an event to indicate plymouth is up. Needed to inform login managers that they can start without racing with plymouth-splash. (LP: #982889) -- Timo Aaltonen Fri, 19 Apr 2013 21:55:18 +0300 plymouth (0.8.8-0ubuntu6) raring; urgency=low [ Markus Waas ] * Implement display_question callback for ask-question command. (LP: #509384) -- Dmitrijs Ledkovs Wed, 13 Feb 2013 16:56:49 +0000 plymouth (0.8.8-0ubuntu5) raring; urgency=low * Auto-detect the pango directory to accomodate the versioned path. -- Adam Conrad Tue, 11 Dec 2012 16:19:46 -0700 plymouth (0.8.8-0ubuntu4) raring; urgency=low * Drop the dependency on hardware-specific libdrm modules. -- Adam Conrad Mon, 10 Dec 2012 16:50:24 -0700 plymouth (0.8.8-0ubuntu3) raring; urgency=low * Convert libplymouth2 and libplymouth-dev to multiarch. -- Colin Watson Mon, 03 Dec 2012 15:14:00 +0000 plymouth (0.8.8-0ubuntu2) raring; urgency=low * Fix dependency s/libdrm-nouveau1a/libdrm-nouveau2/g. Thanks Colin for spotting. -- Dmitrijs Ledkovs Mon, 26 Nov 2012 01:40:54 +0000 plymouth (0.8.8-0ubuntu1) raring; urgency=low [ Colin Watson ] * Make descriptions of non-task Upstart jobs be noun phrases in sentence case, so that they look right in plymouth-upstart-bridge output. [ Dmitrijs Ledkovs ] * New upstream release: - drop, applied upstream upstream-add-generic-driver-to-drm-renderer-plugin.patch - drop, applied upstream invalid-event-source-workaround.patch - drop, raring has recent enough drm update-libdrm-nouveau-library-dependency.patch - rebase tty1-after-boot.patch - rebase misc-changes.patch * Update symbols. -- Dmitrijs Ledkovs Thu, 22 Nov 2012 12:16:46 +0000 plymouth (0.8.4-0ubuntu3) quantal; urgency=low * Drop kubuntu-text, moved to kubuntu-default-settings (LP: #1005512) * Refresh autoreconf.patch to pick up the removal of the above theme. -- Adam Conrad Thu, 16 Aug 2012 01:41:26 -0600 plymouth (0.8.4-0ubuntu2) quantal; urgency=low * debian/patches/upstream-add-generic-driver-to-drm-renderer-plugin.patch: - Add the generic driver to the drm render plugin, which is the only one supported on latest upstream, working also for omap. Not yet disabling the others, as they can still be used in case the generic one fails, which keeps plymouth safe for x86 (LP: #1018907) * debian/patches/update-libdrm-nouveau-library-dependency.patch: - Old nouveau driver is now called libdrm_nouveau1 at the latest libdrm package (>= 2.4.38) * Refresh autoreconf.patch. -- Ricardo Salveti de Araujo Thu, 16 Aug 2012 01:53:54 -0300 plymouth (0.8.4-0ubuntu1) quantal; urgency=low * New upstream release. - drop patches originating from or merged upstream: debug-fixes.patch, gcc45-arith-workaround.patch, main-Don-t-watch-for-keyboard-input-if-no-keyboard.patch, upstart-bridge.patch, upstream-*.patch - debian/rules: pass --with-log-viewer to explicitly request its inclusion. - update libplymouth2.symbols. * debian/patches/initramfsless-boot.patch: clean up our failure path when /dev/pts isn't available yet: - don't free a buffer that we might use again later - once we've created the session object, keep it around, instead of freeing it again and leaving a dangling reference to it in the loop exit handler list. it's not clear if this was working before, but it definitely hits an assert now. LP: #981314. * Build with --disable-libdrm_intel on !x86, to avoid an unnecessary dependency. LP: #927424. -- Steve Langasek Sat, 05 May 2012 01:19:02 +0000 plymouth (0.8.2-2ubuntu30) precise; urgency=low [ Philip Muškovac ] * debian/patches/kubuntu-text.patch: Change kubuntu-text theme to new grey (LP: #979824) [ James Hunt ] * Temporary work-around that minimizes chance of referencing invalid sources (LP: #553745). -- James Hunt Fri, 13 Apr 2012 15:11:36 +0100 plymouth (0.8.2-2ubuntu29) precise; urgency=low * debian/patches/main-Don-t-watch-for-keyboard-input-if-no-keyboard.patch: Cherry-pick from upstream; don't watch for keyboard input if no keyboard is set, as is the case when should_ignore_show_splash_calls() returns true, fixing an assert failure. LP: #619021. * debian/ubuntu-logo.png: remove in favor of the logo included in the ubuntu-logo theme which has the correct branding. This has no impact on the default user experience, but fixes the branding when using certain non-default themes available in the archive. (We still ship a copy in the main plymouth package for this reason.) LP: #667262. * debian/patches/tty1-after-boot.patch: Switch back to tty1 on exit if started with vt.handoff. Closes LP: #913731. * debian/plymouth-theme-{k,}ubuntu-text.{triggers,postinst}: regenerate our theme when /etc/lsb-release changes. LP: #957380. -- Steve Langasek Wed, 11 Apr 2012 04:59:54 +0000 plymouth (0.8.2-2ubuntu28) oneiric; urgency=low * debian/libplymouth2.apport: collect boot.log and plymouth-debug.log if it exists (LP: #860371) -- Brian Murray Wed, 28 Sep 2011 07:23:45 +0200 plymouth (0.8.2-2ubuntu27) oneiric; urgency=low * debian/plymouth.upstart: don't start up on 'stopped gdm' or 'stopped lightdm' since on upgrade one of these two will always be stopped at system boot. Instead look for a 'desktop-shutdown' event, and declare appropriate Breaks: against earlier versions of gdm, lightdm, kdm and lxdm that don't implement this event. LP: #854329. -- Steve Langasek Sun, 25 Sep 2011 22:58:30 -0700 plymouth (0.8.2-2ubuntu26) oneiric; urgency=low * Add direct dependency on ttf-dejavu-core since that's the font used in the initramfs-tools hook, instead of trusting that fontconfig-config pulls in the right alternative. LP: #828027. * debian/initramfs-tools/scripts/init-bottom/plymouth: /run doesn't get moved to ${rootmnt}/run until *after* our script has run, so don't try to check for it before calling plymouth update-root-fs - it's not like we would ever want to not pivot root, anyway. Fixes the fact that we haven't been getting /var/log/boot.log for months now. * debian/plymouth.plymouth-stop.upstart: if stopped by lightdm, let lightdm handle the VT transition as it's able, so we get flicker-free boot. LP: #849954. -- Steve Langasek Mon, 19 Sep 2011 10:56:55 -0700 plymouth (0.8.2-2ubuntu25) oneiric; urgency=low * debian/libplymouth2.apport: include grub configuration file and the contents of /proc/cmdline when reporting a bug with apport (LP: #787685) -- Brian Murray Tue, 19 Jul 2011 09:57:35 -0700 plymouth (0.8.2-2ubuntu24) oneiric; urgency=low * initramfs scripts: /dev/.initramfs/ → /run/initramfs transition. (LP: #810956) -- Martin Pitt Fri, 15 Jul 2011 12:26:00 +0200 plymouth (0.8.2-2ubuntu23) natty-proposed; urgency=low * details/plugin.c: On every key stroke, the "details" plugin in plymouth clears only the current line before overwriting it with the password prompt. If the prompt is multilined then the last line ends up being overwritten but the previous lines are repeated. Re-printing only the last line of the password prompt on every keystroke. (LP: #566818) * details/plugin.c: Removed the explicit printing of ':'. Expected to be a part of the prompt. -- Surbhi Palande Thu, 21 Apr 2011 09:54:07 +0300 plymouth (0.8.2-2ubuntu22) natty; urgency=low * Install slave alternative for plymouth-theme-ubuntu-logo, telling GRUB to set an aubergine background (LP: #696915). -- Colin Watson Fri, 15 Apr 2011 14:35:17 +0100 plymouth (0.8.2-2ubuntu21) natty; urgency=low * Tolerate pre-multiarch versions of pango (LP: #741832). -- Colin Watson Mon, 28 Mar 2011 11:07:14 +0100 plymouth (0.8.2-2ubuntu20) natty; urgency=low * Backport from upstream: - [event-loop] Add reference count to event sources (with any luck, this will fix LP: #553745). - [event-loop] Handle more than 8 events at once (LP: #518926). - [terminal] Force enter to output newline. - [terminal] Add OPOST to tty attributes (LP: #546251). - [terminal] Don't set ISTRIP in terminal attributes. -- Colin Watson Thu, 24 Mar 2011 14:17:20 +0000 plymouth (0.8.2-2ubuntu19) natty; urgency=low * debian/initramfs-tools/hooks/plymouth: handle the nss_files modules being in the multiarch library path instead of in /lib. * Build-depend on dpkg-dev (>= 1.16.0~ubuntu4) so we can check the multiarch path at build time. * Also handle multiarch paths for pango modules. -- Steve Langasek Wed, 23 Mar 2011 15:18:47 -0700 plymouth (0.8.2-2ubuntu18) natty; urgency=low [ Colin Watson ] * Split nouveau patches out from misc-changes.patch. * If plymouth:force-drm is found on the kernel command line, use the drm renderer even on nouveau. This allows us to test fixes for LP #539655. See also LP #533135. [ Andy Whitcroft ] * Make splash dependant on either a graphics device appearing or udev-graphics-fallback completing. (LP: #702090) -- Colin Watson Fri, 18 Mar 2011 22:35:41 +0000 plymouth (0.8.2-2ubuntu17) natty; urgency=low * Rework the avoid-sigpipe patch to first attempt to use send(), and then fall back to write in case of ENOTSOCK. (LP: #718044). -- Soren Hansen Mon, 14 Feb 2011 13:30:00 +0100 plymouth (0.8.2-2ubuntu16) natty; urgency=low * Rename .plymouth files to .plymouth.in. * Fold changes from debian-changes that went missing back into patches to which they pertain. * Refresh autoreconf.patch. -- Soren Hansen Sat, 12 Feb 2011 15:25:03 +0100 plymouth (0.8.2-2ubuntu15) natty; urgency=low * Pass MSG_NOSIGNAL when writing to Plymouth. This stops clients from getting SIGPIPE'd when Plymouth goes away unexpectedly. (LP: 717153) * Refresh autoreconf.patch. -- Soren Hansen Sat, 12 Feb 2011 15:00:00 +0100 plymouth (0.8.2-2ubuntu14) natty; urgency=low [ Mathieu Trudel-Lapierre ] * Adjust the text plymouth themes to only ship a template, which then gets used to generate the actual message from the output of lsb_release. * debian/plymouth-theme-kubuntu-text.postinst, debian/plymouth-theme-ubuntu-text.postinst: - Build on the changes to set the text and colors for the -text themes via settings; attempt to properly set the current Ubuntu version according to what LSB tells us. * debian/plymouth-theme-kubuntu-text.prerm, debian/plymouth-theme-ubuntu-text.prerm: - Clean up the actual theme config file for ubuntu-text themes since it's generated at install time. * debian/plymouth-theme-kubuntu-text.postrm, debian/plymouth-theme-ubuntu-text.postrm: - Don't remove /lib/plymouth and /lib/plymouth/themes, it will be done by the plymouth package itself on removal. [ Steve Langasek ] * Clean up the prerm scripts: - don't use this horrible case $1 meme that infests maintainer scripts everywhere (including the other scripts in this package :) - use rm -f instead of ignoring failures - avoid useless exit 0 at the end * While we're at it, clean up the other postrm scripts by moving update-alternatives calls to new prerms, and clean up the unnecessary boilerplate in the remaining postrms. * debian/initramfs-tools/hooks/plymouth: don't overwrite /etc/passwd in the initramfs if it's already present, since ours is just there as an NSS stub and some other hooks may care about the contents. Also, as long as we're setting this up, use /bin/sh for the shell instead of /bin/bash since that actually exists in the initramfs. LP: #715482 -- Steve Langasek Wed, 09 Feb 2011 13:26:13 -0800 plymouth (0.8.2-2ubuntu13) natty; urgency=low * Switch dependency from libdrm-nouveau1 to libdrm-nouveau1a. -- Colin Watson Wed, 26 Jan 2011 02:30:16 +0000 plymouth (0.8.2-2ubuntu12) natty; urgency=low * Build-depend on libdbus-1-dev and libncursesw5-dev for the Upstart bridge. -- Colin Watson Fri, 21 Jan 2011 19:09:43 +0000 plymouth (0.8.2-2ubuntu11) natty; urgency=low * Print messages when Upstart jobs start or stop (LP: #616403). -- Colin Watson Fri, 21 Jan 2011 18:10:46 +0000 plymouth (0.8.2-2ubuntu10) natty; urgency=low [ Martin Pitt ] * gcc45-arith-workaround.patch: Add upstream bug link. [ Colin Watson ] * Backport a couple of patches from upstream to make debugging less painful: - Fix parsing of plymouth:debug=file:. - Handle plymouth:splash or plymouth:debug as last argument. * Rearrange patch handling in a way that doesn't cause dpkg-source to entirely shuffle the contents of debian/patches/debian-changes every time we upload, and to make it easier to merge in future: - Split debian-changes (mostly) into separate patches. A small misc-changes.patch file remains with some patches I didn't have time to analyse, but the bulk of this can now be handled with separate quilt operations. (As usual, if you don't use quilt, patches will end up in a debian-changes patch at the end of the patch series.) - Remove .pc from revision control; it's too noisy and hard to keep consistent. Use http://people.canonical.com/~cjwatson/dpkg-quilt-setup after checking out from revision control to set up quilt. -- Colin Watson Fri, 21 Jan 2011 14:10:49 +0000 plymouth (0.8.2-2ubuntu9) natty; urgency=low [ Steve Langasek ] * debian/control: set Vcs-Bzr to forestall future mis-uploads [ Martin Pitt ] * Add gcc45-arith-workaround.patch: Work around a gcc-4.5 behaviour change/bug(?). Also, this change is actually correct, as the arithmethics can easily overflow a 16 bit value. (LP: #685352) -- Martin Pitt Fri, 14 Jan 2011 12:09:05 -0600 plymouth (0.8.2-2ubuntu8) natty; urgency=low * Adjust ubuntu-logo background colour very slightly: the official "dark aubergine" background colour value is #2c001e, whose red component is closer to 17% than 16%. The difference is noticeable when GRUB is set up to show its own background colour. -- Colin Watson Mon, 13 Dec 2010 13:57:26 +0000 plymouth (0.8.2-2ubuntu7) natty; urgency=low [ Steve Langasek ] * Refactor ubuntu-text theme to allow setting colors and text via settings in the plymouth theme file, and have plymouth-theme-kubuntu-text depend on ubuntu-text instead of duplicating the code. * Bump the version strings from 10.10 to 11.04. LP: #683994. [ Michael Terry ] * debian/plymouth.plymouth-stop.upstart, debian/plymouth.upstart: - Recognize uxlaunch as a display manager. (LP: #609163) -- Steve Langasek Fri, 03 Dec 2010 15:06:17 -0800 plymouth (0.8.2-2ubuntu6) natty; urgency=low * debian/plymouth.plymouth-stop.upstart: * debian/plymouth.upstart: - Add LightDM -- Robert Ancell Wed, 01 Dec 2010 14:52:57 +1100 plymouth (0.8.2-2ubuntu5.1) maverick-proposed; urgency=low * Generate a dummy NSS stack in the initrd to suppress a glib warning generated by the label control (LP: #649917). -- Evan Broder Fri, 29 Oct 2010 06:39:20 -0700 plymouth (0.8.2-2ubuntu5) maverick; urgency=low * Add kubuntu-text theme, closes LP: #613636 -- Jonathan Riddell Fri, 24 Sep 2010 13:07:19 +0100 plymouth (0.8.2-2ubuntu4) maverick; urgency=low * src/plugins/splash/details/plugin.c: Implement display_message, either by displaying it immediately or by queueing it for later display in the event that we're already waiting for user input (LP: #563916). -- Colin Watson Wed, 08 Sep 2010 01:20:35 +0100 plymouth (0.8.2-2ubuntu3) maverick; urgency=low * src/plugins/splash/ubuntu-text/plugin.c: Change Ubuntu version to 10.10 (LP: #588633). -- Colin Watson Fri, 25 Jun 2010 15:56:04 +0100 plymouth (0.8.2-2ubuntu2) lucid; urgency=low * Don't call ply_boot_client_process_pending_requests on flush, because ply_event_loop_process_pending_events already calls this for us when the fd is writable - so calling it again causes a race condition and an assertion failure if _process_pending_events has already cleared the event queue for us. LP: #570289. -- Steve Langasek Tue, 27 Apr 2010 09:35:00 +0100 plymouth (0.8.2-2ubuntu1) lucid; urgency=low * src/main.c: if the splash screen isn't up yet, queue message requests instead of discarding them. LP: #507881. * src/client/ply-boot-client.c: some replies may be sent out of order because they depend on user input, so pay attention to the message type when picking the handler instead of handing the response to the first handler in the list; without this, cancelling fsck in mountall will never work. LP: #562811. * src/client/ply-boot-client.c: instead of trying to read from the server pipe if there are any outstanding requests, call ply_event_loop_process_pending_events() which already knows whether we can read from the pipe. LP: #559761. * add the pixel display bpp symbols to libplymouth2.symbols with a correct version, so that packages using them don't wind up with overly-strict dependencies on libplymouth2. -- Steve Langasek Sun, 25 Apr 2010 16:15:37 +0100 plymouth (0.8.2-2) lucid; urgency=low * debian/initramfs-tools/hooks/plymouth: 'readlink -f' returns the original filename in the case of a non-existent file, so test for the existence of the filename it returns rather than merely whether it's non-empty. -- Colin Watson Fri, 16 Apr 2010 14:23:45 +0100 plymouth (0.8.2-1) lucid; urgency=low [ Steve Langasek ] * New upstream release. * debian/plymouth.plymouth-stop.upstart: trust the new kdm to stop plymouth for us, too. LP: #540177. * plymouth needs to depend on initramfs-tools to avoid calling update-initramfs when the stack isn't configured yet and rendering the system unbootable with a broken initramfs. LP: #358654. * src/client/ply-boot-client.c: ply_boot_client_flush() needs to process the incoming queue before the outgoing, otherwise we get a deadlock. LP: #554737. * src/plugins/splash/script/script-lib-image.c: call script_obj_is_null() to check for the presence of the alpha argument, otherwise all our labels are rendered invisibly... * src/plugins/renderers/drm/plugin.c: temporarily disable the drm backend for nouveau, until we can get to the bottom of the DRM lockup in bug #539655. This is not as pretty, but it boots to the desktop without hanging regardless of how many displays are used, and that takes precedence. LP: #533135. [ Scott James Remnant ] * Implement a Window.GetBitsPerPixel() function in the script library, and the necessary support in ply_pixel_display, ply_renderer and in the vga16fb and frame-buffer renderers to make that information available. This will return "0" on drm and x11 where the answer is "lots". LP: #558352. * Modify vga16fb to only fallback to reducing colors if it's overflowed the 16-color palette already, so if you stick to the same 16 colors, you can get exact matches. * Use alternate 16-color images when we have only 4bpp. LP: #551013. [ Alberto Milone ] * ubuntu-logo: accept a format string from mountall for the disk check progress, so that localization is possible. LP: #553954. -- Steve Langasek Thu, 15 Apr 2010 00:55:46 +0000 plymouth (0.8.1-4ubuntu1) lucid; urgency=low * Don't fail if --attach-to-session is passed and /dev/pts isn't mounted yet, as this breaks booting without an initramfs. * debian/initramfs-tools/hooks/plymouth: if we don't have a default.plymouth link, don't try to copy the graphics support since the libs aren't needed and may not even be installed. LP: #554566. -- Steve Langasek Sat, 03 Apr 2010 17:25:50 -0700 plymouth (0.8.1-4) lucid; urgency=low [ Steve Langasek ] * debian/libplymouth2.apport: include the targets of the theme alternatives in the report. [ Colin Watson ] * Split /lib/plymouth/label.so out into a new plymouth-label package, depended on by the themes that use it. -- Scott James Remnant Thu, 01 Apr 2010 14:03:16 +0100 plymouth (0.8.1-3) lucid; urgency=low [ Colin Watson ] * Pass the single-debian-patch option to dpkg-source. * frame-buffer/vga16fb renderers: It's possible for activate to be called before map_to_device, for example if a non-graphical splash plugin is in use. Initialise map_address to MAP_FAILED so that we won't try to redraw in this situation. [ Scott James Remnant ] * Add a ply_boot_client_flush() method to flush outgoing requests before we exit() * vga16fb: move the VGA register resetting into the flush_head call rather than VT activation, since we may not have permission to fiddle with the VGA at that early point. -- Scott James Remnant Wed, 31 Mar 2010 19:31:35 +0100 plymouth (0.8.1-2) lucid; urgency=low * Quit Plymouth on initramfs panic. -- Evan Dandrea Tue, 30 Mar 2010 11:13:37 +0100 plymouth (0.8.1-1ubuntu3) lucid; urgency=low * configure.ac, src/plugins/renderers/Makefile.am, debian/rules, debian/plymouth.install.in: if sys/io.h is absent, as on powerpc or sparc, omit building the vga16fb renderer. -- Steve Langasek Mon, 29 Mar 2010 04:52:22 +0000 plymouth (0.8.1-1ubuntu2) lucid; urgency=low * Make sure all the plymouth themes declare Replaces: plymouth (<< 0.8.1-1~) to give a smooth upgrade. LP: #549701. * Add Breaks: against the old versions of the out-of-tree plymouth theme packages. * Recommend plymouth-theme-ubuntu-text | plymouth-theme, to avoid pulling in a theme at random. LP: #550237. -- Steve Langasek Sun, 28 Mar 2010 15:36:41 -0700 plymouth (0.8.1-1ubuntu1) lucid; urgency=low * ubuntu-logo theme: - move the entry box below the passphrase prompt where it belongs. LP: #540685, #540806 - add some code to notice if our text boxes are going to run off the bottom of the screen, and move them up in that case. * debian/initramfs-tools/hooks/plymouth: fix to work with the new update-alternatives theme handling. LP: #549247 * include the vga16fb renderer in the initramfs. -- Steve Langasek Sat, 27 Mar 2010 01:20:26 +0000 plymouth (0.8.1-1) lucid; urgency=low [ Scott James Remnant ] * Update to the upstream 0.8.1 release: - Our patches have been merged upstream, some changes due to cleaning them up for submission and noticing a few bugs along the way. Remaining changes are: + ubuntu-logo theme + ubuntu version of the text theme + call update-initramfs rather than plymouth-update-initrd in plymouth-set-default-theme + filter fsck progress updates from the progress bar tracker + watch for enter key press + support lbm-nouveau as an alternate driver name for nouveau to permit backports once Lucid has released + use /dev/fb0 as default framebuffer device name + stop animation of script plugin in idle function - Will become process group leader of its VT if possible (opens without O_NOCTTY when redirecting stdio to it), this is almost certainly correct keyboard-wise. - Deallocates VT on "plymouth quit" after switching VT back to VT1 - Open terminal in text and details plugin, don't assume it's already open. - Calling "plymouth quit" or "plymouth deactivate" while the same command is already running will now block the new command until the old one complete, rather than returning immediately. - Various window fixes for script plugin - Script plugin updated to use the window X and Y offsets every time - Plymouth client tool has been updated to have commands for many cases in preference to the --command style. * Restored code to disable Plymouth's graphical plugins when an alternate init= is given on the kernel command-line, otherwise init=/bin/bash doesn't work so well when Plymouth is in the initramfs. * Restored crash handler that dumps boot messages to /dev/tty1. * Split themes out into different packages, reducing the size of the Plymouth package. This also means that you can remove the themes packages to remove the "graphical splash" part of Plymouth while keeping the ability to prompt for questions on the console. * Use the alternatives system to select the default themes. The existing symlink will be replaced on upgrade if you have not changed it. * Also use alternatives to select the text theme. * Restore the upstream text theme, renaming ours to "ubuntu-text". * Fallback to the built-in details theme (boot messages on console, but with the ability to prompt for questions) if no theme package is installed. (LP: #507238) Unfortunately these changes mean that if you've selected a custom theme, you will need to install that package and select it again. Sorry about that. * Include the 16-color VGA frame-buffer renderer. LP: #526892. * Fix text, ubuntu-text and details themes to restore the console to text mode when adding text displays. * debian/rules: - Set default tty for boot and shutdown with configure arguments - Set default background color to the Ubuntu Aubergine, this provides some consistency with other default themes. * debian/plymouth.upstart, debian/initramfs-tools/scripts/init-top/plymouth: - Redirect console output to Plymouth, this will be both logged and made available to splash themes that want it (details by default). LP: #535108. * debian/plymouth.upstart, debian/plymouth.plymouth-splash.upstart: - Call show-splash from the plymouth script itself in the shutdown case. * ubuntu-logo theme: - Update in same manner as script has been to add Window.GetX() to math that centers things. [ Steve Langasek ] * ubuntu-logo theme: - fix the password prompt handling so the display of boot messages is restored after the passphrase has been entered, and subsequent password requests don't incorrectly reuse the previous prompt. LP: #515822 - turn the message_notification[0].y check right-way-round in password_dialogue_setup(), though this doesn't seem to have any practical impact. - pass logo.z to the SetZ() function, not the SetY() one; thanks to Vishal Rao for this catch. LP: #542458. - refactor get_message_label: the y position of the second line shouldn't vary according to its own height. This brings the passphrase prompts from cryptsetup back up to where they should be. LP: #539723. * Turn tracing on post-beta. * src/main.c: when the user presses enter, compare the keystroke lists to the enter key, not to some previously-typed string that we may or may not have. -- Scott James Remnant Fri, 26 Mar 2010 18:52:37 +0000 plymouth (0.8.0~-17) lucid; urgency=low [ Scott James Remnant ] * src/libply-splash-core/ply-terminal.c: - To restore a terminal into Canonical Mode, rather than setting flags that happen to be the opposite of what cfmakeraw() removes, set the flags that stty's sane mode sets. - Ensure that we clear the "is unbuffered" flag on every exit path from ply_terminal_set_buffered() that means the terminal is Canonical Mode so that we don't reset it back to Canonical Mode again unexpectedly when closing out the terminal under X. LP: #540256. [ Steve Langasek ] * src/main.c: allow clients to watch for as a keystroke. LP: #539182 -- Scott James Remnant Wed, 17 Mar 2010 22:36:47 +0000 plymouth (0.8.0~-16) lucid; urgency=low * src/libply-splash-core/ply-text-display.c: - It turns out that resetting the VT back into KD_TEXT mode every second, while the X server is starting, is not perhaps the best idea. LP: #538213. -- Scott James Remnant Wed, 17 Mar 2010 03:28:03 +0000 plymouth (0.8.0~-15) lucid; urgency=low * debian/plymouth.upstart, debian/plymouth.plymouth-stop.upstart: - Replace the "stop on" clause in plymouth's own job with a job that handles stopping plymouth for the normal cases. For a display manager that handles the plymouth transition properly (gdm & ubiquity only at this point), this simply appears to be running until plymouth is stopped by that display manager. This blocks plymouth from being stopped for other reasons, e.g. rc2 exiting. LP: #538214. For other display managers, and when we reach the end of rc2 or other reasons, this simply asks plymouth to quit. We never use --retain-splash, if the display manager can't do plymouth transitions, we never want to leave the VT in KD_GRAPHICS in case the display manager gets things wrong (hi, kdm!). LP: #538524. * debian/plymouth.plymouth-splash.upstart: - Add LXDM. LP: #526748 * debian/plymouth.plymouth-splash.upstart: - Remove the "starting gdm" bit from the job, since that won't have any effect (job is already started by the time gdm is); and as a result of the above changes could end up with plymouth --show-splash and quit being called together if someone runs "start gdm" themselves. -- Scott James Remnant Wed, 17 Mar 2010 01:19:37 +0000 plymouth (0.8.0~-14) lucid; urgency=low * Add Breaks: against old versions of mountall and casper, due to the soname changes in ~-13. -- Steve Langasek Fri, 12 Mar 2010 12:27:50 -0800 plymouth (0.8.0~-13) lucid; urgency=low [ Steve Langasek ] * Don't attach /proc/cmdline to apport reports, this is already in the standard info that gets collected... [ Alberto Milone ] * ubuntu_logo theme: - New logo from Otto Greenslade. - Switch off dots starting from the ones on the left instead of switching them off all at once. [ Scott James Remnant ] * Move the Ubuntu logo up as discussed with Otto, this makes the mouse cursor appear between the logo and dots and solves the optical illusion of the logo being too low. LP: #535014. * Don't include message about disk checks, which can come from mountall. * Drop the rc script splash functions, we don't want the SysV-rc compat stuff messing around with the splash screen - this can be entirely managed by Upstart now. LP: #528787, #537262. * Plymouth Fix Mega Patch: - This hasn't yet been broken up into enough bits to send upstream, and doesn't *quite* address all the issues yet, but it's a major step. - Rewrite the VT handling, rather than abusing /dev/tty0 keep all VT operations on the actual VT (tty7), this avoids issues where we set the graphics mode of the wrong VT or put the wrong VT into VT_PROCESS mode. LP: #520460, #522598, #526321, #533135 - Don't attempt VT switch when using non-VT consoles. - Make VT mandatory for renderer plugins, so we fallback gracefully to text when the console is not a VT. LP: #516825, #527083. - Restore VT when finished displaying the splash unless plymouth quit is called with --retain-splash. LP: #506297. - Activate VT from text and details plugins, rather than haphardly in the main code, this means the textual boot is also on VT7. LP: #518352, #520122. - Add a --has-active-vt command that can let gdm inquire whether it should reuse Plymouth's VT; fixes the issue where Plymouth has no visible splash screen and X ends up on VT1. LP: #519641, #533572. - Don't open terminal device in X11, fixes the issue where X will crash when debugging plugins using the X11 renderer. - Add --tty option to plymouthd for debugging when X is running and thus using an alternate VT. - Improve deactivate command so that the terminal is no longer watched for keyboard input, session is closed, etc. LP: #528787, #531650. - Ignore mode changes while deactivated, otherwise we can end up resetting the VT back into text mode while X is starting up. LP: #523788, #502509. - Fix races with simultaneous quit and deactivate commands, or multiples of those commands. - Ignore --show-splash, --hide-splash, etc. commands while deactivated. - Add reactivate command for testing purposes. - Don't scan out drm buffer contents to fbcon when not called with quit --retain-splash. LP: #527180. - Avoid resetting the terminal to unbuffered mode on every write, this results in setting X's VT into raw mode and results in the X server crashing on key presses. LP: #532047, #534861, #519460, #520593, #522974, #525393 * I'm aware that if you see the TEXT plugin, it's possible for Enter to still crash the X server for some people. I will be opening a new bug for this, and would appreciate details from people affected. * If you have issues with Enter crashing the X server, and you see a GRAPHICAL plugin, check that gdm is up to date - if it is, please file new bugs. * I'm also aware of an issue where after boot, rather than seeing an X server, you see the ordinary "login:" getty screen. Pressing Alt+F7 should take you to X. I will be opening a new bug for this, and would appreciate details from people affected. * Don't send fsck progress updates to the boot-duration file. * Make all the dots orange just before starting the X server. * Cute text-version of the splash screen. - Added basic support for fsck notification. - Added support for showing keys information on separate lines. -- Scott James Remnant Fri, 12 Mar 2010 19:02:54 +0000 plymouth (0.8.0~-12) lucid; urgency=low * ubuntu_logo theme: - New logo from Otto Greenslade. * debian/rules: - Disable tracing. -- Alberto Milone Thu, 04 Mar 2010 17:31:41 +0100 plymouth (0.8.0~-11) lucid; urgency=low * ubuntu_logo theme: - New logo, colours and simplified design in compliance with the artwork and with the guidelines provided by Otto Greenslade. * Add support for additional separate places for messages (LP: #497311). -- Alberto Milone Fri, 26 Feb 2010 11:27:26 +0100 plymouth (0.8.0~-10ubuntu1) lucid; urgency=low * Merge from upstream: - change plymouth-set-default-theme help output - include upstream manpage (LP: #518414) * Add an apport hook to collect /proc/fb and /proc/cmdline. -- Steve Langasek Thu, 18 Feb 2010 01:24:34 +0000 plymouth (0.8.0~-10) lucid; urgency=low * Add lbm-nouveau/plymouth integration patch. -- Robert Hooker Wed, 10 Feb 2010 23:29:41 -0500 plymouth (0.8.0~-9ubuntu1) lucid; urgency=low * Make plymouth-splash a service instead of a task, to make sure we only run it once per instance of plymouthd; and add an 'or starting gdm' to the start condition so that we're assured of having this command run before gdm starts - otherwise, this plays havoc with gdm's assumptions regarding initial VT selection. LP: #516412. -- Steve Langasek Wed, 10 Feb 2010 16:08:56 -0800 plymouth (0.8.0~-9) lucid; urgency=low * move plymouth-log-viewer to plymouth-x11 also, to completely move GTK out of the base package. -- Steve Langasek Fri, 05 Feb 2010 17:37:37 -0800 plymouth (0.8.0~-8) lucid; urgency=low [ Steve Langasek ] * Include label.so in the initramfs, as well as the font support files it depends on, needed for any text prompts or messages. This will bloat the initramfs substantially (about 3MB) and impact boot performance as a result, but the solution to that is to not include plymouth in the initramfs unless we know it's needed for prompting (e.g., cryptsetup). LP: #496765. * Move x11 renderer into a separate package, to avoid pulling GTK into the server install by default. LP: #509579. * debian/rules: fix up the dh_makeshlibs exclude path to match where we're currently installing. * src/plugins/splash/script/plugin.c: the script plugin has no support at all for text consoles, so if there are no pixel displays available, return an error so that plymouth can fall back to the text plugin. LP: #506717. * Always include the 'details' and 'text' themes in the initramfs, since plymouth uses these as built-in fallbacks and they're tiny. * src/main.c: when a splash plugin fails to load, make sure to unregister any related keyboard handlers. * don't let the password walk off the end of the dialog box. LP: #496782. * split the plymouth upstart job into plymouth and plymouth-splash, so that plymouth starts up early and doesn't have to race gdm; and stop unconditionally adding plymouth to the initramfs now that we can start it this way. * debian/plymouth.postinst: also set the theme on first install, or on upgrade from versions prior to 0.8.0~-7, because update-initramfs called before plymouth has been configured for the first time will accidentally cause a call to --reset to use the text theme instead of the intended default. * debian/plymouth.plymouth-splash.upstart: don't wait on tty-device-added, these are now guaranteed to be available; copied from gdm upstart job. * Depend on mountall (>= 2.0) to ensure we have the above guarantee. * Mark /usr/share/initramfs-tools/scripts/init-bottom/plymouth executable, otherwise initramfs-tools skips it. LP: #509487. * Drop the Debian revision (-1) from the version in the symbols file, to fix a lintian warning. -- Steve Langasek Tue, 02 Feb 2010 08:11:47 +0000 plymouth (0.8.0~-7) lucid; urgency=low * Fixed a bug where we couldn't load the script plugin if it were compiled without optimisations. * Attempt to work around issues with VT switching and fbcon reasserting over our output. LP: #496784, #497115. * Don't attach to the session for now, this code path doesn't work with the current console/VT code. LP: #502494. -- Scott James Remnant Mon, 11 Jan 2010 13:47:36 +0000 plymouth (0.8.0~-6) lucid; urgency=low * Revert change in 0.8.0~-4 that scans the buffer out fo fbcon when deactivating i915; this was actually wrong, we don't want to use fbcon for the transition, we want to use our current framebuffer instead. Other bugs (with the VT code) are preventing that transition from working. * Fix a crash on "plymouth deactivate" when no renderer is active. LP: #499541. * Fix a crash on "plymouth deactivate" when --show-splash has never been called. * Fix failure to quit on "plymouth quit" after "plymouth deactivate". * Remove the code that disables plymouth when init= is on the command-line, we don't want that. * debian/initramfs-tools/scripts/init-top/plymouth: - Don't check the kernel command-line; we always want plymouth running whether or not "splash" is present, plymouth uses that to determine which of the graphics or text renderers to use. - Start with --attach-to-session so we redirect console messages. * debian/plymouth.plymouth-log.upstart: - Once the filesystem is mounted, flush the log out. -- Scott James Remnant Wed, 23 Dec 2009 03:54:42 +0000 plymouth (0.8.0~-5) lucid; urgency=low * Include the ply-boot-protocol.h file in the headers directory. * Include the plybootclient directory in the CFLAGS from pkg-config. -- Scott James Remnant Mon, 14 Dec 2009 06:26:25 +0000 plymouth (0.8.0~-4) lucid; urgency=low * Patched to scan the buffer out to the console when deactivating the i915 plugin so that X can start. * debian/initramfs-tools/scripts/init-top/plymouth: - Turn off the blinking cursor, otherwise it'll appear later when we transition to gdm. * debian/plymouth.upstart: - Don't stop when gdm starts, gdm is smart and will handle the plymouth transition by itself. * debian/plymouth.postinst: - Update the initramfs when we don't change the theme (otherwise we don't update the binaries). -- Scott James Remnant Fri, 11 Dec 2009 05:59:35 +0000 plymouth (0.8.0~-3) lucid; urgency=low * Update to GIT HEAD: - Maintainer mode enabled by default. - plymouth-set-default-theme now supports --help. - script gains window get position functions. * debian/initramfs-tools/scripts/init-bottom/plymouth: - Tell plymouth about the new root filesystem after switching to it. * debian/rules: - Drop --enable-maintainer-mode since it's now enabled by default. * debian/plymouth.upstart: - Remove the "start on" rules that would cause Plymouth to be started if you hadn't got an initramfs; since these were different to the rules for X.org itself, you could end up in the situation (often!) where X would start first (and plymouth stopped), then Plymouth restarted again. LP: #495085. -- Scott James Remnant Thu, 10 Dec 2009 20:04:43 +0000 plymouth (0.8.0~-2) lucid; urgency=low [ Scott James Remnant ] * debian/initramfs-tools/conf-hooks.d/plymouth: - Always enable the framebuffer for now, on the SSD model we end up crashing X while faffing with the splash screen; it's better to just delay it for now. * debian/plymouth.upstart: - Use the udev PRIMARY_DEVICE_FOR_DISPLAY=1 tag to know which of the graphics or drm device we needed to start. - Do not need fbcon, but we do need tty0 [ Alberto Milone ] * Add the "ubuntu-logo" theme: - Add ubuntu-logo to themes/Makefile.{am|in}. - Put the theme in themes/ubuntu-logo. * debian/plymouth.postinst: - Add a provisional ubuntu logo. - Do not install bizcom.png. * debian/rules: - Set the default logo to /lib/plymouth/ubuntu-logo.png. - Pass --enable-maintainer-mode to dh_auto_configure. * debian/plymouth.postinst: - Set the default theme to "ubuntu-logo". -- Scott James Remnant Mon, 07 Dec 2009 20:07:11 +0000 plymouth (0.8.0~-1) lucid; urgency=low [ Michael Vogt ] * merged from the fastboot PPA [ Scott James Remnant ] * Rebased on latest GIT from bzr import. - Directly applied debian/patches/01_default_fb.patch - Directly applied debian/patches/03_set_default_plugin.patch - Directly applied debian/patches/13_use_tty7.patch - Directly applied debian/patches/11_create_pid_file.patch - Dropped debian/patches/12_wait_for_sigterm.patch: + We're not going to shutdown plymouth when X starts, simply deactivate it. Upstart pre-stop and SIGTERM handling should therefore be sufficient. - All other patches were from GIT and are already in the tree, so dropped them too. * Changed packaging to use dh 7 instead of cdbs. * Changed to install into /lib rather than /usr * Removed old init scripts and Upstart jobs to tidy up package. * Added symbols file for the libraries. * Disabled the crash handler, since it does something very silly when X is running. * Added initramfs conf that enables the framebuffer and plymouth unless the root disk is on SSD. The rationale is that SSD-based systems get to the point where we can start plymouth in the real system just as fast, while HDD-based systems have to do ureadahead first and we want something pretty on screen while that happens. -- Scott James Remnant Thu, 03 Dec 2009 19:10:53 +0000 plymouth (0.8.0+git20090929-0ubuntu0.1~fastboot1) karmic; urgency=low * New upstream release. * Update 01_default_fb.patch. * debian/patches/11_create_pid_file.patch: - Add --pid-file=filename parameter to the client so as to write the pid to a file. * debian/patches/12_wait_for_sigterm.patch: - Add --wait-for-sigterm parameter to the client so as to wait for SIGTERM before quitting. * debian/patches/13_use_tty7.patch: - Make plymouth use tty7 instead of tty1. -- Alberto Milone Wed, 11 Nov 2009 14:33:33 +0100 plymouth (0.7.2-0ubuntu0.1~fastboot1) karmic; urgency=low * New upstream release. * Adapt the "plain" plugin (written by Michael Terry). * 06_force_graphics_mode.patch: - Make sure that graphics mode is always used. [ Michael Terry ] * debian/patches/05_add_plain_plugin.patch: - Add a plugin called 'plain' that just shows the logo in the center of the screen, no animation, no progress. * debian/initramfs-tools/hooks/plymouth: - Work with hardy initramfs helper functions * debian/patches/05_add_plain_plugin.patch: - Never revert to TEXT mode, rather stay in GRAPHICS mode. * debian/plymouth-shutdown: - Add shutdown script to show plymouth when rebooting or shutting down. -- Alberto Milone Fri, 23 Oct 2009 15:31:43 +0200 plymouth (0.8.0+git20090929-0ubuntu1~mvo1) karmic; urgency=low * merged from the fastboot PPA -- Michael Vogt Thu, 23 Jul 2009 11:14:55 +0200 plymouth (0.7.0+git20090723-0ubuntu1~ppa1) karmic; urgency=low [ Marcelo Boveto Shima ] * Move the script plymouth from /usr/share/initramfs-tools/scripts/init-top to /usr/share/initramfs-tools/scripts/local-top. Fix plymouth loading with kms. [ Michael Vogt ] * updated to the current git -- Michael Vogt Thu, 23 Jul 2009 11:14:55 +0200 plymouth (0.7.0+git20090506-0ubuntu0.1~ppa2) jaunty; urgency=low * exchange sym-links with real files in ./build-tools -- Mirco Müller (MacSlow) Thu, 07 May 2009 10:17:12 +0100 plymouth (0.7.0+git20090506-0ubuntu0.1~ppa1) jaunty; urgency=low * update to latest plymouth upstream tarball * dropped debian/patches/02_splash_cmdline.patch since this is now in upstream * dropped debian/patches/04_support_solar_default.patch since this is now in upstream -- Mirco Müller (MacSlow) Wed, 06 May 2009 16:24:32 +0100 plymouth (0.7.0+git20090207-0ubuntu0.1~ppa5) UNRELEASED; urgency=low [ Michael Terry ] * debian/compat, debian/control, debian/libplymouth-dev.install, debian/libplymouth2.install, debian/plymouth.install: - Reduce debhelper dependency to 6, for ease of hardy backports. - Prepend install paths with debian/tmp/, as debhelper 6 likes. * debian/initramfs-tools/hooks/plymouth: - Always pass copy_exec a target path that already exist, for compatibility with hardy's initramf-tool's hook-functions. -- Michael Terry Mon, 16 Mar 2009 09:10:38 -0400 plymouth (0.7.0+git20090207-0ubuntu0.1~ppa4) jaunty; urgency=low * Use "Plymouth" instead of "Usplash" in the splash-functions comments. * Add watch file. * Use install's -D flag instead of mkdir. * Add #DEBHELPER# in postinst. * Add postrm to update-initramfs on removal. * Cleanup maintainer scripts. * Use set -e in postinst. * Drop "rhgb" from startup suggestions as "splash" is supported now. * Exclude Plymouth plugins in /usr/lib/plymouth/ for dh_makeshlibs. * Split in multiple packages: add library and development packages. - Add Replaces on older plymouth versions. * Install Debian/Ubuntu scripts via dh_install as well. * TODO: add note to check for the usefulness of some dirs "make install" creates. -- Loic Minier Tue, 17 Feb 2009 16:37:12 +0100 plymouth (0.7.0+git20090207-0ubuntu0.1~ppa3) jaunty; urgency=low * debian/initramfs-hooks: - simplify the initramfs hook generation (thanks to lool) * debian/splash-functions: - add plymouth --wait after --quit (thanks again to the unstopable lool :) -- Michael Vogt Tue, 17 Feb 2009 14:33:08 +0100 plymouth (0.7.0+git20090207-0ubuntu0.1~ppa2) jaunty; urgency=low * debian/rules: - install hook with propper permissions -- Michael Vogt Thu, 12 Feb 2009 11:10:27 +0100 plymouth (0.7.0+git20090207-0ubuntu0.1~ppa1) jaunty; urgency=low * initial test release * debian/patches/01_default_fb.patch: - default to framebuffer /dev/fb0 * debian/patches/02_splash_cmdline.patch: - support "splash" on the kernel commandline * debian/patches/03_set_default_plugin.patch: - update the helper plymouth-set-default-plugin to work on ubuntu and call initramfs-update * debian/patches/04_support_solar_default.patch: - add missing "solar" to configure.in tests * debian/splash-functions: - add compat functions so that it works as a usplash replacement * debian/initramfs-hooks: - hook into our initramfs generation - copy only needed plugin bits onto the initramfs * debian/initramfs-script-init-top: - hook into initramfs run -- Michael Vogt Wed, 11 Feb 2009 08:29:48 -0800 debian/README.debian0000664000000000000000000000426412310333016011267 0ustar Changing Themes --------------- Plymouth themes are installed into sub-directories of /lib/plymouth/themes, some themes may require plugins installed (as .so files) into /lib/plymouth. Search the archive for packages named plymouth-theme-* To change the current theme: sudo update-alternatives --config default.plymouth sudo update-initramfs -u To restore the default theme: sudo update-alternatives --auto default.plymouth sudo update-initramfs -u Disabling the splash screen --------------------------- There are two methods to disable the splash screen. Both have the same effect. Your boot will show such messages as are emitted by the starting services, and will still be able to prompt if needs be. 1) Remove all of the plymouth-theme-* packages from your system, including the text ones. Plymouth will remain installed to permit boot-time prompts. 2) Remove "splash" from the kernel command-line. You can do this per-boot, or make it permanent by changing the GRUB_CMDLINE_LINUX_DEFAULT line in /etc/default/grub High-color graphics on nVidia, ATI and other cards -------------------------------------------------- Our default configuration uses low-color graphics on cards or drivers for which "Kernel Mode Setting" (in-kernel graphics drivers) are not available. This is because the driver that permits high-color graphics tends to cause issues with suspend and resume, and we opted to prefer that working. For nVidia and ATI users, the default "nouveau" and "radeon" drivers are Kernel Mode Setting enabled, but do not always provide 3D capability at the current time. By switching to using the restricted/non-free nvidia-glx or fglrx drivers, you will gain 3D capability at the loss of a high-color splash screen. You can however chose to enable high-color (and resolution) console if you find it doesn't affect suspend/resume for you, or you don't use that feature. There are various methods of doing this, the most robust is the following four steps: Append video=vesafb to the GRUB_CMDLINE_LINUX_DEFAULT in /etc/default/grub sudo update-grub echo FRAMEBUFFER=y | sudo tee /etc/initramfs-tools/conf.d/splash sudo update-initramfs -u debian/plymouth.plymouth-upstart-bridge.upstart0000664000000000000000000000064512321753274017322 0ustar # plymouth-upstart-bridge - Bridge Upstart state changes into Plymouth # # This helper process receives Upstart state changes over D-Bus and sends # corresponding messages to Plymouth. description "bridge from Upstart state changes to Plymouth" respawn start on (startup or runlevel [06]) stop on (stopping plymouth or stopping plymouth-shutdown) console output exec plymouth-upstart-bridge debian/control0000664000000000000000000002124612321753274010606 0ustar Source: plymouth Section: x11 Priority: optional Maintainer: Ubuntu Developers Build-Depends: autotools-dev, dh-autoreconf, debhelper (>= 9), dh-exec (>= 0.3), dpkg-dev (>= 1.16.0~ubuntu4), libcairo2-dev, libdbus-1-dev, libdrm-dev, libgtk2.0-dev, libncursesw5-dev, libpango1.0-dev, libpng12-dev Standards-Version: 3.8.3.0 Vcs-Bzr: lp:ubuntu/plymouth Package: plymouth Architecture: any Depends: initramfs-tools, libplymouth2 (= ${binary:Version}), mountall (>= 2.0), upstart (>= 1.11-0ubuntu3), udev (>= 166-0ubuntu4), ${misc:Depends}, ${shlibs:Depends} Recommends: plymouth-theme-ubuntu-text | plymouth-theme Conflicts: usplash Breaks: gdm (<< 3.0.4-0ubuntu11), kdm (<< 4:4.7.1-0ubuntu3), lightdm (<< 0.9.7-0ubuntu2), lubuntu-plymouth-theme (<= 0.4), lxdm (<< 0.4.1-0ubuntu2), ubuntustudio-plymouth-theme (<= 0.38), xubuntu-plymouth-theme (<< 10.04.4) Description: graphical boot animation and logger - main package Plymouth is an application that runs very early in the boot process (even before the root filesystem is mounted!) that provides a graphical boot animation while the boot process happens in the background. Package: plymouth-x11 Architecture: any Depends: libplymouth2 (= ${binary:Version}), plymouth (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} Replaces: plymouth (<< 0.8.0~-9) Description: graphical boot animation and logger - X11 interface Plymouth is an application that runs very early in the boot process (even before the root filesystem is mounted!) that provides a graphical boot animation while the boot process happens in the background. . This package contains the X11 renderer, which allows plymouth to interact with running X sessions. Package: plymouth-label Architecture: any Depends: libplymouth2 (= ${binary:Version}), plymouth (= ${binary:Version}), fonts-dejavu-core, ${misc:Depends}, ${shlibs:Depends} Replaces: plymouth (<< 0.8.1-4) Description: graphical boot animation and logger - label control Plymouth is an application that runs very early in the boot process (even before the root filesystem is mounted!) that provides a graphical boot animation while the boot process happens in the background. . This package contains the label control, used by various graphical themes to render text. Package: libplymouth2 Architecture: any Multi-Arch: same Section: libs Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends} Replaces: plymouth (<< 0.7.0+git20090207-0ubuntu0.1~ppa4) Breaks: casper (= 1.227), mountall (<< 2.8) Description: graphical boot animation and logger - shared libraries Plymouth is an application that runs very early in the boot process (even before the root filesystem is mounted!) that provides a graphical boot animation while the boot process happens in the background. . This package contains the shared libraries. Package: libplymouth-dev Architecture: any Multi-Arch: same Section: libdevel Depends: libplymouth2 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} Replaces: plymouth (<< 0.7.0+git20090207-0ubuntu0.1~ppa4) Description: graphical boot animation and logger - development files Plymouth is an application that runs very early in the boot process (even before the root filesystem is mounted!) that provides a graphical boot animation while the boot process happens in the background. . This package contains the development files to build Plymouth plugins. Package: plymouth-theme-fade-in Architecture: any Depends: plymouth, plymouth-label, ${misc:Depends}, ${shlibs:Depends} Provides: plymouth-theme Replaces: plymouth (<< 0.8.1-1~) Description: graphical boot animation and logger - fade-in theme Plymouth is an application that runs very early in the boot process (even before the root filesystem is mounted!) that provides a graphical boot animation while the boot process happens in the background. . This package contains the fade-in theme that features a centred logo which fades in and out while stars twinkle around it. . These theme may not correctly display messages from filesystem decryption, checking or error handling. Package: plymouth-theme-glow Architecture: any Depends: plymouth, plymouth-label, ${misc:Depends}, ${shlibs:Depends} Provides: plymouth-theme Replaces: plymouth (<< 0.8.1-1~) Description: graphical boot animation and logger - glow theme Plymouth is an application that runs very early in the boot process (even before the root filesystem is mounted!) that provides a graphical boot animation while the boot process happens in the background. . This package contains the glow theme that features a corporate-looking pie chart for boot progress followed by a glowing logo once boot finishes. . These theme may not correctly display messages from filesystem decryption, checking or error handling. Package: plymouth-theme-script Architecture: any Depends: plymouth, plymouth-label, ${misc:Depends}, ${shlibs:Depends} Provides: plymouth-theme Replaces: plymouth (<< 0.8.1-1~) Description: graphical boot animation and logger - script theme Plymouth is an application that runs very early in the boot process (even before the root filesystem is mounted!) that provides a graphical boot animation while the boot process happens in the background. . This package contains the example script theme, useful for theme developers. . These theme may not correctly display messages from filesystem decryption, checking or error handling. Package: plymouth-theme-solar Architecture: any Depends: plymouth, plymouth-label, ${misc:Depends}, ${shlibs:Depends} Provides: plymouth-theme Description: graphical boot animation and logger - solar theme Plymouth is an application that runs very early in the boot process (even before the root filesystem is mounted!) that provides a graphical boot animation while the boot process happens in the background. . This package contains the solar theme that features a violent blue flaring star, and other space-like animations. . These theme may not correctly display messages from filesystem decryption, checking or error handling. Package: plymouth-theme-spinfinity Architecture: any Depends: plymouth, plymouth-label, ${misc:Depends}, ${shlibs:Depends} Provides: plymouth-theme Replaces: plymouth (<< 0.8.1-1~) Description: graphical boot animation and logger - spinfinity theme Plymouth is an application that runs very early in the boot process (even before the root filesystem is mounted!) that provides a graphical boot animation while the boot process happens in the background. . This package contains the spinfinity theme that features a rotating infinity sign beneath the logo. . These theme may not correctly display messages from filesystem decryption, checking or error handling. Package: plymouth-theme-ubuntu-logo Architecture: any Depends: plymouth, plymouth-label, ttf-ubuntu-font-family, ${misc:Depends}, ${shlibs:Depends} Provides: plymouth-theme Replaces: plymouth (<< 0.8.1-1~) Description: graphical boot animation and logger - ubuntu-logo theme Plymouth is an application that runs very early in the boot process (even before the root filesystem is mounted!) that provides a graphical boot animation while the boot process happens in the background. . This package contains the default ubuntu-logo theme. Package: plymouth-theme-text Architecture: any Depends: plymouth, ${misc:Depends}, ${shlibs:Depends} Provides: plymouth-theme Replaces: plymouth (<< 0.8.1-1~) Description: graphical boot animation and logger - text theme Plymouth is an application that runs very early in the boot process (even before the root filesystem is mounted!) that provides a graphical boot animation while the boot process happens in the background. . This package contains the text theme used when no support for a graphical theme is found on your system. . These theme may not correctly display messages from filesystem decryption, checking or error handling. Package: plymouth-theme-ubuntu-text Architecture: any Depends: plymouth, ${misc:Depends}, ${shlibs:Depends} Provides: plymouth-theme Replaces: plymouth (<< 0.8.1-1~) Description: graphical boot animation and logger - ubuntu-logo theme Plymouth is an application that runs very early in the boot process (even before the root filesystem is mounted!) that provides a graphical boot animation while the boot process happens in the background. . This package contains the default ubuntu-text text theme used when no support for a graphical theme is found on your system. debian/plymouth-x11.install0000664000000000000000000000007412310333016013041 0ustar lib/*/plymouth/renderers/x11.so usr/bin/plymouth-log-viewer debian/plymouth-theme-glow.prerm0000664000000000000000000000023312310333016014154 0ustar #!/bin/sh set -e if [ "x$1" = xremove ]; then update-alternatives \ --remove default.plymouth /lib/plymouth/themes/glow/glow.plymouth fi #DEBHELPER# debian/plymouth-theme-text.postinst0000664000000000000000000000167212310333016014736 0ustar #!/bin/sh -e # This script can be called in the following ways: # # After the package was installed: # configure # # # If prerm fails during upgrade or fails on failed upgrade: # abort-upgrade # # If prerm fails during deconfiguration of a package: # abort-deconfigure in-favour # removing # # If prerm fails during replacement due to conflict: # abort-remove in-favour case "$1" in configure) update-alternatives \ --install /lib/plymouth/themes/text.plymouth text.plymouth \ /lib/plymouth/themes/text/text.plymouth 10 if which update-initramfs >/dev/null 2>&1 then update-initramfs -u fi ;; abort-upgrade|abort-deconfigure|abort-remove) ;; *) echo "$0 called with unknown argument \`$1'" 1>&2 exit 1 ;; esac #DEBHELPER# exit 0 debian/plymouth-theme-ubuntu-logo.prerm0000664000000000000000000000043212321753274015503 0ustar #!/bin/sh set -e if [ "x$1" = xremove ]; then update-alternatives \ --remove default.plymouth /lib/plymouth/themes/ubuntu-logo/ubuntu-logo.plymouth update-alternatives \ --remove default.plymouth /lib/plymouth/themes/ubuntu-logo/ubuntu-logo-scale-2.plymouth fi #DEBHELPER# debian/plymouth.install.in0000664000000000000000000000052112310333016013034 0ustar bin/plymouth bin/plymouth-upstart-bridge sbin/plymouthd lib/*/plymouth/script.so lib/*/plymouth/renderers/drm.so lib/*/plymouth/renderers/frame-buffer.so lib/*/plymouth/details.so lib/plymouth/themes/details/ var/lib/plymouth/ var/spool/plymouth/ themes/ubuntu-logo/ubuntu_logo.png lib/plymouth debian/initramfs-tools usr/share debian/plymouth.plymouth-ready.upstart0000664000000000000000000000124312310333016015447 0ustar # plymouth-ready - send an event to indicate plymouth is up # # This job notifies that the plymouth splash screen is up, either started # from the initrd or when the 'plymouth-splash' job starts. The login # managers use the event to avoid a race with plymouth-splash: # # https://bugs.launchpad.net/ubuntu/+source/plymouth/+bug/982889 description "Send an event to indicate plymouth is up" task start on startup or started plymouth-splash instance $UPSTART_EVENTS emits plymouth-ready script if [ "$UPSTART_EVENTS" = started ] || \ status plymouth-splash | grep -q "start/started" || \ plymouth --ping then initctl emit plymouth-ready fi end script debian/plymouth-theme-solar.install0000664000000000000000000000007212310333016014646 0ustar lib/*/plymouth/space-flares.so lib/plymouth/themes/solar/ debian/libplymouth2.apport0000664000000000000000000000241712310333016013045 0ustar '''apport package hook for plymouth Copyright 2010 Canonical Ltd. Authors: Steve Langasek , Brian Murray ''' from apport.hookutils import * import os.path def _attach_file_filtered(report, path, key=None): '''filter out password from grub configuration''' if not key: key = path_to_key(path) if os.path.exists(path): with open(path,'r') as f: filtered = [l if not l.startswith('password') else '### PASSWORD LINE REMOVED ###' for l in f.readlines()] report[key] = ''.join(filtered) def add_info(report): attach_hardware(report) attach_file(report, '/proc/fb', 'ProcFB') attach_file(report, '/proc/cmdline', 'ProcCmdLine') attach_file(report, '/var/log/boot.log', 'BootLog') debug_log = '/var/log/plymouth-debug.log' if os.path.exists(debug_log): attach_root_command_outputs(report, {'PlymouthDebug': 'cat %s' % debug_log}) _attach_file_filtered(report, '/etc/default/grub', 'EtcDefaultGrub') report['DefaultPlymouth'] = command_output(['readlink', '/etc/alternatives/default.plymouth']) report['TextPlymouth'] = command_output(['readlink', '/etc/alternatives/text.plymouth']) debian/plymouth-theme-script.prerm0000664000000000000000000000023712310333016014514 0ustar #!/bin/sh set -e if [ "x$1" = xremove ]; then update-alternatives \ --remove default.plymouth /lib/plymouth/themes/script/script.plymouth fi #DEBHELPER# debian/plymouth-theme-text.postrm0000664000000000000000000000021312310333016014365 0ustar #!/bin/sh set -e if [ "x$1" = xremove ]; then if which update-initramfs >/dev/null 2>&1 then update-initramfs -u fi fi #DEBHELPER# debian/plymouth-theme-script.install0000664000000000000000000000003412310333016015030 0ustar lib/plymouth/themes/script/ debian/plymouth-theme-ubuntu-text.triggers0000664000000000000000000000003212310333016016206 0ustar interest /etc/lsb-release debian/plymouth-theme-ubuntu-logo.postinst0000664000000000000000000000254312321753274016246 0ustar #!/bin/sh -e # This script can be called in the following ways: # # After the package was installed: # configure # # # If prerm fails during upgrade or fails on failed upgrade: # abort-upgrade # # If prerm fails during deconfiguration of a package: # abort-deconfigure in-favour # removing # # If prerm fails during replacement due to conflict: # abort-remove in-favour case "$1" in configure) update-alternatives \ --install /lib/plymouth/themes/default.plymouth default.plymouth \ /lib/plymouth/themes/ubuntu-logo/ubuntu-logo.plymouth 100 \ --slave /lib/plymouth/themes/default.grub default.plymouth.grub \ /lib/plymouth/themes/ubuntu-logo/ubuntu-logo.grub update-alternatives \ --install /lib/plymouth/themes/default.plymouth default.plymouth \ /lib/plymouth/themes/ubuntu-logo/ubuntu-logo-scale-2.plymouth 99 \ --slave /lib/plymouth/themes/default.grub default.plymouth.grub \ /lib/plymouth/themes/ubuntu-logo/ubuntu-logo.grub if which update-initramfs >/dev/null 2>&1 then update-initramfs -u fi ;; abort-upgrade|abort-deconfigure|abort-remove) ;; *) echo "$0 called with unknown argument \`$1'" 1>&2 exit 1 ;; esac #DEBHELPER# exit 0 debian/plymouth-theme-script.postrm0000664000000000000000000000021312310333016014705 0ustar #!/bin/sh set -e if [ "x$1" = xremove ]; then if which update-initramfs >/dev/null 2>&1 then update-initramfs -u fi fi #DEBHELPER# debian/plymouth-label.install0000664000000000000000000000003012310333016013477 0ustar lib/*/plymouth/label.so debian/plymouth.upstart0000664000000000000000000000100712310333016012463 0ustar # plymouth - Userspace bootsplash utility # # plymouth provides a boot splash screen on the system console using # the kernel framebuffer device. On boot, this is nominally started by # the initramfs so the pre-start script, script and post-start script # parts are actually not run. These are normally run on shutdown instead. description "userspace bootsplash utility" start on starting mountall expect fork kill timeout 60 exec /sbin/plymouthd --mode=boot --attach-to-session pre-stop exec /bin/plymouth quit debian/rules0000775000000000000000000000563512310333016010251 0ustar #!/usr/bin/make -f %: dh $@ --with autoreconf DEB_CFLAGS_MAINT_APPEND := -Werror -Wno-error=unused-result \ -Wno-error=sign-compare # Disable optimisations if noopt found in $DEB_BUILD_OPTIONS ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) DEB_LDFLAGS_MAINT_APPEND += -Wl,-O0 else DEB_LDFLAGS_MAINT_APPEND += -Wl,-O1 endif export DEB_LDFLAGS_MAINT_APPEND DEB_CFLAGS_MAINT_APPEND CONFIG_OPTIONS = DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) # This renderer is only available on architectures that are sufficiently # PC-like ifneq (,$(filter $(DEB_HOST_ARCH),amd64 armel i386 ia64)) VGA_RENDERER=lib/$(DEB_HOST_MULTIARCH)/plymouth/renderers/vga16fb.so endif # Don't depend on the intel driver on non-intel architectures ifeq (,$(filter $(DEB_HOST_ARCH),amd64 i386)) CONFIG_OPTIONS += --disable-libdrm_intel endif override_dh_auto_configure: dh_auto_configure -- \ --libdir=/lib/$(DEB_HOST_MULTIARCH) \ --datadir=/lib \ --enable-tracing \ --disable-tests \ --disable-maintainer-mode \ --disable-silent-rules \ --disable-gdm-transition \ --with-system-root-install \ --without-rhgb-compat-link \ --without-gdm-autostart-file \ --with-log-viewer \ --with-logo=/lib/plymouth/ubuntu_logo.png \ --with-background-color=0x2c001e \ --with-background-start-color-stop=0x2c001e \ --with-background-end-color-stop=0x2c001e \ --with-boot-tty=/dev/tty7 \ --with-shutdown-tty=/dev/tty7 \ --enable-upstart-monitoring \ $(CONFIG_OPTIONS) override_dh_auto_install: dh_auto_install mkdir -p debian/tmp/usr/share/apport/package-hooks install -m 644 debian/libplymouth2.apport debian/tmp/usr/share/apport/package-hooks/source_plymouth.py override_dh_install: sed -e'/frame-buffer\.so$$/a\ $(VGA_RENDERER)' < debian/plymouth.install.in > debian/plymouth.install dh_install sed -i -e's/#DEB_HOST_MULTIARCH#/$(DEB_HOST_MULTIARCH)/g' \ debian/plymouth/usr/share/initramfs-tools/hooks/plymouth override_dh_auto_clean: dh_auto_clean rm -f debian/plymouth.install # Don't start plymouth when installing! override_dh_installinit: dh_installinit --noscripts dh_installinit --name=plymouth-log --noscripts dh_installinit --name=plymouth-splash --noscripts dh_installinit --name=plymouth-stop --noscripts dh_installinit --name=plymouth-upstart-bridge --noscripts dh_installinit --name=plymouth-ready --noscripts dh_installinit --name=plymouth-shutdown --noscripts # Make the initramfs scripts executable override_dh_fixperms: dh_fixperms chmod 755 debian/plymouth/usr/share/initramfs-tools/hooks/plymouth chmod 755 debian/plymouth/usr/share/initramfs-tools/scripts/init-top/plymouth chmod 755 debian/plymouth/usr/share/initramfs-tools/scripts/init-bottom/plymouth chmod 755 debian/plymouth/usr/share/initramfs-tools/scripts/panic/plymouth # Don't generate shlibs for plugins (ideally these wouldn't have a SONAME) override_dh_makeshlibs: dh_makeshlibs -X/lib/$(DEB_HOST_MULTIARCH)/plymouth/ debian/plymouth-theme-spinfinity.postinst0000664000000000000000000000171412310333016016143 0ustar #!/bin/sh -e # This script can be called in the following ways: # # After the package was installed: # configure # # # If prerm fails during upgrade or fails on failed upgrade: # abort-upgrade # # If prerm fails during deconfiguration of a package: # abort-deconfigure in-favour # removing # # If prerm fails during replacement due to conflict: # abort-remove in-favour case "$1" in configure) update-alternatives \ --install /lib/plymouth/themes/default.plymouth default.plymouth \ /lib/plymouth/themes/spinfinity/spinfinity.plymouth 10 if which update-initramfs >/dev/null 2>&1 then update-initramfs -u fi ;; abort-upgrade|abort-deconfigure|abort-remove) ;; *) echo "$0 called with unknown argument \`$1'" 1>&2 exit 1 ;; esac #DEBHELPER# exit 0 debian/plymouth-theme-solar.postinst0000664000000000000000000000170212310333016015064 0ustar #!/bin/sh -e # This script can be called in the following ways: # # After the package was installed: # configure # # # If prerm fails during upgrade or fails on failed upgrade: # abort-upgrade # # If prerm fails during deconfiguration of a package: # abort-deconfigure in-favour # removing # # If prerm fails during replacement due to conflict: # abort-remove in-favour case "$1" in configure) update-alternatives \ --install /lib/plymouth/themes/default.plymouth default.plymouth \ /lib/plymouth/themes/solar/solar.plymouth 10 if which update-initramfs >/dev/null 2>&1 then update-initramfs -u fi ;; abort-upgrade|abort-deconfigure|abort-remove) ;; *) echo "$0 called with unknown argument \`$1'" 1>&2 exit 1 ;; esac #DEBHELPER# exit 0 debian/watch0000664000000000000000000000013212310333016010205 0ustar version=3 http://www.freedesktop.org/software/plymouth/releases/plymouth-([\d.]+).tar.bz2 debian/plymouth-theme-ubuntu-text.postinst0000664000000000000000000000224412310333016016252 0ustar #!/bin/sh -e # This script can be called in the following ways: # # After the package was installed: # configure # # # If prerm fails during upgrade or fails on failed upgrade: # abort-upgrade # # If prerm fails during deconfiguration of a package: # abort-deconfigure in-favour # removing # # If prerm fails during replacement due to conflict: # abort-remove in-favour case "$1" in configure|triggered) sed -re \ "/\[ubuntu-text\]/ { N; s/(title=Ubuntu ).*\$/\1$(lsb_release -rs)/ }" /lib/plymouth/themes/ubuntu-text/ubuntu-text.plymouth.in \ > /lib/plymouth/themes/ubuntu-text/ubuntu-text.plymouth update-alternatives \ --install /lib/plymouth/themes/text.plymouth text.plymouth \ /lib/plymouth/themes/ubuntu-text/ubuntu-text.plymouth 50 if which update-initramfs >/dev/null 2>&1 then update-initramfs -u fi ;; abort-upgrade|abort-deconfigure|abort-remove) ;; *) echo "$0 called with unknown argument \`$1'" 1>&2 exit 1 ;; esac #DEBHELPER# exit 0 debian/plymouth-theme-ubuntu-logo.install0000664000000000000000000000004112310333016016002 0ustar lib/plymouth/themes/ubuntu-logo/ debian/plymouth-theme-fade-in.postinst0000664000000000000000000000170612310333016015253 0ustar #!/bin/sh -e # This script can be called in the following ways: # # After the package was installed: # configure # # # If prerm fails during upgrade or fails on failed upgrade: # abort-upgrade # # If prerm fails during deconfiguration of a package: # abort-deconfigure in-favour # removing # # If prerm fails during replacement due to conflict: # abort-remove in-favour case "$1" in configure) update-alternatives \ --install /lib/plymouth/themes/default.plymouth default.plymouth \ /lib/plymouth/themes/fade-in/fade-in.plymouth 10 if which update-initramfs >/dev/null 2>&1 then update-initramfs -u fi ;; abort-upgrade|abort-deconfigure|abort-remove) ;; *) echo "$0 called with unknown argument \`$1'" 1>&2 exit 1 ;; esac #DEBHELPER# exit 0 debian/plymouth-theme-glow.postinst0000664000000000000000000000170012310333016014712 0ustar #!/bin/sh -e # This script can be called in the following ways: # # After the package was installed: # configure # # # If prerm fails during upgrade or fails on failed upgrade: # abort-upgrade # # If prerm fails during deconfiguration of a package: # abort-deconfigure in-favour # removing # # If prerm fails during replacement due to conflict: # abort-remove in-favour case "$1" in configure) update-alternatives \ --install /lib/plymouth/themes/default.plymouth default.plymouth \ /lib/plymouth/themes/glow/glow.plymouth 10 if which update-initramfs >/dev/null 2>&1 then update-initramfs -u fi ;; abort-upgrade|abort-deconfigure|abort-remove) ;; *) echo "$0 called with unknown argument \`$1'" 1>&2 exit 1 ;; esac #DEBHELPER# exit 0 debian/plymouth.preinst0000664000000000000000000000127012310333016012447 0ustar #!/bin/sh -e # This script can be called in the following ways: # # Before the package is installed: # install # # Before removed package is upgraded: # install # # Before the package is upgraded: # upgrade # # # If postrm fails during upgrade or fails on failed upgrade: # abort-upgrade case "$1" in install|upgrade) # Upgrade from lucid development cycle if dpkg --compare-versions "$2" lt-nl "0.8.0~-18"; then rm -f /lib/plymouth/themes/default.plymouth fi ;; abort-upgrade) ;; *) echo "$0 called with unknown argument \`$1'" 1>&2 exit 1 ;; esac #DEBHELPER# exit 0 debian/initramfs-tools/0000775000000000000000000000000012322011556012317 5ustar debian/initramfs-tools/conf-hooks.d/0000775000000000000000000000000012322011556014607 5ustar debian/initramfs-tools/scripts/0000775000000000000000000000000012322011556014006 5ustar debian/initramfs-tools/scripts/panic/0000775000000000000000000000000012322011556015100 5ustar debian/initramfs-tools/scripts/panic/plymouth0000664000000000000000000000025212310333016016676 0ustar #!/bin/sh OPTION=FRAMEBUFFER PREREQ="udev" prereqs() { echo "$PREREQ" } case $1 in prereqs) prereqs exit 0 ;; esac /bin/plymouth quit debian/initramfs-tools/scripts/init-bottom/0000775000000000000000000000000012322011556016253 5ustar debian/initramfs-tools/scripts/init-bottom/plymouth0000664000000000000000000000031612310333016020052 0ustar #!/bin/sh OPTION=FRAMEBUFFER PREREQ="udev" prereqs() { echo "$PREREQ" } case $1 in prereqs) prereqs exit 0 ;; esac /bin/plymouth update-root-fs --new-root-dir=${rootmnt} debian/initramfs-tools/scripts/init-top/0000775000000000000000000000000012322011556015551 5ustar debian/initramfs-tools/scripts/init-top/plymouth0000664000000000000000000000050312310333016017346 0ustar #!/bin/sh OPTION=FRAMEBUFFER PREREQ="framebuffer console_setup brltty" prereqs() { echo "$PREREQ" } case $1 in prereqs) prereqs exit 0 ;; esac printf '\033[?25l' > /dev/tty7 /sbin/plymouthd --mode=boot --attach-to-session --pid-file=/run/initramfs/plymouth.pid /bin/plymouth show-splash debian/initramfs-tools/hooks/0000775000000000000000000000000012322011556013442 5ustar debian/initramfs-tools/hooks/plymouth0000664000000000000000000000536412310333016015251 0ustar #!/bin/sh OPTION=FRAMEBUFFER PREREQ="framebuffer" prereqs() { echo "$PREREQ" } case $1 in prereqs) prereqs exit 0 ;; esac [ -x /sbin/plymouthd ] || exit 0 . /usr/share/initramfs-tools/hook-functions mkdir -p ${DESTDIR}/lib/#DEB_HOST_MULTIARCH#/plymouth/renderers mkdir -p ${DESTDIR}/lib/plymouth/themes copy_exec /sbin/plymouthd /sbin copy_exec /bin/plymouth /bin # plugin that is always required copy_exec /lib/#DEB_HOST_MULTIARCH#/plymouth/details.so /lib/#DEB_HOST_MULTIARCH#/plymouth/ # copy the default themes cp -a /lib/plymouth/themes/details ${DESTDIR}/lib/plymouth/themes/ TEXT_THEME=$(readlink -f /lib/plymouth/themes/text.plymouth) if [ -e "$TEXT_THEME" ]; then ln -s $TEXT_THEME ${DESTDIR}/lib/plymouth/themes/text.plymouth cp -a $(dirname $TEXT_THEME) ${DESTDIR}/lib/plymouth/themes/ MODULE=$(grep "ModuleName *= *" ${TEXT_THEME} | sed 's/ModuleName *= *//') copy_exec /lib/#DEB_HOST_MULTIARCH#/plymouth/$MODULE.so /lib/#DEB_HOST_MULTIARCH#/plymouth/ fi THEME=$(readlink -f /lib/plymouth/themes/default.plymouth) if [ -e "$THEME" ]; then ln -s $THEME ${DESTDIR}/lib/plymouth/themes/default.plymouth cp -a $(dirname $THEME) ${DESTDIR}/lib/plymouth/themes/ MODULE=$(grep "ModuleName *= *" ${THEME} | sed 's/ModuleName *= *//') copy_exec /lib/#DEB_HOST_MULTIARCH#/plymouth/$MODULE.so /lib/#DEB_HOST_MULTIARCH#/plymouth/ # if we have a non-text theme, make sure we copy all the support libs copy_exec /lib/#DEB_HOST_MULTIARCH#/plymouth/label.so /lib/#DEB_HOST_MULTIARCH#/plymouth/ # suppress a warning in glib (which the label control uses) # about uid 0 by building a dummy NSS stack (LP #649917) if ! grep -q '^root:' ${DESTDIR}/etc/passwd 2>/dev/null; then echo 'root:x:0:0:root:/root:/bin/sh' >${DESTDIR}/etc/passwd fi echo 'passwd: files' >${DESTDIR}/etc/nsswitch.conf for lib in /lib/#DEB_HOST_MULTIARCH#/libnss_files* /lib/libnss_files* do if [ -e "$lib" ]; then copy_exec $lib /lib fi done # output renderers copy_exec /lib/#DEB_HOST_MULTIARCH#/plymouth/renderers/frame-buffer.so /lib/#DEB_HOST_MULTIARCH#/plymouth/renderers/ copy_exec /lib/#DEB_HOST_MULTIARCH#/plymouth/renderers/drm.so /lib/#DEB_HOST_MULTIARCH#/plymouth/renderers/ copy_exec /lib/#DEB_HOST_MULTIARCH#/plymouth/renderers/vga16fb.so /lib/#DEB_HOST_MULTIARCH#/plymouth/renderers/ cp /lib/plymouth/ubuntu_logo.png ${DESTDIR}/lib/plymouth # and copy the font support files needed in order to actually display # any text mkdir -p ${DESTDIR}/usr/share/fonts/truetype/dejavu mkdir -p ${DESTDIR}/etc/fonts/conf.d cp /usr/share/fonts/truetype/dejavu/DejaVuSans.ttf ${DESTDIR}/usr/share/fonts/truetype/dejavu/ cp /etc/fonts/fonts.conf ${DESTDIR}/etc/fonts/fonts.conf cp -L /etc/fonts/conf.d/60-latin.conf ${DESTDIR}/etc/fonts/conf.d fi debian/plymouth.plymouth-shutdown.upstart0000664000000000000000000000141212310333016016214 0ustar # plymouth - Userspace bootsplash utility # # plymouth provides a boot splash screen on the system console using # the kernel framebuffer device. On boot, this is nominally started by # the initramfs so the pre-start script, script and post-start script # parts are actually not run. These are normally run on shutdown instead. description "userspace bootsplash utility" start on (runlevel [016] and (stopped xdm or stopped uxlaunch)) expect fork kill timeout 60 pre-start script status lightdm >/dev/null 2>/dev/null && start wait-for-state WAITER=plymouth-shutdown WAIT_FOR=lightdm TARGET_GOAL=stop WAIT_STATE=waiting || : end script exec /sbin/plymouthd --mode=shutdown post-start exec /bin/plymouth show-splash pre-stop exec /bin/plymouth quit debian/plymouth-theme-script.postinst0000664000000000000000000000170412310333016015252 0ustar #!/bin/sh -e # This script can be called in the following ways: # # After the package was installed: # configure # # # If prerm fails during upgrade or fails on failed upgrade: # abort-upgrade # # If prerm fails during deconfiguration of a package: # abort-deconfigure in-favour # removing # # If prerm fails during replacement due to conflict: # abort-remove in-favour case "$1" in configure) update-alternatives \ --install /lib/plymouth/themes/default.plymouth default.plymouth \ /lib/plymouth/themes/script/script.plymouth 10 if which update-initramfs >/dev/null 2>&1 then update-initramfs -u fi ;; abort-upgrade|abort-deconfigure|abort-remove) ;; *) echo "$0 called with unknown argument \`$1'" 1>&2 exit 1 ;; esac #DEBHELPER# exit 0 debian/plymouth-theme-text.prerm0000664000000000000000000000031012310333016014164 0ustar #!/bin/sh set -e if [ "x$1" = xremove ]; then update-alternatives \ --remove text.plymouth /lib/plymouth/themes/text/text.plymouth rm -f /lib/plymouth/themes/text/text.plymouth fi #DEBHELPER# debian/patches/0000775000000000000000000000000012322011556010614 5ustar debian/patches/details_removeSeparator.patch0000664000000000000000000000106412310333016016514 0ustar Index: trunk/src/plugins/splash/details/plugin.c =================================================================== --- trunk.orig/src/plugins/splash/details/plugin.c +++ trunk/src/plugins/splash/details/plugin.c @@ -344,10 +344,8 @@ } else write_on_views (plugin, - "Password", - strlen ("Password")); - - write_on_views (plugin, ":", strlen (":")); + "Password:", + strlen ("Password:")); for (i = 0; i < bullets; i++) write_on_views (plugin, "*", strlen ("*")); debian/patches/use-upstart-private-socket.patch0000664000000000000000000001623112321753274017103 0ustar Description: use private upstart socket to start earlier Author: Dimitri John Ledkov --- a/src/upstart-bridge/ply-upstart-monitor.c +++ b/src/upstart-bridge/ply-upstart-monitor.c @@ -46,7 +46,6 @@ struct _ply_upstart_monitor { DBusConnection *connection; - char *owner; ply_event_loop_t *loop; ply_hashtable_t *jobs; ply_hashtable_t *all_instances; @@ -74,7 +73,8 @@ uint32_t call_failed : 1; } ply_upstart_monitor_instance_t; -#define UPSTART_SERVICE "com.ubuntu.Upstart" +#define UPSTART_SERVICE NULL +#define DBUS_ADDRESS_UPSTART "unix:abstract=/com/ubuntu/upstart" #define UPSTART_PATH "/com/ubuntu/Upstart" #define UPSTART_INTERFACE_0_6 "com.ubuntu.Upstart0_6" #define UPSTART_INTERFACE_0_6_JOB "com.ubuntu.Upstart0_6.Job" @@ -579,82 +579,6 @@ dbus_message_unref (reply); } -static void -on_get_name_owner_finished (DBusPendingCall *call, - ply_upstart_monitor_t *monitor) -{ - DBusMessage *reply, *message; - DBusError error; - const char *owner; - - assert (call != NULL); - assert (monitor != NULL); - - reply = dbus_pending_call_steal_reply (call); - if (reply == NULL) - return; - if (dbus_message_get_type (reply) != DBUS_MESSAGE_TYPE_METHOD_RETURN) - goto out; - - dbus_error_init (&error); - dbus_message_get_args (reply, &error, - DBUS_TYPE_STRING, &owner, - DBUS_TYPE_INVALID); - if (dbus_error_is_set (&error)) - goto out; - dbus_error_free (&error); - - ply_trace ("owner = '%s'", owner); - - free (monitor->owner); - monitor->owner = strdup (owner); - - ply_trace ("calling GetAllJobs"); - message = dbus_message_new_method_call (UPSTART_SERVICE, UPSTART_PATH, - UPSTART_INTERFACE_0_6, - "GetAllJobs"); - dbus_connection_send_with_reply (monitor->connection, message, &call, -1); - dbus_message_unref (message); - if (call != NULL) - dbus_pending_call_set_notify (call, - (DBusPendingCallNotifyFunction) - on_get_all_jobs_finished, - monitor, NULL); - -out: - dbus_message_unref (reply); -} - -static DBusHandlerResult -name_owner_changed_handler (DBusConnection *connection, - DBusMessage *message, - ply_upstart_monitor_t *monitor) -{ - DBusError error; - const char *name, *old_owner, *new_owner; - - assert (connection != NULL); - assert (message != NULL); - assert (monitor != NULL); - - dbus_error_init (&error); - if (dbus_message_get_args (message, &error, - DBUS_TYPE_STRING, &name, - DBUS_TYPE_STRING, &old_owner, - DBUS_TYPE_STRING, &new_owner, - DBUS_TYPE_INVALID) && - strcmp (name, UPSTART_SERVICE) == 0) - { - if (new_owner) - ply_trace ("owner changed from '%s' to '%s'", old_owner, new_owner); - else - ply_trace ("owner left bus"); - free (monitor->owner); - monitor->owner = new_owner ? strdup (new_owner) : NULL; - } - - return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; /* let other handlers try */ -} static DBusHandlerResult job_added_handler (DBusConnection *connection, @@ -856,12 +780,6 @@ if (path == NULL) return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; - if (dbus_message_is_signal (message, DBUS_INTERFACE_DBUS, - "NameOwnerChanged") && - dbus_message_has_path (message, DBUS_PATH_DBUS) && - dbus_message_has_sender (message, DBUS_SERVICE_DBUS)) - return name_owner_changed_handler (connection, message, monitor); - if (dbus_message_is_signal (message, UPSTART_INTERFACE_0_6, "JobAdded")) return job_added_handler (connection, message, monitor); @@ -899,9 +817,7 @@ DBusError error; DBusConnection *connection; ply_upstart_monitor_t *monitor; - char *rule; DBusMessage *message; - const char *monitor_service = UPSTART_SERVICE; DBusPendingCall *call; dbus_error_init (&error); @@ -909,7 +825,7 @@ /* Get a connection to the system bus and set it up to listen for messages * from Upstart. */ - connection = dbus_bus_get (DBUS_BUS_SYSTEM, &error); + connection = dbus_connection_open (DBUS_ADDRESS_UPSTART, &error); if (connection == NULL) { ply_error ("unable to connect to system bus: %s", error.message); @@ -938,52 +854,17 @@ return NULL; } - asprintf (&rule, "type='%s',sender='%s',path='%s'," - "interface='%s',member='%s',arg0='%s'", - "signal", DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, - DBUS_INTERFACE_DBUS, "NameOwnerChanged", UPSTART_SERVICE); - dbus_bus_add_match (connection, rule, &error); - free (rule); - if (dbus_error_is_set (&error)) - { - ply_error ("unable to add match rule to system bus connection: %s", - error.message); - ply_upstart_monitor_free (monitor); - dbus_error_free (&error); - return NULL; - } - - asprintf (&rule, "type='%s',sender='%s'", "signal", UPSTART_SERVICE); - dbus_bus_add_match (connection, rule, &error); - free (rule); - if (dbus_error_is_set (&error)) - { - ply_error ("unable to add match rule to system bus connection: %s", - error.message); - ply_upstart_monitor_free (monitor); - dbus_error_free (&error); - return NULL; - } - - /* Start the state machine going: find out the current owner of the - * well-known Upstart name. - * Ignore errors: the worst case is that we don't get any messages back - * and our state machine does nothing. - */ - ply_trace ("calling GetNameOwner"); - message = dbus_message_new_method_call (DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, - DBUS_INTERFACE_DBUS, "GetNameOwner"); - dbus_message_append_args (message, - DBUS_TYPE_STRING, &monitor_service, - DBUS_TYPE_INVALID); - dbus_connection_send_with_reply (connection, message, &call, -1); + ply_trace ("calling GetAllJobs"); + message = dbus_message_new_method_call (UPSTART_SERVICE, UPSTART_PATH, + UPSTART_INTERFACE_0_6, + "GetAllJobs"); + dbus_connection_send_with_reply (monitor->connection, message, &call, -1); dbus_message_unref (message); if (call != NULL) dbus_pending_call_set_notify (call, (DBusPendingCallNotifyFunction) - on_get_name_owner_finished, - monitor, - NULL); + on_get_all_jobs_finished, + monitor, NULL); if (loop != NULL) ply_upstart_monitor_connect_to_event_loop (monitor, loop); debian/patches/details-update-status.patch0000664000000000000000000000174112310333016016061 0ustar Description: Implement update status (U) splash plugin function for details plugins Author: Dmitrijs Ledkovs Bug-Ubuntu: https://bugs.launchpad.net/bugs/540645 --- a/src/plugins/splash/details/plugin.c +++ b/src/plugins/splash/details/plugin.c @@ -79,6 +79,9 @@ }; +static void display_message (ply_boot_splash_plugin_t *plugin, + const char *message); + static view_t * view_new (ply_boot_splash_plugin_t *plugin, ply_text_display_t *display) @@ -305,6 +308,19 @@ assert (plugin != NULL); ply_trace ("status update"); + + int progress = 0; + + if (! strncmp("fsck:", status, 5)) { + /* Chop localised formatted string */ + /* fsck:sda1:50:Checking disk %1$d of %2$d (%3$d%% complete) */ + sscanf(status, "fsck:.*:%d:.*", &progress); + char *end = strrchr(status, ':'); + strncpy (end, "%\0", 2); + } + + if (progress < 100) + display_message (plugin, status); } static void debian/patches/avoid-sigpipe.patch0000664000000000000000000000364012310333016014373 0ustar Index: plymouth/src/libply/ply-utils.c =================================================================== --- plymouth.orig/src/libply/ply-utils.c 2011-02-14 13:02:57.386349076 +0100 +++ plymouth/src/libply/ply-utils.c 2011-02-14 13:04:58.816527177 +0100 @@ -294,6 +294,7 @@ { size_t bytes_left_to_write; size_t total_bytes_written = 0; + int is_a_socket = 1; assert (fd >= 0); @@ -303,15 +304,27 @@ { ssize_t bytes_written = 0; - bytes_written = write (fd, - ((uint8_t *) buffer) + total_bytes_written, - bytes_left_to_write); + if (is_a_socket) + bytes_written = send (fd, + ((uint8_t *) buffer) + total_bytes_written, + bytes_left_to_write, + 0 +#if HAVE_DECL_MSG_NOSIGNAL + |MSG_NOSIGNAL +#endif + ); + else + bytes_written = write (fd, + ((uint8_t *) buffer) + total_bytes_written, + bytes_left_to_write); if (bytes_written > 0) { total_bytes_written += bytes_written; bytes_left_to_write -= bytes_written; } + else if ((errno == ENOTSOCK)) + is_a_socket = 0; else if ((errno != EINTR)) break; } Index: plymouth/configure.ac =================================================================== --- plymouth.orig/configure.ac 2011-02-14 13:02:57.406349098 +0100 +++ plymouth/configure.ac 2011-02-14 13:03:48.456423969 +0100 @@ -180,6 +180,8 @@ AC_CHECK_HEADERS([sys/io.h]) AM_CONDITIONAL([BUILD_VGA16FB], [test "x$ac_cv_header_sys_io_h" = xyes]) +AC_CHECK_DECLS([MSG_NOSIGNAL], [], [], [[ #include ]]) + # Turn on the additional warnings last, so -Werror doesn't affect other tests. AC_DEFUN([PLYMOUTH_CC_TRY_FLAG], [ debian/patches/Miscellaneous-fixes-for-compiler-warnings.patch0000664000000000000000000000544412310333016022000 0ustar From a38267d05a9621ef8b1e1a53152338026266b523 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Fri, 28 Jun 2013 14:29:15 -0700 Subject: [PATCH] Miscellaneous fixes for compiler warnings Forwarded: http://lists.freedesktop.org/archives/plymouth/2013-June/000736.html Fix various warnings turned up with -Wall. After fixing these issues, plymouth now builds successfully with gcc 4.8 using "-Werror -Wno-error=unused-result -Wno-error=sign-compare". --- src/main.c | 2 ++ src/plugins/splash/script/script-lib-plymouth.c | 1 + src/plugins/splash/script/script-scan.c | 7 +++++-- 3 files changed, 8 insertions(+), 2 deletions(-) Index: trunk/src/main.c =================================================================== --- trunk.orig/src/main.c +++ trunk/src/main.c @@ -150,8 +150,10 @@ const char *default_tty, bool should_add_displays); static void toggle_between_splash_and_details (state_t *state); +#ifdef PLY_ENABLE_SYSTEMD_INTEGRATION static void tell_systemd_to_print_details (state_t *state); static void tell_systemd_to_stop_printing_details (state_t *state); +#endif static void on_session_output (state_t *state, Index: trunk/src/plugins/splash/script/script-lib-plymouth.c =================================================================== --- trunk.orig/src/plugins/splash/script/script-lib-plymouth.c +++ trunk/src/plugins/splash/script/script-lib-plymouth.c @@ -64,6 +64,7 @@ case PLY_BOOT_SPLASH_MODE_UPDATES: obj = script_obj_new_string ("updates"); break; + case PLY_BOOT_SPLASH_MODE_INVALID: default: obj = script_obj_new_string ("unknown"); break; Index: trunk/src/plugins/splash/script/script-scan.c =================================================================== --- trunk.orig/src/plugins/splash/script/script-scan.c +++ trunk/src/plugins/splash/script/script-scan.c @@ -26,6 +26,7 @@ #include #include #include +#include #include "ply-bitarray.h" #include "script-scan.h" @@ -367,11 +368,13 @@ { int i; - if (scan->tokencount <= n) + /* we're screwed long before we ever actually hit INT_MAX; but at least + * we shouldn't get ourselves stuck in an infinite loop. */ + if (scan->tokencount <= n && n < INT_MAX) { scan->tokens = realloc (scan->tokens, (n + 1) * sizeof (script_scan_token_t *)); - for (i = scan->tokencount; i <= n; i++) /* FIXME warning about possibely inifnite loop */ + for (i = scan->tokencount; i <= n; i++) { scan->tokens[i] = malloc (sizeof (script_scan_token_t)); scan->tokens[i]->type = SCRIPT_SCAN_TOKEN_TYPE_EMPTY; debian/patches/misc-changes.patch0000664000000000000000000003520212310333016014173 0ustar Description: Undocumented changes This patch contains undocumented changes accumulated during previous versions of the Ubuntu plymouth package, that have not yet been split up into individually-documented patches. Please try not to add further things to this patch. Using quilt for new changes is recommended, but if you don't, they'll end up in a separate debian-changes patch at the end of the patch series. Last-Update: 2011-01-21 Index: trunk/src/main.c =================================================================== --- trunk.orig/src/main.c +++ trunk/src/main.c @@ -122,6 +122,7 @@ const char *default_tty; int number_of_errors; + ply_list_t *pending_messages; } state_t; static ply_boot_splash_t *start_boot_splash (state_t *state, @@ -174,8 +175,9 @@ const char *status) { ply_trace ("updating status to '%s'", status); - ply_progress_status_update (state->progress, - status); + if (strncmp (status, "fsck:", 5)) + ply_progress_status_update (state->progress, + status); if (state->boot_splash != NULL) ply_boot_splash_update_status (state->boot_splash, status); @@ -227,6 +229,25 @@ } static void +flush_pending_messages (state_t *state) +{ + ply_list_node_t *node = ply_list_get_first_node (state->pending_messages); + while (node != NULL) + { + ply_list_node_t *next_node; + char *message = ply_list_node_get_data (node); + + ply_trace ("displaying queued message"); + + ply_boot_splash_display_message (state->boot_splash, message); + next_node = ply_list_get_next_node (state->pending_messages, node); + ply_list_remove_node (state->pending_messages, node); + free(message); + node = next_node; + } +} + +static void show_messages (state_t *state) { if (state->boot_splash == NULL) @@ -435,7 +456,7 @@ ply_trace ("Could not start default splash screen," "showing text splash screen"); state->boot_splash = start_boot_splash (state, - PLYMOUTH_THEME_PATH "text/text.plymouth", + PLYMOUTH_THEME_PATH "text.plymouth", false); } @@ -444,12 +465,15 @@ ply_trace ("Could not start text splash screen," "showing built-in fallback"); state->boot_splash = start_boot_splash (state, - PLYMOUTH_THEME_PATH "text/text.plymouth", + PLYMOUTH_THEME_PATH "text.plymouth", true); } if (state->boot_splash == NULL) - ply_error ("plymouthd: could not start boot splash: %m"); + { + if (errno != ENOENT) + ply_error ("plymouthd: could not start boot splash: %m"); + } } static void @@ -503,8 +527,10 @@ ply_boot_splash_display_message (state->boot_splash, message); } else - ply_trace ("not displaying message %s as no splash", message); - ply_list_append_data (state->messages, strdup(message)); + { + ply_trace ("not displaying message %s as no splash", message); + ply_list_append_data (state->messages, strdup(message)); + } } static void @@ -721,6 +747,7 @@ if (state->number_of_errors > 0) spool_error (state); } + flush_pending_messages (state); } static void @@ -1506,6 +1533,10 @@ ply_text_display_t *display; ply_keyboard_t *keyboard; + // urgh + if (!ply_terminal_open (state->terminal)) + return; + keyboard = ply_keyboard_new_for_terminal (terminal); display = ply_text_display_new (terminal); @@ -2209,6 +2240,7 @@ state->entry_buffer = ply_buffer_new(); state->pixel_displays = ply_list_new (); state->text_displays = ply_list_new (); + state->pending_messages = ply_list_new (); state->messages = ply_list_new (); state->keyboard = NULL; Index: trunk/src/plugins/splash/script/script-lib-image.c =================================================================== --- trunk.orig/src/plugins/splash/script/script-lib-image.c +++ trunk/src/plugins/splash/script/script-lib-image.c @@ -173,7 +173,7 @@ alpha_obj = script_obj_hash_peek_element (state->local, "alpha"); - if (script_obj_is_number (alpha_obj)) + if (alpha_obj && script_obj_is_number (alpha_obj)) { alpha = CLAMP(script_obj_as_number (alpha_obj), 0, 1); } Index: trunk/src/plugins/splash/script/script-lib-sprite.c =================================================================== --- trunk.orig/src/plugins/splash/script/script-lib-sprite.c +++ trunk/src/plugins/splash/script/script-lib-sprite.c @@ -399,6 +399,45 @@ return script_return_obj_null (); } +static script_return_t sprite_window_get_bits_per_pixel (script_state_t *state, + void *user_data) +{ + script_lib_sprite_data_t *data = user_data; + ply_list_node_t *node; + int index; + script_obj_t *index_obj; + script_lib_display_t *display; + unsigned int bits_per_pixel; + + index_obj = script_obj_hash_peek_element (state->local, "window"); + + if (index_obj) + { + index = script_obj_as_number (index_obj); + script_obj_unref(index_obj); + if (index < 0) + return script_return_obj_null (); + node = ply_list_get_nth_node (data->displays, index); + if (node == NULL) + return script_return_obj_null (); + display = ply_list_node_get_data (node); + bits_per_pixel = ply_pixel_display_get_bits_per_pixel (display->pixel_display); + return script_return_obj (script_obj_new_number (bits_per_pixel)); + } + + bits_per_pixel = 0; + for (node = ply_list_get_first_node (data->displays); + node; + node = ply_list_get_next_node (data->displays, node)) + { + display = ply_list_node_get_data (node); + bits_per_pixel = ply_pixel_display_get_bits_per_pixel (display->pixel_display); + if (bits_per_pixel) + break; + } + return script_return_obj (script_obj_new_number (bits_per_pixel)); +} + static uint32_t extract_rgb_color (script_state_t *state) { uint8_t red = CLAMP (255 * script_obj_hash_get_number (state->local, "red"), 0, 255); @@ -649,6 +688,12 @@ "value", NULL); script_add_native_function (window_hash, + "GetBitsPerPixel", + sprite_window_get_bits_per_pixel, + data, + "window", + NULL); + script_add_native_function (window_hash, "SetBackgroundTopColor", sprite_window_set_background_top_color, data, Index: trunk/src/plugins/splash/script/plugin.c =================================================================== --- trunk.orig/src/plugins/splash/script/plugin.c +++ trunk/src/plugins/splash/script/plugin.c @@ -467,6 +467,8 @@ become_idle (ply_boot_splash_plugin_t *plugin, ply_trigger_t *idle_trigger) { + stop_animation (plugin); + ply_trigger_pull (idle_trigger, NULL); } Index: trunk/src/plugins/splash/text/plugin.c =================================================================== --- trunk.orig/src/plugins/splash/text/plugin.c +++ trunk/src/plugins/splash/text/plugin.c @@ -481,7 +481,10 @@ terminal = ply_text_display_get_terminal (view->display); if (ply_terminal_open (terminal)) - ply_terminal_activate_vt (terminal); + { + ply_terminal_set_mode (terminal, PLY_TERMINAL_MODE_TEXT); + ply_terminal_activate_vt (terminal); + } ply_text_display_set_draw_handler (view->display, (ply_text_display_draw_handler_t) Index: trunk/src/libply-splash-core/ply-pixel-display.h =================================================================== --- trunk.orig/src/libply-splash-core/ply-pixel-display.h +++ trunk/src/libply-splash-core/ply-pixel-display.h @@ -48,6 +48,7 @@ unsigned long ply_pixel_display_get_width (ply_pixel_display_t *display); unsigned long ply_pixel_display_get_height (ply_pixel_display_t *display); +unsigned int ply_pixel_display_get_bits_per_pixel (ply_pixel_display_t *display); void ply_pixel_display_set_draw_handler (ply_pixel_display_t *display, ply_pixel_display_draw_handler_t draw_handler, Index: trunk/src/libply-splash-core/ply-renderer.c =================================================================== --- trunk.orig/src/libply-splash-core/ply-renderer.c +++ trunk/src/libply-splash-core/ply-renderer.c @@ -328,6 +328,21 @@ head); } +unsigned int +ply_renderer_get_bits_per_pixel_for_head (ply_renderer_t *renderer, + ply_renderer_head_t *head) +{ + assert (renderer != NULL); + assert (renderer->plugin_interface != NULL); + assert (head != NULL); + + if (!renderer->plugin_interface->get_bits_per_pixel_for_head) + return 0; + + return renderer->plugin_interface->get_bits_per_pixel_for_head (renderer->backend, + head); +} + void ply_renderer_flush_head (ply_renderer_t *renderer, ply_renderer_head_t *head) Index: trunk/src/libply-splash-core/ply-renderer.h =================================================================== --- trunk.orig/src/libply-splash-core/ply-renderer.h +++ trunk/src/libply-splash-core/ply-renderer.h @@ -51,6 +51,8 @@ ply_list_t *ply_renderer_get_heads (ply_renderer_t *renderer); ply_pixel_buffer_t *ply_renderer_get_buffer_for_head (ply_renderer_t *renderer, ply_renderer_head_t *head); +unsigned int ply_renderer_get_bits_per_pixel_for_head (ply_renderer_t *renderer, + ply_renderer_head_t *head); void ply_renderer_flush_head (ply_renderer_t *renderer, ply_renderer_head_t *head); Index: trunk/src/libply-splash-core/ply-pixel-display.c =================================================================== --- trunk.orig/src/libply-splash-core/ply-pixel-display.c +++ trunk/src/libply-splash-core/ply-pixel-display.c @@ -51,6 +51,7 @@ unsigned long width; unsigned long height; + unsigned int bits_per_pixel; ply_pixel_display_draw_handler_t draw_handler; void *draw_handler_user_data; @@ -79,6 +80,9 @@ display->width = size.width; display->height = size.height; + display->bits_per_pixel = ply_renderer_get_bits_per_pixel_for_head (renderer, + head); + return display; } @@ -94,6 +98,12 @@ return display->height; } +unsigned int +ply_pixel_display_get_bits_per_pixel (ply_pixel_display_t *display) +{ + return display->bits_per_pixel; +} + static void ply_pixel_display_flush (ply_pixel_display_t *display) { Index: trunk/src/libply-splash-core/ply-renderer-plugin.h =================================================================== --- trunk.orig/src/libply-splash-core/ply-renderer-plugin.h +++ trunk/src/libply-splash-core/ply-renderer-plugin.h @@ -54,6 +54,8 @@ ply_pixel_buffer_t * (* get_buffer_for_head) (ply_renderer_backend_t *backend, ply_renderer_head_t *head); + unsigned int (* get_bits_per_pixel_for_head) (ply_renderer_backend_t *backend, + ply_renderer_head_t *head); ply_renderer_input_source_t * (* get_input_source) (ply_renderer_backend_t *backend); bool (* open_input_source) (ply_renderer_backend_t *backend, Index: trunk/src/client/ply-boot-client.c =================================================================== --- trunk.orig/src/client/ply-boot-client.c +++ trunk/src/client/ply-boot-client.c @@ -269,14 +269,34 @@ return; } - request_node = ply_list_get_first_node (client->requests_waiting_for_replies); - assert (request_node != NULL); + if (!ply_read (client->socket_fd, byte, sizeof (uint8_t))) + { + ply_error ("could not read response from boot status daemon"); + return; + } - request = (ply_boot_client_request_t *) ply_list_node_get_data (request_node); - assert (request != NULL); + for (request_node = ply_list_get_first_node (client->requests_waiting_for_replies); + ; request_node = ply_list_get_next_node (client->requests_waiting_for_replies, request_node)) + { + assert (request_node != NULL); + request = (ply_boot_client_request_t *) ply_list_node_get_data (request_node); + assert (request != NULL); - if (!ply_read (client->socket_fd, byte, sizeof (uint8_t))) - goto out; + if (! strcmp (request->command, PLY_BOOT_PROTOCOL_REQUEST_TYPE_PASSWORD) + || ! strcmp (request->command, PLY_BOOT_PROTOCOL_REQUEST_TYPE_QUESTION) + || ! strcmp (request->command, PLY_BOOT_PROTOCOL_REQUEST_TYPE_KEYSTROKE)) + { + if (! memcmp (byte, PLY_BOOT_PROTOCOL_RESPONSE_TYPE_ANSWER, sizeof (uint8_t)) + || ! memcmp (byte, PLY_BOOT_PROTOCOL_RESPONSE_TYPE_NO_ANSWER, sizeof (uint8_t))) + break; + } + else + { + if (memcmp (byte, PLY_BOOT_PROTOCOL_RESPONSE_TYPE_ANSWER, sizeof (uint8_t)) + && memcmp (byte, PLY_BOOT_PROTOCOL_RESPONSE_TYPE_NO_ANSWER, sizeof (uint8_t))) + break; + } + } if (memcmp (byte, PLY_BOOT_PROTOCOL_RESPONSE_TYPE_ACK, sizeof (uint8_t)) == 0) { Index: trunk/src/plugins/renderers/frame-buffer/plugin.c =================================================================== --- trunk.orig/src/plugins/renderers/frame-buffer/plugin.c +++ trunk/src/plugins/renderers/frame-buffer/plugin.c @@ -644,6 +644,16 @@ return backend->head.pixel_buffer; } +static unsigned int +get_bits_per_pixel_for_head (ply_renderer_backend_t *backend, + ply_renderer_head_t *head) +{ + if (head != &backend->head) + return 0; + + return backend->bytes_per_pixel * 8; +} + static bool has_input_source (ply_renderer_backend_t *backend, ply_renderer_input_source_t *input_source) @@ -737,6 +747,7 @@ .flush_head = flush_head, .get_heads = get_heads, .get_buffer_for_head = get_buffer_for_head, + .get_bits_per_pixel_for_head = get_bits_per_pixel_for_head, .get_input_source = get_input_source, .open_input_source = open_input_source, .set_handler_for_input_source = set_handler_for_input_source, debian/patches/ubuntu-logo.patch0000664000000000000000000012073312310333016014116 0ustar Description: Add ubuntu-logo theme Author: Alberto Milone Forwarded: not-needed Last-Update: 2011-01-21 --- a/configure.ac +++ b/configure.ac @@ -455,6 +455,7 @@ themes/glow/Makefile themes/spinner/Makefile themes/script/Makefile + themes/ubuntu-logo/Makefile images/Makefile scripts/plymouth-generate-initrd scripts/plymouth-populate-initrd --- a/themes/Makefile.am +++ b/themes/Makefile.am @@ -1,2 +1,2 @@ -SUBDIRS = spinfinity fade-in text details solar glow script spinner +SUBDIRS = spinfinity fade-in text details solar glow script spinner ubuntu-logo MAINTAINERCLEANFILES = Makefile.in --- /dev/null +++ b/themes/ubuntu-logo/Makefile.am @@ -0,0 +1,23 @@ +themedir = $(datadir)/plymouth/themes/ubuntu-logo +nodist_theme_DATA = ubuntu-logo.plymouth +dist_theme_DATA = ubuntu-logo.script \ + ubuntu-logo.grub \ + ubuntu_logo.png \ + ubuntu_logo16.png \ + password_field.png \ + password_field16.png \ + progress_dot_off.png \ + progress_dot_off16.png \ + progress_dot_on.png \ + progress_dot_on16.png + + + +MAINTAINERCLEANFILES = Makefile.in ubuntu-logo.plymouth +CLEANFILES = ubuntu-logo.plymouth + +ubuntu-logo.plymouth: $(srcdir)/ubuntu-logo.plymouth.in + sed -e 's,[@]PLYMOUTH_THEME_PATH[@],$(PLYMOUTH_THEME_PATH),g' \ + $(srcdir)/ubuntu-logo.plymouth.in > ubuntu-logo.plymouth + +EXTRA_DIST = ubuntu-logo.plymouth.in --- /dev/null +++ b/themes/ubuntu-logo/ubuntu-logo.plymouth.in @@ -0,0 +1,8 @@ +[Plymouth Theme] +Name=Ubuntu Logo +Description=A theme that features a blank background with a logo. +ModuleName=script + +[script] +ImageDir=@PLYMOUTH_THEME_PATH@/ubuntu-logo +ScriptFile=@PLYMOUTH_THEME_PATH@/ubuntu-logo/ubuntu-logo.script --- /dev/null +++ b/themes/ubuntu-logo/ubuntu-logo.script @@ -0,0 +1,1128 @@ +# ubuntu-logo.script - boot splash plugin +# +# Copyright (C) 2009 Canonical Ltd. +# +# This program 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; either version 2, or (at your option) +# any later version. +# +# This program 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 program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. +# +# Written by: Alberto Milone +# +# Based on the example provided with the "script plugin" written by: +# Charlie Brej +# +# Question stuff written by: Markus Waas +# +# + +# Set the text colour in (rgb / 256) +text_colour.red = 1.0; +text_colour.green = 1.0; +text_colour.blue = 1.0; + +# Tinted text #988592 +tinted_text_colour.red = 0.59; +tinted_text_colour.green = 0.52; +tinted_text_colour.blue = 0.57; + +# Action Text - #ffffff - RGB 255 255 255 +action_text_colour.red = 1.0; +action_text_colour.green = 1.0; +action_text_colour.blue = 1.0; + +# Orange - #ff4012 - RGB 255 64 18 +debugsprite = Sprite(); +debugsprite_bottom = Sprite(); +debugsprite_medium = Sprite(); + +# are we currently prompting for a password? +prompt_active = 0; + +# General purpose function to create text +fun WriteText (text, colour) { + image = Image.Text (text, colour.red, colour.green, colour.blue); + return image; +} + +fun ImageToText (text) { + image = WriteText (text, text_colour); + return image; +} + +fun ImageToTintedText (text) { + image = WriteText (text, tinted_text_colour); + return image; +} + +fun ImageToActionText (text) { + image = WriteText (text, action_text_colour); + return image; +} + +fun Debug(text) { + debugsprite.SetImage(ImageToText (text)); +} + +fun DebugBottom(text) { + debugsprite_bottom.SetImage(ImageToText (text)); + debugsprite_bottom.SetPosition(0, (Window.GetHeight (0) - 20), 1); +} + +fun DebugMedium(text) { + debugsprite_medium.SetImage(ImageToText (text)); + debugsprite_medium.SetPosition(0, (Window.GetHeight (0) - 60), 1); +} + +fun TextYOffset() { + local.y; + local.text_height; + local.min_height; + + # Put the 1st line below the logo + some spacing + y = logo.y + logo.height + (progress_indicator.bullet_height * 7 ); # + logo_spacing; + + text_height = first_line_height * 7.5; + + min_height = Window.GetHeight(); + if (y + text_height > min_height) + y = min_height - text_height; + + if (y < progress_indicator.y + progress_indicator.height) + return progress_indicator.y + progress_indicator.height; + return y; +} + +#------------------------------String functions------------------------------- + +# This is the equivalent for strstr() +fun StringString(string, substring) { + start = 0; + while (String(string).CharAt (start)) { + walk = 0; + while (String(substring).CharAt (walk) == String(string).CharAt (start + walk) ) { + walk++; + if (!String(substring).CharAt (walk)) return start; + } + start++; + } + + return NULL; +} + +fun StringLength (string) { + index = 0; + while (String(string).CharAt(index)) index++; + return index; +} + +fun StringCopy (source, beginning, end) { + local.destination = ""; + for (index = beginning; ( ( (end == NULL) || (index <= end) ) && (String(source).CharAt(index)) ); index++) { + local.destination += String(source).CharAt(index); + } + + return local.destination; +} + +fun StringReplace (source, pattern, replacement) { + local.found = StringString(source, pattern); + if (local.found == NULL) + return source; + + local.new_string = StringCopy (source, 0, local.found - 1) + + replacement + + StringCopy (source, local.found + StringLength(pattern), NULL); + + return local.new_string; +} + +# it makes sense to use it only for +# numbers up to 100 +fun StringToInteger (str) { + int = -1; + for (i=0; i<=100; i++) { + if (i+"" == str) { + int = i; + break; + } + } + return int; +} + +#----------------------------------------------------------------------------- +# Previous background colour +# #300a24 --> 0.19, 0.04, 0.14 +# New background colour +# #2c001e --> 0.16, 0.00, 0.12 +# +Window.SetBackgroundTopColor (0.16, 0.00, 0.12); # Nice colour on top of the screen fading to +Window.SetBackgroundBottomColor (0.16, 0.00, 0.12); # an equally nice colour on the bottom + +bits_per_pixel = Window.GetBitsPerPixel (); +if (bits_per_pixel == 4) { + logo_filename = "ubuntu_logo16.png"; + progress_dot_off_filename = "progress_dot_off16.png"; + progress_dot_on_filename = "progress_dot_on16.png"; + password_field_filename = "password_field16.png"; + question_field_filename = "password_field16.png"; +} else { + logo_filename = "ubuntu_logo.png"; + progress_dot_off_filename = "progress_dot_off.png"; + progress_dot_on_filename = "progress_dot_on.png"; + password_field_filename = "password_field.png"; + question_field_filename = "password_field.png"; +} + +logo.image = Image (logo_filename); +logo.sprite = Sprite (); +logo.sprite.SetImage (logo.image); +logo.width = logo.image.GetWidth (); +logo.height = logo.image.GetHeight (); +logo.x = Window.GetX () + Window.GetWidth () / 2 - logo.width / 2; +logo.y = Window.GetY () + Window.GetHeight () / 2 - logo.height; +logo.z = 1000; +logo.sprite.SetX (logo.x); +logo.sprite.SetY (logo.y); +logo.sprite.SetZ (logo.z); +logo.sprite.SetOpacity (1); + +# Spacing below the logo - in pixels +logo_spacing = logo.height * 4; + +message_notification[0].image = ImageToTintedText (""); +message_notification[1].image = ImageToTintedText (""); +fsck_notification.image = ImageToActionText (""); + +status = "normal"; + +progress_indicator.bullet_off = Image (progress_dot_off_filename); +progress_indicator.bullet_on = Image (progress_dot_on_filename); +progress_indicator.bullet_width = progress_indicator.bullet_off.GetWidth (); +progress_indicator.bullet_height = progress_indicator.bullet_off.GetHeight (); +progress_indicator.bullet_hspacing = progress_indicator.bullet_width * 1.1; +progress_indicator.width = progress_indicator.bullet_width * 5; +progress_indicator.height = progress_indicator.bullet_height; +progress_indicator.y = logo.y + logo.height + (logo.height / 4); +progress_indicator.x = Window.GetX () + Window.GetWidth () / 2 - progress_indicator.width / 2; # logo.x + 26; + +# use a fixed string with ascending and descending stems to calibrate the +# bounding box for the first message, so the messages below don't move up +# and down according to *their* height. +first_line_height = ImageToTintedText ("AfpqtM").GetHeight(); + +# if the user has a 640x480 or 800x600 display, we can't quite fit everything +# (including passphrase prompts) with the target spacing, so scoot the text up +# a bit if needed. +top_of_the_text = TextYOffset(); + +#-----------------------------------------Logo functions------------------------------ + +# Call this when updating the screen +fun draw_logo () { + logo.sprite.SetX (logo.x); + logo.sprite.SetY (logo.y); + logo.sprite.SetZ (logo.z); + logo.sprite.SetOpacity (1); +} + + +#-----------------------------------------Progress Indicator-------------------------- +fun set_progress_indicator () { + + + # Here we assume that we can store half bullets on each half of the screen + # together with some spacing + local.x = progress_indicator.x; + + for (index = 0; index <= 4; index++) { + # Set the "off" bullets + progress_indicator.bullets_off[index].sprite = Sprite (progress_indicator.bullet_off); + progress_indicator.bullets_off[index].sprite.SetPosition (local.x, progress_indicator.y, 1000); + progress_indicator.bullets_off[index].x = local.x; + progress_indicator.bullets_off[index].y = progress_indicator.y; + progress_indicator.bullets_off[index].sprite.SetOpacity (1); + + #local.debug_medium_string = "Progress indicator " + index + ": x = " + progress_indicator.bullets_off[index].x + + # ", y = " + progress_indicator.bullets_off[index].y + ", logo width = " + logo.width + + # ", logo height = " + logo.height + " " + screen_width + " " + screen_height; + # + #(index % 2) && DebugMedium (local.debug_medium_string) || DebugBottom (local.debug_medium_string); + + # Set the "on" bullets on top of the "off" bullets and make them transparent + progress_indicator.bullets_on[index].sprite = Sprite (progress_indicator.bullet_on); + progress_indicator.bullets_on[index].x = progress_indicator.bullets_off[index].x; + progress_indicator.bullets_on[index].y = progress_indicator.bullets_off[index].y; + progress_indicator.bullets_on[index].sprite.SetPosition (progress_indicator.bullets_on[index].x, progress_indicator.bullets_on[index].y, 10000); + + progress_indicator.bullets_on[index].sprite.SetOpacity (0); + + local.x += progress_indicator.bullet_hspacing; + } + #local.debug_string = "Progress indicator: x1 = " + progress_indicator.x + ", x2 = " + local.x + ", y = " + progress_indicator.y + + # ", x logo = " + logo.x + ", y logo = " + logo.y + ", indicator width = " + progress_indicator.width; + #Debug(progress_indicator.bullets_off[0].x); +} + + +# We have 2 bullets, one on top of the other: +# The white one is on top of the red one and the former should +# slowly fade so as to get a nice transition effect. +fun switch_on_bullet (bullets_off, bullets_on, bullet_number, opacity) { + local.x = bullets_on[bullet_number].x; + local.y = bullets_on[bullet_number].y; + local.z = bullets_on[bullet_number].z; + + # Hide the bullets which are off + bullets_off[bullet_number].sprite.SetOpacity (0); + + # Show the bullets which are on + bullets_on[bullet_number].sprite.SetPosition (local.x, local.y, local.z); + bullets_on[bullet_number].sprite.SetOpacity (opacity); + + # Bump the number of times we have switched on bullets + global.times_bullets_switched++; +} + +fun switch_off_bullets () { + # Debug("Switching off progress indicator"); + + set_progress_indicator (); + global.times_bullets_switched = 0; + global.on_off = 1; +} + +# This is something that we can call when we exit +fun switch_on_bullets () { + # Debug("Switching off progress indicator"); + if (!global.progress_indicator.bullets_on) set_progress_indicator (); + local = global.progress_indicator; + + for (index = 0; bullets_on[index]; index++) { + switch_on_bullet (bullets_off, bullets_on, index, 1.0); + } +} + + +# Implement in boot progress callback +fun animate_progress_indicator (progress, time) { + if (global.progress_time == NULL) { + global.progress_time = progress; #time; + switch_off_bullets (); + } + +# Debug ("progress = " + progress + ", time = " + time + " times switched = " + global.times_bullets_switched + " on_off " + global.on_off); + +# if (global.times_bullets_switched == NULL) +# global.times_bullets_switched = 5; + +# if (global.on_off == NULL) +# global.on_off = 0; + + if ((progress - global.progress_time) >= 1.0) { + global.progress_time = progress; + + if (global.times_bullets_switched == 5) { + # Change which bullets are switched on + # and which ones are switched off + global.on_off = !global.on_off; + global.times_bullets_switched = 0; + } + + if (global.on_off) { + switch_on_bullet (progress_indicator.bullets_off, progress_indicator.bullets_on, + global.times_bullets_switched, 1.0); + } + else { + switch_on_bullet (progress_indicator.bullets_on, progress_indicator.bullets_off, + global.times_bullets_switched, 1.0); + } + } + + + # Start setting bullets to "on" with translucency +# for (index = 0; index <= 5; index++) { +# opacity = 0.0; +# while (opacity <= 1.0) { +# switch_on_bullet (progress_indicator.bullets_off, progress_indicator.bullets_on, +# index, opacity); +# opacity += 0.1; +# } +# } +} + + +#-----------------------------------------Label utility functions--------------------- + +# label should be either a string or NULL +# Images for n lines will be created and returned as items of the +# message_label array +# +fun get_message_label (label, is_fake, is_action_line) { + # Debug("Get Label position"); + local.message_label; + + if (is_fake) + # Create a fake label so as to get the y coordinate of + # a standard-length label. + local.message_image = ImageToTintedText ("This is a fake message"); + else + local.message_image = (is_action_line) && ImageToActionText (label) || ImageToTintedText (label); + + message_label.width = message_image.GetWidth (); + message_label.height = message_image.GetHeight (); + + # Center the line horizontally + message_label.x = Window.GetX () + Window.GetWidth () / 2 - message_label.width / 2; + + message_label.y = top_of_the_text; + + # Put the 2nd line below the fsck line + if (is_action_line) { + local.fsck_label.y = message_label.y + (first_line_height + first_line_height / 2); + message_label.y = local.fsck_label.y + (first_line_height * 2); + } + + # Debug("action label x = " + message_label.x + " y = " + message_label.y ); + +# message_debug = "msg_x = " + message_label.x + " msg_y = " + message_label.y + +# "msg_width = " + message_label.width + " msg_height = " + +# message_label.height + " message = " + label; +# Debug(message_debug); + + return message_label; + +} + +# Create an fsck label and/or get its position +fun get_fsck_label (label, is_fake) { + # Debug("Get Label position"); + local.fsck_label = global.progress_label; + + if (is_fake) + fsck_label.image = ImageToTintedText ("This is a fake message"); + else + fsck_label.image = ImageToTintedText (label); + + fsck_label.width = fsck_label.image.GetWidth (); + fsck_label.height = fsck_label.image.GetHeight (); + + # Centre the label horizontally + fsck_label.x = Window.GetX () + Window.GetWidth () / 2 - fsck_label.width / 2; + + local.first_label = get_message_label (label, 1, 0); + + # Place the label below the 1st message line + fsck_label.y = local.first_label.y + local.first_label.height + (local.first_label.height / 2); + +# message_debug = "msg_x = " + fsck_label.x + " msg_y = " + fsck_label.y + +# "msg_width = " + fsck_label.width + " msg_height = " + +# fsck_label.height + " message = " + label; +# Debug(message_debug); + + return fsck_label; +} + +#-----------------------------------------Message stuff -------------------------------- +# + +# Set up a message label +# +# NOTE: this is called when doing something like 'plymouth message "hello world"' +# +fun setup_message (message_text, x, y, z, index) { + # Debug("Message setup"); + global.message_notification[index].image = (index) && ImageToActionText (message_text) || ImageToTintedText (message_text); + + # Set up the text message, if any + message_notification[index].x = x; + message_notification[index].y = y; + message_notification[index].z = z; + + message_notification[index].sprite = Sprite (); + message_notification[index].sprite.SetImage (message_notification[index].image); + message_notification[index].sprite.SetX (message_notification[index].x); + message_notification[index].sprite.SetY (message_notification[index].y); + message_notification[index].sprite.SetZ (message_notification[index].z); + +} + +fun show_message (index) { + if (global.message_notification[index].sprite) global.message_notification[index].sprite.SetOpacity(1); +} + +fun hide_message (index) { + if (global.message_notification[index].sprite) global.message_notification[index].sprite.SetOpacity(0); +} + + + + +# the callback function is called when new message should be displayed. +# First arg is message to display. +fun message_callback (message) +{ + # Debug("Message callback"); + is_fake = 0; + if (!message || (message == "")) is_fake = 1; + + local.substring = "keys:"; + + # Look for the "keys:" prefix + local.keys = StringString(message, local.substring); + + local.is_action_line = (keys != NULL); + #Debug("keys " + local.keys + " substring length = " + StringLength(local.substring)); + + # Get the message without the "keys:" prefix + if (keys != NULL) + message = StringCopy (message, keys + StringLength(local.substring), NULL); + + local.label.is_fake = is_fake; + label = get_message_label(message, is_fake, is_action_line); + label.z = 10000; + + setup_message (message, label.x, label.y, label.z, is_action_line); + if (prompt_active && local.is_action_line) + hide_message (is_action_line); + else + show_message (is_action_line); + +} + + +#-----------------------------------------Display Password stuff ----------------------- +# + +fun password_dialogue_setup (message_label) { + # Debug("Password dialog setup"); + + local.entry; + local.bullet_image; + + bullet_image = Image (progress_dot_off_filename); + entry.image = Image (password_field_filename); + + # Hide the normal labels + prompt_active = 1; + if (message_notification[1].sprite) hide_message (1); + + # Set the prompt label + label = get_message_label(message_label, 0, 1); + label.z = 10000; + + setup_message (message_label, label.x, label.y, label.z, 2); + show_message (2); + + # Set up the text entry which contains the bullets + entry.sprite = Sprite (); + entry.sprite.SetImage (entry.image); + + # Centre the box horizontally + entry.x = Window.GetX () + Window.GetWidth () / 2 - entry.image.GetWidth () / 2; + + # Put the entry below the second label. + entry.y = message_notification[2].y + label.height; + + #Debug ("entry x = " + entry.x + ", y = " + entry.y); + entry.z = 10000; + entry.sprite.SetX (entry.x); + entry.sprite.SetY (entry.y); + entry.sprite.SetZ (entry.z); + + global.password_dialogue = local; +} + +fun password_dialogue_opacity (opacity) { + # Debug("Password dialog opacity"); + global.password_dialogue.opacity = opacity; + local = global.password_dialogue; + + # You can make the box translucent with a float + # entry.sprite.SetOpacity (0.3); + entry.sprite.SetOpacity (opacity); + label.sprite.SetOpacity (opacity); + + if (bullets) { + for (index = 0; bullets[index]; index++) { + bullets[index].sprite.SetOpacity (opacity); + } + } +} + + +# The callback function is called when the display should display a password dialogue. +# First arg is prompt string, the second is the number of bullets. +fun display_password_callback (prompt, bullets) { + # Debug("Password dialog setup"); + + global.status = "password"; + if (!global.password_dialogue) password_dialogue_setup(prompt); + password_dialogue_opacity (1); + bullet_width = password_dialogue.bullet_image.GetWidth(); + bullet_y = password_dialogue.entry.y + + password_dialogue.entry.image.GetHeight () / 2 - + password_dialogue.bullet_image.GetHeight () / 2; + margin = bullet_width; + spaces = Math.Int( (password_dialogue.entry.image.GetWidth () - (margin * 2) ) / ( 2 * bullet_width / 3 ) ); + #Debug ("spaces = " + spaces + ", bullets = " + bullets); + bullets_area.width = margin + spaces * ( 2 * bullet_width / 3); + bullets_area.x = Window.GetX () + Window.GetWidth () / 2 - bullets_area.width / 2; + #DebugBottom ("pwd_entry x = " + password_dialogue.entry.x + ", bullets_area.x = " + bullets_area.x + ", bullets_area.width = " + bullets_area.width); + if (bullets > spaces) + bullets = spaces; + for (index = 0; password_dialogue.bullets[index] || index < spaces ; index++){ + if (!password_dialogue.bullets[index]) { + password_dialogue.bullets[index].sprite = Sprite (); + password_dialogue.bullets[index].sprite.SetImage (password_dialogue.bullet_image); + password_dialogue.bullets[index].x = bullets_area.x + # password_dialogue.entry.x + margin + + index * ( 2 * bullet_width / 3 ) ; + password_dialogue.bullets[index].sprite.SetX (password_dialogue.bullets[index].x); + password_dialogue.bullets[index].y = bullet_y; + password_dialogue.bullets[index].sprite.SetY (password_dialogue.bullets[index].y); + password_dialogue.bullets[index].z = password_dialogue.entry.z + 100 - index; + password_dialogue.bullets[index].sprite.SetZ (password_dialogue.bullets[index].z); + } + + password_dialogue.bullets[index].sprite.SetOpacity (0); + + if (index < bullets ) { + password_dialogue.bullets[index].sprite.SetOpacity (1); + } + } +} + +Plymouth.SetDisplayPasswordFunction (display_password_callback); + +Plymouth.SetMessageFunction (message_callback); + +Plymouth.SetBootProgressFunction (animate_progress_indicator); + +# Plymouth.SetBootProgressFunction: the callback function is called with two numbers, the progress (between 0 and 1) and the time spent booting so far +# Plymouth.SetRootMountedFunction: the callback function is called when a new root is mounted +# Plymouth.SetKeyboardInputFunction: the callback function is called with a string containing a new character entered on the keyboard + +#----------------------------------------- FSCK Counter -------------------------------- + +# Initialise the counter +fun init_fsck_count () { + # The number of fsck checks in this cycle + global.counter.total = 0; + # The number of fsck checks already performed + the current one + global.counter.current = 1; + # The previous fsck + global.counter.last = 0; +} + +# Increase the total counter +fun increase_fsck_count () { + global.counter.total++; +} + +fun increase_current_fsck_count () { + global.counter.last = global.counter.current++; +} + +# Clear the counter +fun clear_fsck_count () { + global.counter = NULL; + init_fsck_count (); +} + +#----------------------------------------- Progress Label ------------------------------ + + +# Change the opacity level of a progress label +# +# opacity = 1 -> show +# opacity = 0 -> hide +# opacity = 0.3 (or any other float) -> translucent +# +fun set_progress_label_opacity (opacity) { + # the label + progress_label.sprite.SetOpacity (opacity); + + # Make the slot available again when hiding the bar + # So that another bar can take its place + if (opacity == 0) { + progress_label.is_available = 1; + progress_label.device = ""; + } +} + +# Set up a new Progress Bar +# +# TODO: Make it possible to reuse (rather than recreate) a bar +# if .is_available = 1. Ideally this would just reset the +# label, the associated +# device and the image size of the sprite. + +fun init_progress_label (device, status_string) { + # Make the slot unavailable + global.progress_label.is_available = 0; + progress_label.progress = 0; + progress_label.device = device; + progress_label.status_string = status_string; +} + +# See if the progress label is keeping track of the fsck +# of "device" +# +fun device_has_progress_label (device) { + #DebugBottom ("label device = " + progress_label.device + " checking device " + device); + return (progress_label.device == device); +} + +# Update the Progress bar which corresponds to index +# +fun update_progress_label (progress) { + # If progress is NULL then we just refresh the label. + # This happens when only counter.total has changed. + if (progress != NULL) { + progress_label.progress = progress; + + #Debug("device " + progress_label.device + " progress " + progress); + + # If progress >= 100% hide the label and make it available again + if (progress >= 100) { + set_progress_label_opacity (0); + + # See if we any other fsck check is complete + # and, if so, hide the progress bars and the labels + on_fsck_completed (); + + return 0; + } + } + # Update progress label here + # + # FIXME: the queue logic from this theme should really be moved into mountall + # instead of using string replacement to deal with localised strings. + label = StringReplace (progress_label.status_string[0], "%1$d", global.counter.current); + label = StringReplace (label, "%2$d", global.counter.total); + label = StringReplace (label, "%3$d", progress_label.progress); + label = StringReplace (label, "%%", "%"); + + progress_label = get_fsck_label (label, 0); + #progress_label.progress = progress; + + progress_label.sprite = Sprite (progress_label.image); + + # Set up the bar + progress_label.sprite.SetPosition(progress_label.x, progress_label.y, 1); + + set_progress_label_opacity (1); + +} + +# Refresh the label so as to update counters +fun refresh_progress_label () { + update_progress_label (NULL); +} + +#----------------------------------------- FSCK Queue ---------------------------------- + +# Initialise the fsck queue +fun init_queue () { + global.fsck_queue[0].device; + global.fsck_queue[0].progress; + global.fsck_queue.counter = 0; + global.fsck_queue.biggest_item = 0; +} + +fun clear_queue () { + global.fsck_queue = NULL; + init_queue (); +} + +# Return either the device index in the queue or -1 +fun queue_look_up_by_device (device) { + for (i=0; i <= fsck_queue.biggest_item; i++) { + if ((fsck_queue[i]) && (fsck_queue[i].device == device)) + return i; + } + return -1; +} + +# Keep track of an fsck process in the queue +fun add_fsck_to_queue (device, progress) { + # Look for an empty slot in the queue + for (i=0; global.fsck_queue[i].device; i++) { + continue; + } + local.index = i; + + # Set device and progress + global.fsck_queue[local.index].device = device; + global.fsck_queue[local.index].progress = progress; + + # Increase the queue counter + global.fsck_queue.counter++; + + # Update the max index of the array for iterations + if (local.index > global.fsck_queue.biggest_item) + global.fsck_queue.biggest_item = local.index; + + #DebugMedium ("Adding " + device + " at " + local.index); +} + +fun is_queue_empty () { + return (fsck_queue.counter == 0); +} + +fun is_progress_label_available () { + return (progress_label.is_available == 1); +} + + +# This should cover the case in which the fsck checks in +# the queue are completed before the ones showed in the +# progress label +fun on_queued_fsck_completed () { + if (!is_queue_empty ()) + return; + + # Hide the extra label, if any + #if (progress_bar.extra_label.sprite) + # progress_bar.extra_label.sprite.SetOpacity(0); +} + +fun remove_fsck_from_queue (index) { + # Free memory which was previously allocated for + # device and progress + global.fsck_queue[index].device = NULL; + global.fsck_queue[index].progress = NULL; + + # Decrease the queue counter + global.fsck_queue.counter--; + + # See if there are other processes in the queue + # if not, clear the extra_label + on_queued_fsck_completed (); +} + +fun on_fsck_completed () { + # We have moved on to tracking the next fsck + increase_current_fsck_count (); + + if (!is_progress_label_available ()) + return; + + if (!is_queue_empty ()) + return; + + # Hide the progress label + if (progress_label.sprite) + progress_label.sprite.SetOpacity (0); + + # Clear the queue + clear_queue (); + + # Clear the fsck counter + clear_fsck_count (); +} + +# Update an fsck process that we keep track of in the queue +fun update_progress_in_queue (index, device, progress) { + # If the fsck is complete, remove it from the queue + if (progress >= 100) { + remove_fsck_from_queue (index); + on_queued_fsck_completed (); + return; + } + + global.fsck_queue[index].device = device; + global.fsck_queue[index].progress = progress; + +} + +# TODO: Move it to some function +# Create an empty queue +#init_queue (); + + +#----------------------------------------- FSCK Functions ------------------------------ + + +# Either add a new bar for fsck checks or update an existing bar +# +# NOTE: no more than "progress_bar.max_number" bars are allowed +# +fun fsck_check (device, progress, status_string) { + + # The 1st time this will take place + if (!global.progress_label) { + # Increase the fsck counter + increase_fsck_count (); + + # Set up a new label for the check + init_progress_label (device, status_string); + update_progress_label (progress); + + return; + } + + + if (device_has_progress_label (device)) { + # Update the progress of the existing label + update_progress_label (progress); + } + else { + # See if there's already a slot in the queue for the device + local.queue_device_index = queue_look_up_by_device(device); + + # See if the progress_label is available + if (progress_label.is_available) { + +# local.my_string = "available index " + local.available_index + " progress_bar counter is " + progress_bar.counter; +# Debug(local.my_string); + + + # If the fsck check for the device was in the queue, then + # remove it from the queue + if (local.queue_device_index >= 0) { + remove_fsck_from_queue (index); + } + else { + # Increase the fsck counter + increase_fsck_count (); + } + +# local.my_string += local.message; + #Debug("setting new label for device " + device + " progress " + progress); + + # Set up a new label for the check + init_progress_label (device, status_string); + update_progress_label (progress); + + } + # If the progress_label is not available + else { + + # If the fsck check for the device is already in the queue + # just update its progress in the queue + if (local.queue_device_index >= 0) { + #DebugMedium("Updating queue at " + local.queue_device_index + " for device " + device); + update_progress_in_queue (local.queue_device_index, device, progress); + } + # Otherwise add the check to the queue + else { + #DebugMedium("Adding device " + device + " to queue at " + local.queue_device_index); + add_fsck_to_queue (device, progress); + + # Increase the fsck counter + increase_fsck_count (); + + refresh_progress_label (); + } + + } + } + +# if (!is_queue_empty ()) { +# DebugBottom("Extra label for "+ device); + #} +# else { +# DebugBottom("No extra label for " + device + ". 1st Device in the queue "+ fsck_queue[0].device + " counter = " + global.fsck_queue.counter); +# } +} + + +#-----------------------------------------Update Status stuff -------------------------- +# +# The update_status_callback is what we can use to pass plymouth whatever we want so +# as to make use of features which are available only in this program (as opposed to +# being available for any theme for the script plugin). +# +# Example: +# +# Thanks to the current implementation, some scripts can call "plymouth --update=fsck:sda1:40" +# and this program will know that 1) we're performing and fsck check, 2) we're checking sda1, +# 3) the program should set the label progress to 40% +# +# Other features can be easily added by parsing the string that we pass plymouth with "--update" +# +fun update_status_callback (status) { +# Debug(status); + if (!status) return; + + string_it = 0; + update_strings[string_it] = ""; + + for (i=0; (String(status).CharAt(i) != ""); i++) { + local.temp_char = String(status).CharAt(i); + if (temp_char != ":") + update_strings[string_it] += temp_char; + else + update_strings[++string_it] = ""; + } + +# my_string = update_strings[0] + " " + update_strings[1] + " " + update_strings[2]; +# Debug(my_string); + # Let's assume that we're dealing with these strings fsck:sda1:40 + if ((string_it >= 2) && (update_strings[0] == "fsck")) { + + device = update_strings[1]; + progress = update_strings[2]; + status_string[0] = update_strings[3]; # "Checking disk %1$d of %2$d (%3$d %% complete)" + if (!status_string[0]) + status_string[0] = "Checking disk %1$d of %2$d (%3$d %% complete)"; + + if ((device != "") && (progress != "")) { + progress = StringToInteger (progress); + + # Make sure that the fsck_queue is initialised + if (!global.fsck_queue) + init_queue (); + + # Make sure that the fsck counter is initialised + if (!global.counter) + init_fsck_count (); + +# if (!global.progress_bar.extra_label.sprite) +# create_extra_fsck_label (); + + # Keep track of the fsck check + fsck_check (device, progress, status_string); + } + + } + +} +Plymouth.SetUpdateStatusFunction (update_status_callback); + +#-----------------------------------------Display Question stuff ----------------------- + +fun question_dialogue_setup (message_label, text_image) { + #Debug("Question dialog setup"); + + local.field; + local.content; + local.margin; + + field.image = Image (question_field_filename); + content = Sprite (); + bullet_image = Image (progress_dot_off_filename); + margin = bullet_image.GetWidth() / 2; + + # Hide the normal labels + prompt_active = 1; + if (message_notification[1].sprite) hide_message (1); + + # Set the prompt label + label = get_message_label(message_label, 0, 1); + label.z = 10000; + + setup_message (message_label, label.x, label.y, label.z, 2); + show_message (2); + + # Set up the text field which contains the contents + field.sprite = Sprite (); + field.sprite.SetImage (field.image); + + # Centre the box horizontally + field.x = Window.GetX () + Window.GetWidth () / 2 - field.image.GetWidth () / 2; + content_x = field.x + margin; + + # Put the field below the second label. + field.y = message_notification[2].y + label.height; + content_y = field.y + field.image.GetHeight () / 2 - text_image.GetHeight () / 2; + + #Debug ("field x = " + field.x + ", y = " + field.y); + field.z = 10000; + field.sprite.SetX (field.x); + field.sprite.SetY (field.y); + field.sprite.SetZ (field.z); + + #Debug ("content_x = " + content_x + " content_y = " + content_y); + content_z = field.z + 1; + content.SetPosition (content_x, content_y, content_z); + + global.question_dialogue = local; +} + +# The callback function is called when the display should display a question dialogue. +# First arg is prompt string, the second is the field contents. +fun display_question_callback (prompt, contents) { + global.status = "question"; + #Debug ("Reply: " + contents); + + textImage = ImageToText(contents); + if (!global.question_dialogue) { + question_dialogue_setup(prompt, textImage); + } + + margin = global.question_dialogue.margin; + fieldWidth = global.question_dialogue.field.image.GetWidth (); + for (i = 0; ( (textImage.GetWidth () + 2 * margin ) > fieldWidth ); i++) { + textImage = ImageToText(StringCopy (contents, i, StringLength (contents))); + } + + global.question_dialogue.content.SetImage (textImage); +} + + +Plymouth.SetDisplayQuestionFunction (display_question_callback); + +#-----------------------------------------Refresh stuff -------------------------------- +# +# Calling Plymouth.SetRefreshFunction with a function will set that function to be +# called up to 50 times every second, e.g. +# +# NOTE: if a refresh function is not set, Plymouth doesn't seem to be able to update +# the screen correctly +# +fun refresh_callback () +{ + draw_logo (); +} +Plymouth.SetRefreshFunction (refresh_callback); + + +#-----------------------------------------Display Normal stuff ----------------------- +# +# The callback function is called when the display should return to normal +fun display_normal_callback () +{ + global.status = "normal"; + if (global.password_dialogue) { + password_dialogue_opacity (0); + global.password_dialogue = NULL; + if (message_notification[2].sprite) hide_message(2); + prompt_active = 0; + } + if (global.question_dialogue) { + question_dialogue_opacity (0); + global.question_dialogue = NULL; + if (message_notification[2].sprite) hide_message(2); + prompt_active = 0; + } + + if (message_notification[1].sprite) show_message (1); + +} + +Plymouth.SetDisplayNormalFunction (display_normal_callback); + + +#----------------------------------------- Quit -------------------------------- + +# TODO: Maybe we should also hide any other dialog +# Show the logo and make the progress indicator look full when on exit +fun quit_callback () +{ + logo.sprite.SetOpacity (1); + switch_on_bullets (); +} + +Plymouth.SetQuitFunction(quit_callback); --- /dev/null +++ b/themes/ubuntu-logo/ubuntu-logo.grub @@ -0,0 +1,3 @@ +if background_color 44,0,30; then + clear +fi debian/patches/lbm-nouveau.patch0000664000000000000000000000151412310333016014063 0ustar Description: Treat lbm-nouveau as equivalent to nouveau (Ubuntu-specific) Author: Robert Hooker Forwarded: not-needed Last-Update: 2011-03-18 Index: trunk/src/plugins/renderers/drm/plugin.c =================================================================== --- trunk.orig/src/plugins/renderers/drm/plugin.c +++ trunk/src/plugins/renderers/drm/plugin.c @@ -521,7 +521,8 @@ } #endif #ifdef PLY_ENABLE_LIBDRM_NOUVEAU - if (backend->driver_interface == NULL && strcmp (driver_name, "nouveau") == 0) + if (backend->driver_interface == NULL && (strcmp (driver_name, "nouveau") == 0 + || strcmp (driver_name, "lbm-nouveau") == 0)) { backend->driver_interface = ply_renderer_nouveau_driver_get_interface (); backend->driver_supports_mapping_console = false; debian/patches/vga16fb-renderer.patch0000664000000000000000000006324212310333016014677 0ustar Description: Add 16-color VGA frame-buffer renderer Author: Scott James Remnant Bug-Ubuntu: https://bugs.launchpad.net/bugs/526892 Last-Update: 2011-01-21 Index: trunk/configure.ac =================================================================== --- trunk.orig/configure.ac +++ trunk/configure.ac @@ -308,6 +308,9 @@ AC_ARG_WITH(shutdown-tty, AS_HELP_STRING([--with-shutdown-tty=],[Default TTY to use in shutdown mode (by default tty63)]),SHUTDOWN_TTY=${withval},SHUTDOWN_TTY=/dev/tty63) AC_DEFINE_UNQUOTED(SHUTDOWN_TTY, "$SHUTDOWN_TTY", [TTY to use in shutdown mode]) +AC_CHECK_HEADERS([sys/io.h]) +AM_CONDITIONAL([BUILD_VGA16FB], [test "x$ac_cv_header_sys_io_h" = xyes]) + # Turn on the additional warnings last, so -Werror doesn't affect other tests. AC_DEFUN([PLYMOUTH_CC_TRY_FLAG], [ @@ -412,6 +415,7 @@ src/plugins/renderers/frame-buffer/Makefile src/plugins/renderers/drm/Makefile src/plugins/renderers/x11/Makefile + src/plugins/renderers/vga16fb/Makefile src/plugins/splash/Makefile src/plugins/splash/throbgress/Makefile src/plugins/splash/fade-throbber/Makefile Index: trunk/src/plugins/renderers/Makefile.am =================================================================== --- trunk.orig/src/plugins/renderers/Makefile.am +++ trunk/src/plugins/renderers/Makefile.am @@ -1,3 +1,6 @@ SUBDIRS = frame-buffer x11 drm +if BUILD_VGA16FB +SUBDIRS += vga16fb +endif MAINTAINERCLEANFILES = Makefile.in Index: trunk/src/plugins/renderers/vga16fb/Makefile.am =================================================================== --- /dev/null +++ trunk/src/plugins/renderers/vga16fb/Makefile.am @@ -0,0 +1,20 @@ +INCLUDES = -I$(top_srcdir) \ + -I$(srcdir)/../../../libply \ + -I$(srcdir)/../../../libply-splash-core \ + -I$(srcdir)/../../.. \ + -I$(srcdir)/../.. \ + -I$(srcdir)/.. \ + -I$(srcdir) + +plugindir = $(libdir)/plymouth/renderers +plugin_LTLIBRARIES = vga16fb.la + +vga16fb_la_CFLAGS = $(PLYMOUTH_CFLAGS) + +vga16fb_la_LDFLAGS = -module -avoid-version -export-dynamic +vga16fb_la_LIBADD = $(PLYMOUTH_LIBS) \ + ../../../libply/libply.la \ + ../../../libply-splash-core/libply-splash-core.la +vga16fb_la_SOURCES = $(srcdir)/plugin.c + +MAINTAINERCLEANFILES = Makefile.in Index: trunk/src/plugins/renderers/vga16fb/plugin.c =================================================================== --- /dev/null +++ trunk/src/plugins/renderers/vga16fb/plugin.c @@ -0,0 +1,696 @@ +/* plugin.c - vga16fb renderer plugin + * + * Copyright (C) 2010 Canonical Ltd. + * 2006-2009 Red Hat, Inc. + * 2008 Charlie Brej + * + * This program 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; either version 2, or (at your option) + * any later version. + * + * This program 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 program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + * + * Written by: Scott James Remnant + * Charlie Brej + * Kristian Høgsberg + * Peter Jones + * Ray Strode + */ +#include "config.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#include "ply-buffer.h" +#include "ply-event-loop.h" +#include "ply-list.h" +#include "ply-logger.h" +#include "ply-rectangle.h" +#include "ply-region.h" +#include "ply-terminal.h" + +#include "ply-renderer.h" +#include "ply-renderer-plugin.h" + +#include "vga.h" + +#ifndef PLY_FRAME_BUFFER_DEFAULT_FB_DEVICE_NAME +#define PLY_FRAME_BUFFER_DEFAULT_FB_DEVICE_NAME "/dev/fb0" +#endif + +struct _ply_renderer_head +{ + ply_pixel_buffer_t *pixel_buffer; + ply_rectangle_t area; + char *map_address; + size_t size; + + uint16_t red[16]; + uint16_t green[16]; + uint16_t blue[16]; + uint32_t palette_size; + bool palette_overflow; +}; + +struct _ply_renderer_input_source +{ + ply_renderer_backend_t *backend; + ply_fd_watch_t *terminal_input_watch; + + ply_buffer_t *key_buffer; + + ply_renderer_input_source_handler_t handler; + void *user_data; +}; + +struct _ply_renderer_backend +{ + ply_event_loop_t *loop; + ply_terminal_t *terminal; + + char *device_name; + int device_fd; + + ply_renderer_input_source_t input_source; + ply_renderer_head_t head; + ply_list_t *heads; + + unsigned int row_stride; + unsigned int bits_per_pixel; + + uint32_t is_active : 1; +}; + +ply_renderer_plugin_interface_t *ply_renderer_backend_get_interface (void); +static void ply_renderer_head_redraw (ply_renderer_backend_t *backend, + ply_renderer_head_t *head); +static bool open_input_source (ply_renderer_backend_t *backend, + ply_renderer_input_source_t *input_source); + +static ply_renderer_backend_t * +create_backend (const char *device_name, + ply_terminal_t *terminal) +{ + ply_renderer_backend_t *backend; + + backend = calloc (1, sizeof (ply_renderer_backend_t)); + + if (device_name != NULL) + backend->device_name = strdup (device_name); + else if (getenv ("FRAMEBUFFER") != NULL) + backend->device_name = strdup (getenv ("FRAMEBUFFER")); + else + backend->device_name = + strdup (PLY_FRAME_BUFFER_DEFAULT_FB_DEVICE_NAME); + + backend->loop = ply_event_loop_get_default (); + backend->head.map_address = MAP_FAILED; + backend->heads = ply_list_new (); + backend->input_source.key_buffer = ply_buffer_new (); + backend->terminal = terminal; + + return backend; +} + +static void +initialize_head (ply_renderer_backend_t *backend, + ply_renderer_head_t *head) +{ + head->pixel_buffer = ply_pixel_buffer_new (head->area.width, + head->area.height); + ply_pixel_buffer_fill_with_color (backend->head.pixel_buffer, NULL, + 0.0, 0.0, 0.0, 1.0); + + memset (head->red, 0, sizeof head->red); + memset (head->green, 0, sizeof head->green); + memset (head->blue, 0, sizeof head->blue); + + head->palette_size = 0; + head->palette_overflow = false; + + ply_list_append_data (backend->heads, head); +} + +static void +uninitialize_head (ply_renderer_backend_t *backend, + ply_renderer_head_t *head) +{ + if (head->pixel_buffer != NULL) + { + ply_pixel_buffer_free (head->pixel_buffer); + head->pixel_buffer = NULL; + + ply_list_remove_data (backend->heads, head); + } +} + +static void +destroy_backend (ply_renderer_backend_t *backend) +{ + + free (backend->device_name); + uninitialize_head (backend, &backend->head); + + ply_list_free (backend->heads); + + free (backend); +} + +static void +set_palette (ply_renderer_backend_t *backend, + ply_renderer_head_t *head) +{ + struct fb_cmap cmap; + + if (backend->device_fd < 0) + return; + if (!head->palette_size) + return; + + cmap.start = 0; + cmap.len = head->palette_size;; + cmap.red = head->red; + cmap.green = head->green; + cmap.blue = head->blue; + cmap.transp = NULL; + + ioctl (backend->device_fd, FBIOPUTCMAP, &cmap); +} + +static void +activate (ply_renderer_backend_t *backend) +{ + backend->is_active = true; + + if (backend->head.map_address != MAP_FAILED) + ply_renderer_head_redraw (backend, &backend->head); +} + +static void +deactivate (ply_renderer_backend_t *backend) +{ + backend->is_active = false; +} + +static void +on_active_vt_changed (ply_renderer_backend_t *backend) +{ + if (ply_terminal_is_active (backend->terminal)) + { + activate (backend); + } + else + { + deactivate (backend); + } +} + +static bool +open_device (ply_renderer_backend_t *backend) +{ + backend->device_fd = open (backend->device_name, O_RDWR); + + if (backend->device_fd < 0) + { + ply_trace ("could not open '%s': %m", backend->device_name); + return false; + } + + if (!ply_terminal_open (backend->terminal)) + { + ply_trace ("could not open terminal: %m"); + return false; + } + + if (!ply_terminal_is_vt (backend->terminal)) + { + ply_trace ("terminal is not a VT"); + ply_terminal_close (backend->terminal); + return false; + } + + ply_terminal_watch_for_active_vt_change (backend->terminal, + (ply_terminal_active_vt_changed_handler_t) + on_active_vt_changed, + backend); + + return true; +} + +static void +close_device (ply_renderer_backend_t *backend) +{ + + ply_terminal_stop_watching_for_active_vt_change (backend->terminal, + (ply_terminal_active_vt_changed_handler_t) + on_active_vt_changed, + backend); + uninitialize_head (backend, &backend->head); + + close (backend->device_fd); + backend->device_fd = -1; + + backend->head.area.x = 0; + backend->head.area.y = 0; + backend->head.area.width = 0; + backend->head.area.height = 0; +} + +static bool +query_device (ply_renderer_backend_t *backend) +{ + struct fb_var_screeninfo variable_screen_info; + struct fb_fix_screeninfo fixed_screen_info; + + assert (backend != NULL); + assert (backend->device_fd >= 0); + + if (ioctl (backend->device_fd, FBIOGET_VSCREENINFO, &variable_screen_info) < 0) + return false; + + if (ioctl (backend->device_fd, FBIOGET_FSCREENINFO, &fixed_screen_info) < 0) + return false; + + /* We only support the vga16fb with its own kooky planar colour mode. */ + if ((fixed_screen_info.type != FB_TYPE_VGA_PLANES) + || (fixed_screen_info.type_aux != FB_AUX_VGA_PLANES_VGA4) + || (fixed_screen_info.visual != FB_VISUAL_PSEUDOCOLOR) + || (variable_screen_info.bits_per_pixel != 4)) + { + ply_trace ("Doesn't look like vga16fb\n"); + return false; + } + + backend->head.area.x = variable_screen_info.xoffset; + backend->head.area.y = variable_screen_info.yoffset; + backend->head.area.width = variable_screen_info.xres; + backend->head.area.height = variable_screen_info.yres; + + backend->row_stride = fixed_screen_info.line_length; + backend->bits_per_pixel = variable_screen_info.bits_per_pixel; + backend->head.size = backend->head.area.height * backend->row_stride; + + initialize_head (backend, &backend->head); + + return true; + +} + +static bool +map_to_device (ply_renderer_backend_t *backend) +{ + ply_renderer_head_t *head; + + assert (backend != NULL); + assert (backend->device_fd >= 0); + + head = &backend->head; + assert (head->size > 0); + + if (ioperm (VGA_REGS_BASE, VGA_REGS_LEN, 1) < 0) { + ply_trace ("could not obtain permission to write to VGA regs: %m"); + return false; + } + + head->map_address = mmap (NULL, head->size, PROT_WRITE, + MAP_SHARED, backend->device_fd, 0); + + if (head->map_address == MAP_FAILED) { + ply_trace ("could not map VGA memory: %m"); + return false; + } + + if (ply_terminal_is_active (backend->terminal)) + activate (backend); + else + ply_terminal_activate_vt (backend->terminal); + + return true; +} + +static void +unmap_from_device (ply_renderer_backend_t *backend) +{ + ply_renderer_head_t *head; + + head = &backend->head; + + if (head->map_address != MAP_FAILED) + { + munmap (head->map_address, head->size); + head->map_address = MAP_FAILED; + } +} + +static unsigned int +argb32_pixel_value_to_color_index (ply_renderer_backend_t *backend, + ply_renderer_head_t *head, + uint32_t pixel_value) +{ + uint16_t red, green, blue; + unsigned int min_shift, max_shift, shift, index; + + red = (pixel_value >> 16) & 0xff; + green = (pixel_value >> 8) & 0xff; + blue = pixel_value & 0xff; + + /* The 6 here is entirely arbitrary; that means we keep the top two bits + * of each colour when comparing against existing colors in the palette; + * in theory meaning a maximum of 64 -- that's still too many, so we + * then try again with 7 bits and a maximum of 8 -- in between those two + * is the 16 we actually have room for. + */ + if (head->palette_overflow) + { + min_shift = 6; + max_shift = 8; + } + else + { + min_shift = 0; + max_shift = 1; + } + + for (shift = min_shift; shift < max_shift; shift++) + { + for (index = 0; index < head->palette_size; index++) + if ( ((head->red[index] >> (8 + shift)) == (red >> shift)) + && ((head->green[index] >> (8 + shift)) == (green >> shift)) + && ((head->blue[index] >> (8 + shift)) == (blue >> shift))) + return index; + + if (head->palette_size < 16) + { + index = head->palette_size++; + + head->red[index] = red << 8; + head->green[index] = green << 8; + head->blue[index] = blue << 8; + + set_palette (backend, head); + ply_trace ("palette now has %d colours (added %06x)\n", + head->palette_size, pixel_value & 0xffffff); + + return index; + } + } + + ply_trace ("could not find colour in palette for %06x\n", + pixel_value & 0xffffff); + + if (!head->palette_overflow) + { + head->palette_overflow = true; + } + + /* Didn't find a colour, so just return the last + * (first is probably background colour so a bad choice) + */ + return head->palette_size - 1;; +} + +static void +flush_area (ply_renderer_backend_t *backend, + ply_renderer_head_t *head, + ply_rectangle_t *area_to_flush) +{ + unsigned char *mask; + uint32_t *shadow_buffer; + unsigned long x1, x2, y1, y2, x, y; + unsigned int c, b; + + mask = malloc (backend->row_stride * 16); + + shadow_buffer = ply_pixel_buffer_get_argb32_data (backend->head.pixel_buffer); + + x1 = area_to_flush->x; + y1 = area_to_flush->y; + x2 = x1 + area_to_flush->width; + y2 = y1 + area_to_flush->height; + + for (y = y1; y < y2; y++) + { + memset (mask, 0, backend->row_stride * 16); + + for (x = x1; x < x2; x++) + { + unsigned int index; + uint32_t pixel; + + pixel = shadow_buffer[x + y * head->area.width]; + index = argb32_pixel_value_to_color_index (backend, head, pixel); + + mask[index * backend->row_stride + x / 8] |= (0x80 >> (x % 8)); + } + + for (c = 0; c < 16; c++) + { + for (b = x1 / 8; b < x2 / 8 + 1; b++) + { + char *p; + + if (!mask[c * backend->row_stride + b]) + continue; + + vga_set_reset (c); + vga_bit_mask (mask[c * backend->row_stride + b]); + + p = head->map_address + y * backend->row_stride + b; + *p |= 1; + } + } + } + + free (mask); +} + +static void +flush_head (ply_renderer_backend_t *backend, + ply_renderer_head_t *head) +{ + ply_region_t *updated_region; + ply_list_t *areas_to_flush; + ply_list_node_t *node; + ply_pixel_buffer_t *pixel_buffer; + bool was_overflowed; + + assert (backend != NULL); + assert (&backend->head == head); + + if (!backend->is_active) + return; + + ply_terminal_set_mode (backend->terminal, PLY_TERMINAL_MODE_GRAPHICS); + ply_terminal_set_unbuffered_input (backend->terminal); + + /* Reset to basic values; enable use of the Set/Reset register for all + * planes. + */ + vga_enable_set_reset (0xf); + vga_mode (0); + vga_data_rotate (0); + vga_map_mask (0xff); + + was_overflowed = backend->head.palette_overflow; + set_palette (backend, &backend->head); + + pixel_buffer = head->pixel_buffer; + updated_region = ply_pixel_buffer_get_updated_areas (pixel_buffer); + areas_to_flush = ply_region_get_sorted_rectangle_list (updated_region); + + node = ply_list_get_first_node (areas_to_flush); + while (node != NULL) + { + ply_list_node_t *next_node; + ply_rectangle_t *area_to_flush; + + area_to_flush = (ply_rectangle_t *) ply_list_node_get_data (node); + + next_node = ply_list_get_next_node (areas_to_flush, node); + + flush_area (backend, head, area_to_flush); + + node = next_node; + } + + ply_region_clear (updated_region); + + /* If the palette overflowed, render the screen again with a new palette */ + if ((!was_overflowed) && head->palette_overflow) + { + ply_trace ("palette overflowed, redrawing entire screen with new palette"); + + head->palette_size = 0; + ply_renderer_head_redraw (backend, head); + } +} + +static void +ply_renderer_head_redraw (ply_renderer_backend_t *backend, + ply_renderer_head_t *head) +{ + ply_region_t *region; + + region = ply_pixel_buffer_get_updated_areas (head->pixel_buffer); + + ply_region_add_rectangle (region, &head->area); + + flush_head (backend, head); +} + +static ply_list_t * +get_heads (ply_renderer_backend_t *backend) +{ + return backend->heads; +} + +static ply_pixel_buffer_t * +get_buffer_for_head (ply_renderer_backend_t *backend, + ply_renderer_head_t *head) +{ + + if (head != &backend->head) + return NULL; + + return backend->head.pixel_buffer; +} + +static unsigned int +get_bits_per_pixel_for_head (ply_renderer_backend_t *backend, + ply_renderer_head_t *head) +{ + if (head != &backend->head) + return 0; + + return backend->bits_per_pixel; +} + +static bool +has_input_source (ply_renderer_backend_t *backend, + ply_renderer_input_source_t *input_source) +{ + return input_source == &backend->input_source; +} + +static ply_renderer_input_source_t * +get_input_source (ply_renderer_backend_t *backend) +{ + return &backend->input_source; +} + +static void +on_key_event (ply_renderer_input_source_t *input_source, + int terminal_fd) +{ + ply_buffer_append_from_fd (input_source->key_buffer, + terminal_fd); + + if (input_source->handler != NULL) + input_source->handler (input_source->user_data, input_source->key_buffer, input_source); + +} + +static void +on_input_source_disconnected (ply_renderer_input_source_t *input_source) +{ + ply_trace ("input source disconnected, reopening"); + open_input_source (input_source->backend, input_source); +} + +static bool +open_input_source (ply_renderer_backend_t *backend, + ply_renderer_input_source_t *input_source) +{ + int terminal_fd; + + assert (backend != NULL); + assert (has_input_source (backend, input_source)); + + terminal_fd = ply_terminal_get_fd (backend->terminal); + + input_source->backend = backend; + input_source->terminal_input_watch = ply_event_loop_watch_fd (backend->loop, terminal_fd, PLY_EVENT_LOOP_FD_STATUS_HAS_DATA, + (ply_event_handler_t) on_key_event, + (ply_event_handler_t) on_input_source_disconnected, + input_source); + return true; +} + +static void +set_handler_for_input_source (ply_renderer_backend_t *backend, + ply_renderer_input_source_t *input_source, + ply_renderer_input_source_handler_t handler, + void *user_data) +{ + assert (backend != NULL); + assert (has_input_source (backend, input_source)); + + input_source->handler = handler; + input_source->user_data = user_data; +} + +static void +close_input_source (ply_renderer_backend_t *backend, + ply_renderer_input_source_t *input_source) +{ + assert (backend != NULL); + assert (has_input_source (backend, input_source)); + + ply_event_loop_stop_watching_fd (backend->loop, input_source->terminal_input_watch); + input_source->terminal_input_watch = NULL; + input_source->backend = NULL; +} + +ply_renderer_plugin_interface_t * +ply_renderer_backend_get_interface (void) +{ + static ply_renderer_plugin_interface_t plugin_interface = + { + .create_backend = create_backend, + .destroy_backend = destroy_backend, + .open_device = open_device, + .close_device = close_device, + .query_device = query_device, + .map_to_device = map_to_device, + .unmap_from_device = unmap_from_device, + .activate = activate, + .deactivate = deactivate, + .flush_head = flush_head, + .get_heads = get_heads, + .get_buffer_for_head = get_buffer_for_head, + .get_bits_per_pixel_for_head = get_bits_per_pixel_for_head, + .get_input_source = get_input_source, + .open_input_source = open_input_source, + .set_handler_for_input_source = set_handler_for_input_source, + .close_input_source = close_input_source + }; + + return &plugin_interface; +} +/* vim: set ts=4 sw=4 et ai ci cino={.5s,^-2,+.5s,t0,g0,e-2,n-2,p2s,(0,=.5s,:.5s */ Index: trunk/src/plugins/renderers/vga16fb/vga.h =================================================================== --- /dev/null +++ trunk/src/plugins/renderers/vga16fb/vga.h @@ -0,0 +1,107 @@ +/* vga.h - inlines for programming the VGA + * + * Copyright (C) 2010 Canonical Ltd. + * + * This program 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; either version 2, or (at your option) + * any later version. + * + * This program 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 program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + * + * Written by: Scott James Remnant + */ +#ifndef PLY_VGA_H +#define PLY_VGA_H + +/* VGA ioports, and the registers we can access from them */ +#define VGA_REGS_BASE 0x3c0 +#define VGA_REGS_LEN 0x10 + +#define VGA_SC_INDEX 0x3c4 +#define VGA_SC_DATA 0x3c5 + +#define VGA_SC_MAP_MASK 0x02 + +#define VGA_GC_INDEX 0x3ce +#define VGA_GC_DATA 0x3cf + +#define VGA_GC_SET_RESET 0x00 +#define VGA_GC_ENABLE_SET_RESET 0x01 +#define VGA_GC_DATA_ROTATE 0x03 +#define VGA_GC_MODE 0x05 +#define VGA_GC_BIT_MASK 0x08 + +/* Select the VGA write mode. */ +static inline void +vga_mode (int mode) +{ + outb (VGA_GC_MODE, VGA_GC_INDEX); + outb (mode, VGA_GC_DATA); +} + +/* Data Rotate register; we don't use this, we just ensure it's off. */ +static inline void +vga_data_rotate (int op) +{ + outb (VGA_GC_DATA_ROTATE, VGA_GC_INDEX); + outb (op, VGA_GC_DATA); +} + +/* Enable use of the Set/Reset register for the given planes (as a mask). + * + * In effect: set this to 0xf to use all four planes. + */ +static inline void +vga_enable_set_reset (int mask) +{ + outb (VGA_GC_ENABLE_SET_RESET, VGA_GC_INDEX); + outb (mask, VGA_GC_DATA); +} + +/* Set/Reset register; the given planes (as a mask) will have whatever bits + * are true in the Bit Mask register set to 1, and whatever bits are false + * in the Bit Mask register set to 0. (It's more complicated than that, but + * your brain will explode). + * + * In effect: set this to the colour you want. + */ +static inline void +vga_set_reset (int mask) +{ + outb (VGA_GC_SET_RESET, VGA_GC_INDEX); + outb (mask, VGA_GC_DATA); +} + +/* Bit Mask register; writing to a memory address will write to these bits + * of that byte according to the contents of the Set/Reset register. Far + * more complicated than that, you *really* don't want to know. + * + * In effect: set this to the pattern we want in the colour we set. + */ +static inline void +vga_bit_mask (int mask) +{ + outb (VGA_GC_BIT_MASK, VGA_GC_INDEX); + outb (mask, VGA_GC_DATA); +} + +/* Map Mask register; we don't use this, but we do make sure it's reset. */ +static inline void +vga_map_mask (int mask) +{ + outb (VGA_SC_MAP_MASK, VGA_SC_INDEX); + outb (mask, VGA_SC_DATA); +} + +#endif /* PLY_VGA_H */ +/* vim: set ts=4 sw=4 et ai ci cino={.5s,^-2,+.5s,t0,g0,e-2,n-2,p2s,(0,=.5s,:.5s */ + Index: trunk/src/libply-splash-core/ply-renderer.c =================================================================== --- trunk.orig/src/libply-splash-core/ply-renderer.c +++ trunk/src/libply-splash-core/ply-renderer.c @@ -267,6 +267,7 @@ PLYMOUTH_PLUGIN_PATH "renderers/x11.so", PLYMOUTH_PLUGIN_PATH "renderers/drm.so", PLYMOUTH_PLUGIN_PATH "renderers/frame-buffer.so", + PLYMOUTH_PLUGIN_PATH "renderers/vga16fb.so", NULL }; debian/patches/ubuntu-text.patch0000664000000000000000000006246612310333016014152 0ustar Description: Add ubuntu-text splash plugin and theme Author: Scott James Remnant Forwarded: not-needed Last-Update: 2011-01-21 Index: trunk/configure.ac =================================================================== --- trunk.orig/configure.ac +++ trunk/configure.ac @@ -431,6 +431,7 @@ src/plugins/splash/Makefile src/plugins/splash/throbgress/Makefile src/plugins/splash/fade-throbber/Makefile + src/plugins/splash/ubuntu-text/Makefile src/plugins/splash/text/Makefile src/plugins/splash/details/Makefile src/plugins/splash/space-flares/Makefile @@ -456,6 +457,7 @@ themes/spinner/Makefile themes/script/Makefile themes/ubuntu-logo/Makefile + themes/ubuntu-text/Makefile images/Makefile scripts/plymouth-generate-initrd scripts/plymouth-populate-initrd Index: trunk/themes/Makefile.am =================================================================== --- trunk.orig/themes/Makefile.am +++ trunk/themes/Makefile.am @@ -1,2 +1,2 @@ -SUBDIRS = spinfinity fade-in text details solar glow script spinner ubuntu-logo +SUBDIRS = spinfinity fade-in text details solar glow script spinner ubuntu-logo ubuntu-text MAINTAINERCLEANFILES = Makefile.in Index: trunk/themes/ubuntu-text/ubuntu-text.plymouth.in =================================================================== --- /dev/null +++ trunk/themes/ubuntu-text/ubuntu-text.plymouth.in @@ -0,0 +1,11 @@ +[Plymouth Theme] +Name=Ubuntu Text +Description=Text mode theme based on ubuntu-logo theme +ModuleName=ubuntu-text + +[ubuntu-text] +title=Ubuntu 11.04 +black=0x2c001e +white=0xffffff +brown=0xff4012 +blue=0x988592 Index: trunk/themes/ubuntu-text/Makefile.am =================================================================== --- /dev/null +++ trunk/themes/ubuntu-text/Makefile.am @@ -0,0 +1,4 @@ +themedir = $(datadir)/plymouth/themes/ubuntu-text +dist_theme_DATA = ubuntu-text.plymouth.in + +MAINTAINERCLEANFILES = Makefile.in Index: trunk/src/plugins/splash/Makefile.am =================================================================== --- trunk.orig/src/plugins/splash/Makefile.am +++ trunk/src/plugins/splash/Makefile.am @@ -1,2 +1,2 @@ -SUBDIRS = throbgress fade-throbber text details space-flares two-step script +SUBDIRS = throbgress fade-throbber text details space-flares two-step script ubuntu-text MAINTAINERCLEANFILES = Makefile.in Index: trunk/src/plugins/splash/ubuntu-text/Makefile.am =================================================================== --- /dev/null +++ trunk/src/plugins/splash/ubuntu-text/Makefile.am @@ -0,0 +1,23 @@ +INCLUDES = -I$(top_srcdir) \ + -I$(srcdir)/../../../libply \ + -I$(srcdir)/../../../libply-splash-core \ + -I$(srcdir)/../../.. \ + -I$(srcdir)/../.. \ + -I$(srcdir)/.. \ + -I$(srcdir) + +plugindir = $(libdir)/plymouth +plugin_LTLIBRARIES = ubuntu-text.la + +ubuntu_text_la_CFLAGS = $(PLYMOUTH_CFLAGS) \ + -DPLYMOUTH_BACKGROUND_COLOR=$(background_color) \ + -DPLYMOUTH_BACKGROUND_END_COLOR=$(background_end_color) \ + -DPLYMOUTH_BACKGROUND_START_COLOR=$(background_start_color) + +ubuntu_text_la_LDFLAGS = -module -avoid-version -export-dynamic +ubuntu_text_la_LIBADD = $(PLYMOUTH_LIBS) \ + ../../../libply/libply.la \ + ../../../libply-splash-core/libply-splash-core.la +ubuntu_text_la_SOURCES = $(srcdir)/plugin.c + +MAINTAINERCLEANFILES = Makefile.in Index: trunk/src/plugins/splash/ubuntu-text/plugin.c =================================================================== --- /dev/null +++ trunk/src/plugins/splash/ubuntu-text/plugin.c @@ -0,0 +1,805 @@ +/* ubuntu-text.c - boot splash plugin + * + * Copyright (C) 2010 Canonical Ltd. + * Copyright (C) 2008 Red Hat, Inc. + * + * This program 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; either version 2, or (at your option) + * any later version. + * + * This program 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 program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + * + * Written by: Scott James Remnant + * Adam Jackson + * Ray Strode + */ +#include "config.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "ply-trigger.h" +#include "ply-boot-splash-plugin.h" +#include "ply-buffer.h" +#include "ply-event-loop.h" +#include "ply-key-file.h" +#include "ply-list.h" +#include "ply-logger.h" +#include "ply-text-display.h" +#include "ply-text-progress-bar.h" +#include "ply-utils.h" + +#include + +#define CLEAR_LINE_SEQUENCE "\033[2K\r\n" +#define BACKSPACE "\b\033[0K" + +typedef enum { + PLY_BOOT_SPLASH_DISPLAY_NORMAL, + PLY_BOOT_SPLASH_DISPLAY_QUESTION_ENTRY, + PLY_BOOT_SPLASH_DISPLAY_PASSWORD_ENTRY +} ply_boot_splash_display_type_t; + +struct _ply_boot_splash_plugin +{ + ply_event_loop_t *loop; + ply_boot_splash_mode_t mode; + + ply_list_t *views; + + ply_boot_splash_display_type_t state; + + char *message; + + uint32_t is_animating : 1; + uint32_t black; + uint32_t white; + uint32_t brown; + uint32_t blue; + char *title; +}; + +typedef struct +{ + ply_boot_splash_plugin_t *plugin; + ply_text_display_t *display; + +} view_t; + +static void hide_splash_screen (ply_boot_splash_plugin_t *plugin, + ply_event_loop_t *loop); + +static view_t * +view_new (ply_boot_splash_plugin_t *plugin, + ply_text_display_t *display) +{ + view_t *view; + + view = calloc (1, sizeof (view_t)); + view->plugin = plugin; + view->display = display; + + return view; +} + +static void +view_free (view_t *view) +{ + free (view); +} + +static void +view_show_message (view_t *view) +{ + ply_boot_splash_plugin_t *plugin; + int display_width, display_height, y; + ply_terminal_color_t color; + char *message; + + plugin = view->plugin; + + display_width = ply_text_display_get_number_of_columns (view->display); + display_height = ply_text_display_get_number_of_rows (view->display); + + if (!strncmp (plugin->message, "keys:", 5)) + { + message = plugin->message + 5; + color = PLY_TERMINAL_COLOR_WHITE; + y = display_height - 4; + } + else + { + message = plugin->message; + color = PLY_TERMINAL_COLOR_BLUE; + y = display_height / 2 + 7; + } + + ply_text_display_set_cursor_position (view->display, 0, y); + ply_text_display_clear_line (view->display); + ply_text_display_set_cursor_position (view->display, + (display_width - + strlen (message)) / 2, + y); + + ply_text_display_set_foreground_color (view->display, color); + ply_text_display_write (view->display, "%s", message); +} + +static void +view_show_prompt (view_t *view, + const char *prompt, + const char *entered_text) +{ + int display_width, display_height; + + display_width = ply_text_display_get_number_of_columns (view->display); + display_height = ply_text_display_get_number_of_rows (view->display); + + ply_text_display_set_cursor_position (view->display, 0, + display_height / 2 + 8); + ply_text_display_clear_line (view->display); + ply_text_display_set_cursor_position (view->display, + display_width / 2 - (strlen (prompt)), + display_height / 2 + 8); + + ply_text_display_write (view->display, "%s:%s", prompt, entered_text); + + ply_text_display_show_cursor (view->display); +} + +static void +view_start_animation (view_t *view) +{ + ply_boot_splash_plugin_t *plugin; + ply_terminal_t *terminal; + + assert (view != NULL); + + plugin = view->plugin; + + terminal = ply_text_display_get_terminal (view->display); + + ply_terminal_set_color_hex_value (terminal, + PLY_TERMINAL_COLOR_BLACK, + plugin->black); + ply_terminal_set_color_hex_value (terminal, + PLY_TERMINAL_COLOR_WHITE, + plugin->white); + ply_terminal_set_color_hex_value (terminal, + PLY_TERMINAL_COLOR_BROWN, + plugin->brown); + ply_terminal_set_color_hex_value (terminal, + PLY_TERMINAL_COLOR_BLUE, + plugin->blue); + + ply_text_display_set_background_color (view->display, + PLY_TERMINAL_COLOR_BLACK); + ply_text_display_clear_screen (view->display); + ply_text_display_hide_cursor (view->display); +} + +static void +view_redraw (view_t *view) +{ + unsigned long screen_width, screen_height; + + screen_width = ply_text_display_get_number_of_columns (view->display); + screen_height = ply_text_display_get_number_of_rows (view->display); + + ply_text_display_draw_area (view->display, 0, 0, + screen_width, screen_height); +} + +static void +redraw_views (ply_boot_splash_plugin_t *plugin) +{ + ply_list_node_t *node; + + node = ply_list_get_first_node (plugin->views); + while (node != NULL) + { + ply_list_node_t *next_node; + view_t *view; + + view = ply_list_node_get_data (node); + next_node = ply_list_get_next_node (plugin->views, node); + + view_redraw (view); + + node = next_node; + } +} + +static void +view_hide (view_t *view) +{ + if (view->display != NULL) + { + ply_terminal_t *terminal; + + terminal = ply_text_display_get_terminal (view->display); + + ply_text_display_set_background_color (view->display, PLY_TERMINAL_COLOR_DEFAULT); + ply_text_display_clear_screen (view->display); + ply_text_display_show_cursor (view->display); + + ply_terminal_reset_colors (terminal); + } +} + +static void +hide_views (ply_boot_splash_plugin_t *plugin) +{ + ply_list_node_t *node; + + node = ply_list_get_first_node (plugin->views); + while (node != NULL) + { + ply_list_node_t *next_node; + view_t *view; + + view = ply_list_node_get_data (node); + next_node = ply_list_get_next_node (plugin->views, node); + + view_hide (view); + + node = next_node; + } +} + +static void +pause_views (ply_boot_splash_plugin_t *plugin) +{ + ply_list_node_t *node; + + node = ply_list_get_first_node (plugin->views); + while (node != NULL) + { + ply_list_node_t *next_node; + view_t *view; + + view = ply_list_node_get_data (node); + next_node = ply_list_get_next_node (plugin->views, node); + + ply_text_display_pause_updates (view->display); + + node = next_node; + } +} + +static void +unpause_views (ply_boot_splash_plugin_t *plugin) +{ + ply_list_node_t *node; + + node = ply_list_get_first_node (plugin->views); + while (node != NULL) + { + ply_list_node_t *next_node; + view_t *view; + + view = ply_list_node_get_data (node); + next_node = ply_list_get_next_node (plugin->views, node); + + ply_text_display_unpause_updates (view->display); + + node = next_node; + } +} + +static ply_boot_splash_plugin_t * +create_plugin (ply_key_file_t *key_file) +{ + char *option; + + ply_boot_splash_plugin_t *plugin; + + ply_trace ("creating plugin"); + + plugin = calloc (1, sizeof (ply_boot_splash_plugin_t)); + plugin->message = NULL; + + plugin->views = ply_list_new (); + + /* Not a pretty API for setting defaults for your config file... */ + plugin->black = 0x2c001e; + plugin->white = 0xffffff; + plugin->brown = 0xff4012; + plugin->blue = 0x988592; + + option = ply_key_file_get_value (key_file, "ubuntu-text", "black"); + if (option) + sscanf(option, "0x%x", &plugin->black); + option = ply_key_file_get_value (key_file, "ubuntu-text", "white"); + if (option) + sscanf(option, "0x%x", &plugin->white); + option = ply_key_file_get_value (key_file, "ubuntu-text", "brown"); + if (option) + sscanf(option, "0x%x", &plugin->brown); + option = ply_key_file_get_value (key_file, "ubuntu-text", "blue"); + if (option) + sscanf(option, "0x%x", &plugin->blue); + + plugin->title = ply_key_file_get_value (key_file, "ubuntu-text", "title"); + + return plugin; +} + +static void +detach_from_event_loop (ply_boot_splash_plugin_t *plugin) +{ + plugin->loop = NULL; + + ply_trace ("detaching from event loop"); +} + +static void +free_views (ply_boot_splash_plugin_t *plugin) +{ + ply_list_node_t *node; + + node = ply_list_get_first_node (plugin->views); + + while (node != NULL) + { + ply_list_node_t *next_node; + view_t *view; + + view = ply_list_node_get_data (node); + next_node = ply_list_get_next_node (plugin->views, node); + + view_free (view); + ply_list_remove_node (plugin->views, node); + + node = next_node; + } + + ply_list_free (plugin->views); + plugin->views = NULL; +} + +static void +destroy_plugin (ply_boot_splash_plugin_t *plugin) +{ + ply_trace ("destroying plugin"); + + if (plugin == NULL) + return; + + /* It doesn't ever make sense to keep this plugin on screen + * after exit + */ + hide_splash_screen (plugin, plugin->loop); + + free_views (plugin); + if (plugin->message != NULL) + free (plugin->message); + + free (plugin); +} + +static void +show_message (ply_boot_splash_plugin_t *plugin) +{ + ply_list_node_t *node; + + node = ply_list_get_first_node (plugin->views); + while (node != NULL) + { + ply_list_node_t *next_node; + view_t *view; + + view = ply_list_node_get_data (node); + next_node = ply_list_get_next_node (plugin->views, node); + + view_show_message (view); + + node = next_node; + } +} + +static void +animate_frame (ply_boot_splash_plugin_t *plugin, + int frame) +{ + ply_list_node_t *node; + + node = ply_list_get_first_node (plugin->views); + while (node != NULL) + { + ply_list_node_t *next_node; + view_t *view; + int display_width, display_height; + + view = ply_list_node_get_data (node); + next_node = ply_list_get_next_node (plugin->views, node); + + display_width = ply_text_display_get_number_of_columns (view->display); + display_height = ply_text_display_get_number_of_rows (view->display); + + ply_text_display_set_cursor_position (view->display, + (display_width - 12) / 2, + display_height / 2); + + ply_text_display_set_background_color (view->display, PLY_TERMINAL_COLOR_BLACK); + ply_text_display_set_foreground_color (view->display, PLY_TERMINAL_COLOR_WHITE); + ply_text_display_write (view->display, "%s", plugin->title); + + ply_text_display_set_cursor_position (view->display, + (display_width - 10) / 2, + (display_height / 2) + 2); + + if ((frame < 1) || (frame > 4)) + ply_text_display_set_foreground_color (view->display, PLY_TERMINAL_COLOR_WHITE); + else + ply_text_display_set_foreground_color (view->display, PLY_TERMINAL_COLOR_BROWN); + ply_text_display_write (view->display, "%s", ". "); + + if ((frame < 2) || (frame > 5)) + ply_text_display_set_foreground_color (view->display, PLY_TERMINAL_COLOR_WHITE); + else + ply_text_display_set_foreground_color (view->display, PLY_TERMINAL_COLOR_BROWN); + ply_text_display_write (view->display, "%s", ". "); + + if ((frame < 3) || (frame > 6)) + ply_text_display_set_foreground_color (view->display, PLY_TERMINAL_COLOR_WHITE); + else + ply_text_display_set_foreground_color (view->display, PLY_TERMINAL_COLOR_BROWN); + ply_text_display_write (view->display, "%s", ". "); + + if (frame < 4) + ply_text_display_set_foreground_color (view->display, PLY_TERMINAL_COLOR_WHITE); + else + ply_text_display_set_foreground_color (view->display, PLY_TERMINAL_COLOR_BROWN); + ply_text_display_write (view->display, "%s", "."); + + node = next_node; + } +} + +static void +on_timeout (ply_boot_splash_plugin_t *plugin) +{ + static int frame = 0; + + frame += 1; + frame %= 8; + + animate_frame (plugin, frame); + + ply_event_loop_watch_for_timeout (plugin->loop, 1.0, + (ply_event_loop_timeout_handler_t) + on_timeout, plugin); +} + +static void +start_animation (ply_boot_splash_plugin_t *plugin) +{ + ply_list_node_t *node; + + assert (plugin != NULL); + assert (plugin->loop != NULL); + + redraw_views (plugin); + + if (plugin->message != NULL) + show_message (plugin); + + if (plugin->is_animating) + return; + + node = ply_list_get_first_node (plugin->views); + while (node != NULL) + { + ply_list_node_t *next_node; + view_t *view; + + view = ply_list_node_get_data (node); + next_node = ply_list_get_next_node (plugin->views, node); + + view_start_animation (view); + + node = next_node; + } + + plugin->is_animating = true; + + animate_frame (plugin, 0); + ply_event_loop_watch_for_timeout (plugin->loop, 1.0, + (ply_event_loop_timeout_handler_t) + on_timeout, plugin); +} + +static void +stop_animation (ply_boot_splash_plugin_t *plugin) +{ + assert (plugin != NULL); + assert (plugin->loop != NULL); + + if (!plugin->is_animating) + return; + + plugin->is_animating = false; + + ply_event_loop_stop_watching_for_timeout (plugin->loop, + (ply_event_loop_timeout_handler_t) + on_timeout, plugin); + + redraw_views (plugin); +} + +static void +on_draw (view_t *view, + ply_terminal_t *terminal, + int x, + int y, + int width, + int height) +{ +} + +static void +add_text_display (ply_boot_splash_plugin_t *plugin, + ply_text_display_t *display) +{ + view_t *view; + ply_terminal_t *terminal; + + view = view_new (plugin, display); + + terminal = ply_text_display_get_terminal (view->display); + if (ply_terminal_open (terminal)) + { + ply_terminal_set_mode (terminal, PLY_TERMINAL_MODE_TEXT); + ply_terminal_activate_vt (terminal); + } + + ply_text_display_set_draw_handler (view->display, + (ply_text_display_draw_handler_t) + on_draw, view); + + ply_list_append_data (plugin->views, view); +} + +static void +remove_text_display (ply_boot_splash_plugin_t *plugin, + ply_text_display_t *display) +{ + ply_list_node_t *node; + + node = ply_list_get_first_node (plugin->views); + while (node != NULL) + { + view_t *view; + ply_list_node_t *next_node; + + view = ply_list_node_get_data (node); + next_node = ply_list_get_next_node (plugin->views, node); + + if (view->display == display) + { + ply_text_display_set_draw_handler (view->display, + NULL, NULL); + view_free (view); + ply_list_remove_node (plugin->views, node); + return; + } + + node = next_node; + } +} + +static bool +show_splash_screen (ply_boot_splash_plugin_t *plugin, + ply_event_loop_t *loop, + ply_buffer_t *boot_buffer, + ply_boot_splash_mode_t mode) +{ + assert (plugin != NULL); + + plugin->loop = loop; + plugin->mode = mode; + ply_event_loop_watch_for_exit (loop, (ply_event_loop_exit_handler_t) + detach_from_event_loop, + plugin); + + ply_show_new_kernel_messages (false); + start_animation (plugin); + + return true; +} + +static void +update_status (ply_boot_splash_plugin_t *plugin, + const char *status) +{ + assert (plugin != NULL); + + ply_trace ("status update"); +} + +static void +hide_splash_screen (ply_boot_splash_plugin_t *plugin, + ply_event_loop_t *loop) +{ + assert (plugin != NULL); + + ply_trace ("hiding splash screen"); + + if (plugin->loop != NULL) + { + stop_animation (plugin); + + ply_event_loop_stop_watching_for_exit (plugin->loop, + (ply_event_loop_exit_handler_t) + detach_from_event_loop, + plugin); + detach_from_event_loop (plugin); + } + + hide_views (plugin); + ply_show_new_kernel_messages (true); +} + +static void +display_normal (ply_boot_splash_plugin_t *plugin) +{ + pause_views (plugin); + if (plugin->state != PLY_BOOT_SPLASH_DISPLAY_NORMAL) + { + plugin->state = PLY_BOOT_SPLASH_DISPLAY_NORMAL; + start_animation (plugin); + redraw_views (plugin); + } + unpause_views (plugin); +} + +static void +display_message (ply_boot_splash_plugin_t *plugin, + const char *message) +{ + if (plugin->message != NULL) + free (plugin->message); + + plugin->message = strdup (message); + start_animation (plugin); +} + +static void +show_password_prompt (ply_boot_splash_plugin_t *plugin, + const char *prompt, + int bullets) +{ + ply_list_node_t *node; + int i; + char *entered_text; + + entered_text = calloc (bullets + 1, sizeof (char)); + + for (i = 0; i < bullets; i++) + entered_text[i] = '*'; + + node = ply_list_get_first_node (plugin->views); + while (node != NULL) + { + ply_list_node_t *next_node; + view_t *view; + + view = ply_list_node_get_data (node); + next_node = ply_list_get_next_node (plugin->views, node); + + view_show_prompt (view, prompt, entered_text); + + node = next_node; + } + free (entered_text); +} + +static void +show_prompt (ply_boot_splash_plugin_t *plugin, + const char *prompt, + const char *text) +{ + ply_list_node_t *node; + + node = ply_list_get_first_node (plugin->views); + while (node != NULL) + { + ply_list_node_t *next_node; + view_t *view; + + view = ply_list_node_get_data (node); + next_node = ply_list_get_next_node (plugin->views, node); + + view_show_prompt (view, prompt, text); + + node = next_node; + } +} + +static void +display_password (ply_boot_splash_plugin_t *plugin, + const char *prompt, + int bullets) +{ + pause_views (plugin); + if (plugin->state == PLY_BOOT_SPLASH_DISPLAY_NORMAL) + stop_animation (plugin); + + plugin->state = PLY_BOOT_SPLASH_DISPLAY_PASSWORD_ENTRY; + + if (!prompt) + prompt = "Password"; + + show_password_prompt (plugin, prompt, bullets); + + unpause_views (plugin); +} + +static void +display_question (ply_boot_splash_plugin_t *plugin, + const char *prompt, + const char *entry_text) +{ + pause_views (plugin); + if (plugin->state == PLY_BOOT_SPLASH_DISPLAY_NORMAL) + stop_animation (plugin); + + plugin->state = PLY_BOOT_SPLASH_DISPLAY_PASSWORD_ENTRY; + + if (!prompt) + prompt = "Password"; + + show_prompt (plugin, prompt, entry_text); + + unpause_views (plugin); +} + + +ply_boot_splash_plugin_interface_t * +ply_boot_splash_plugin_get_interface (void) +{ + static ply_boot_splash_plugin_interface_t plugin_interface = + { + .create_plugin = create_plugin, + .destroy_plugin = destroy_plugin, + .add_text_display = add_text_display, + .remove_text_display = remove_text_display, + .show_splash_screen = show_splash_screen, + .update_status = update_status, + .hide_splash_screen = hide_splash_screen, + .display_normal = display_normal, + .display_message = display_message, + .display_password = display_password, + .display_question = display_question, + }; + + return &plugin_interface; +} + +/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */ debian/patches/autoreconf.patch0000664000000000000000000107145112310333016014006 0ustar Description: autoreconf output The result of running autoreconf. To update this: - quilt pop -a - quilt push autoreconf.patch - quilt shell - autoreconf -fiv - rm -rf autom4te.cache config.h.in~ - exit - quilt refresh Forwarded: not-needed Last-Update: 2011-01-21 --- a/themes/Makefile.in +++ b/themes/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -15,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -59,6 +76,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -255,7 +277,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = spinfinity fade-in text details solar glow script spinner +SUBDIRS = spinfinity fade-in text details solar glow script spinner ubuntu-logo ubuntu-text MAINTAINERCLEANFILES = Makefile.in all: all-recursive @@ -464,13 +486,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ --- a/src/plugins/splash/Makefile.in +++ b/src/plugins/splash/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -15,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -59,6 +76,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -255,7 +277,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = throbgress fade-throbber text details space-flares two-step script +SUBDIRS = throbgress fade-throbber text details space-flares two-step script ubuntu-text MAINTAINERCLEANFILES = Makefile.in all: all-recursive @@ -464,13 +486,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ --- a/src/plugins/renderers/Makefile.in +++ b/src/plugins/renderers/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -15,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -33,6 +50,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +@BUILD_VGA16FB_TRUE@am__append_1 = vga16fb subdir = src/plugins/renderers DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -59,6 +77,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -66,7 +89,7 @@ distdir ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) +DIST_SUBDIRS = frame-buffer x11 drm vga16fb DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -255,7 +278,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = frame-buffer x11 drm +SUBDIRS = frame-buffer x11 drm $(am__append_1) MAINTAINERCLEANFILES = Makefile.in all: all-recursive @@ -464,13 +487,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ --- a/config.h.in +++ b/config.h.in @@ -3,6 +3,10 @@ /* TTY to use in boot mode */ #undef BOOT_TTY +/* Define to 1 if you have the declaration of `MSG_NOSIGNAL', and to 0 if you + don't. */ +#undef HAVE_DECL_MSG_NOSIGNAL + /* Define to 1 if you have the header file. */ #undef HAVE_DLFCN_H @@ -30,6 +34,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_STRING_H +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_IO_H + /* Define to 1 if you have the header file. */ #undef HAVE_SYS_STAT_H @@ -125,6 +132,11 @@ /* Version number of package */ #undef VERSION +/* Enable large inode numbers on Mac OS X 10.5. */ +#ifndef _DARWIN_USE_64_BIT_INODE +# define _DARWIN_USE_64_BIT_INODE 1 +#endif + /* Number of bits in a file offset, on hosts where this is settable. */ #undef _FILE_OFFSET_BITS --- a/INSTALL +++ b/INSTALL @@ -1,91 +1,370 @@ -Plymouth isn't really designed to be built from source and get installed by end users. For it to work correctly, it needs integration with the distribution. Because it starts so early, it needs to be packed into the distribution's initial ram disk, and the distribution needs to poke plymouth to tell it how boot is progressing. +Installation Instructions +************************* -Unfortunately, there isn't great documentation for distributors. In the mean time, this email exchange might be useful: +Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation, +Inc. -Hi, + Copying and distribution of this file, with or without modification, +are permitted in any medium without royalty provided the copyright +notice and this notice are preserved. This file is offered as-is, +without warranty of any kind. + +Basic Installation +================== + + Briefly, the shell commands `./configure; make; make install' should +configure, build, and install this package. The following +more-detailed instructions are generic; see the `README' file for +instructions specific to this package. Some packages provide this +`INSTALL' file but do not implement all of the features documented +below. The lack of an optional feature in a given package is not +necessarily a bug. More recommendations for GNU packages can be found +in *note Makefile Conventions: (standards)Makefile Conventions. + + The `configure' shell script attempts to guess correct values for +various system-dependent variables used during compilation. It uses +those values to create a `Makefile' in each directory of the package. +It may also create one or more `.h' files containing system-dependent +definitions. Finally, it creates a shell script `config.status' that +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). + + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. Caching is +disabled by default to prevent problems with accidental use of stale +cache files. + + If you need to do unusual things to compile the package, please try +to figure out how `configure' could check whether to do them, and mail +diffs or instructions to the address given in the `README' so they can +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You need `configure.ac' if +you want to change it or regenerate `configure' using a newer version +of `autoconf'. + + The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type + `./configure' to configure the package for your system. + + Running `configure' might take a while. While running, it prints + some messages telling which features it is checking for. + + 2. Type `make' to compile the package. + + 3. Optionally, type `make check' to run any self-tests that come with + the package, generally using the just-built uninstalled binaries. + + 4. Type `make install' to install the programs and any data files and + documentation. When installing into a prefix owned by root, it is + recommended that the package be configured and built as a regular + user, and only the `make install' phase executed with root + privileges. + + 5. Optionally, type `make installcheck' to repeat any self-tests, but + this time using the binaries in their final installed location. + This target does not install anything. Running this target as a + regular user, particularly if the prior `make install' required + root privileges, verifies that the installation completed + correctly. + + 6. You can remove the program binaries and object files from the + source code directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile the package for + a different kind of computer), type `make distclean'. There is + also a `make maintainer-clean' target, but that is intended mainly + for the package's developers. If you use it, you may have to get + all sorts of other programs in order to regenerate files that came + with the distribution. + + 7. Often, you can also type `make uninstall' to remove the installed + files again. In practice, not all packages have tested that + uninstallation works correctly, even though it is required by the + GNU Coding Standards. + + 8. Some packages, particularly those that use Automake, provide `make + distcheck', which can by used by developers to test that all other + targets like `make install' and `make uninstall' work correctly. + This target is generally not run by end users. + +Compilers and Options +===================== + + Some systems require unusual options for compilation or linking that +the `configure' script does not know about. Run `./configure --help' +for details on some of the pertinent environment variables. + + You can give `configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here +is an example: + + ./configure CC=c99 CFLAGS=-g LIBS=-lposix + + *Note Defining Variables::, for more details. + +Compiling For Multiple Architectures +==================================== + + You can compile the package for more than one kind of computer at the +same time, by placing the object files for each architecture in their +own directory. To do this, you can use GNU `make'. `cd' to the +directory where you want the object files and executables to go and run +the `configure' script. `configure' automatically checks for the +source code in the directory that `configure' is in and in `..'. This +is known as a "VPATH" build. + + With a non-GNU `make', it is safer to compile the package for one +architecture at a time in the source code directory. After you have +installed the package for one architecture, use `make distclean' before +reconfiguring for another architecture. + + On MacOS X 10.5 and later systems, you can create libraries and +executables that work on multiple system types--known as "fat" or +"universal" binaries--by specifying multiple `-arch' options to the +compiler but only a single `-arch' option to the preprocessor. Like +this: + + ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CPP="gcc -E" CXXCPP="g++ -E" + + This is not guaranteed to produce working output in all cases, you +may have to build one architecture at a time and combine the results +using the `lipo' tool if you have problems. + +Installation Names +================== + + By default, `make install' installs the package's commands under +`/usr/local/bin', include files under `/usr/local/include', etc. You +can specify an installation prefix other than `/usr/local' by giving +`configure' the option `--prefix=PREFIX', where PREFIX must be an +absolute file name. + + You can specify separate installation prefixes for +architecture-specific files and architecture-independent files. If you +pass the option `--exec-prefix=PREFIX' to `configure', the package uses +PREFIX as the prefix for installing programs and libraries. +Documentation and other data files still use the regular prefix. + + In addition, if you use an unusual directory layout you can give +options like `--bindir=DIR' to specify different values for particular +kinds of files. Run `configure --help' for a list of the directories +you can set and what kinds of files go in them. In general, the +default for these options is expressed in terms of `${prefix}', so that +specifying just `--prefix' will affect all of the other directory +specifications that were not explicitly provided. + + The most portable way to affect installation locations is to pass the +correct locations to `configure'; however, many packages provide one or +both of the following shortcuts of passing variable assignments to the +`make install' command line to change installation locations without +having to reconfigure or recompile. + + The first method involves providing an override variable for each +affected directory. For example, `make install +prefix=/alternate/directory' will choose an alternate location for all +directory configuration variables that were expressed in terms of +`${prefix}'. Any directories that were specified during `configure', +but not in terms of `${prefix}', must each be overridden at install +time for the entire installation to be relocated. The approach of +makefile variable overrides for each directory variable is required by +the GNU Coding Standards, and ideally causes no recompilation. +However, some platforms have known limitations with the semantics of +shared libraries that end up requiring recompilation when using this +method, particularly noticeable in packages that use GNU Libtool. + + The second method involves providing the `DESTDIR' variable. For +example, `make install DESTDIR=/alternate/directory' will prepend +`/alternate/directory' before all installation names. The approach of +`DESTDIR' overrides is not required by the GNU Coding Standards, and +does not work on platforms that have drive letters. On the other hand, +it does better at avoiding recompilation issues, and works well even +when some directory options were not specified in terms of `${prefix}' +at `configure' time. + +Optional Features +================= + + If the package supports it, you can cause programs to be installed +with an extra prefix or suffix on their names by giving `configure' the +option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. + + Some packages pay attention to `--enable-FEATURE' options to +`configure', where FEATURE indicates an optional part of the package. +They may also pay attention to `--with-PACKAGE' options, where PACKAGE +is something like `gnu-as' or `x' (for the X Window System). The +`README' should mention any `--enable-' and `--with-' options that the +package recognizes. + + For packages that use the X Window System, `configure' can usually +find the X include and library files automatically, but if it doesn't, +you can use the `configure' options `--x-includes=DIR' and +`--x-libraries=DIR' to specify their locations. + + Some packages offer the ability to configure how verbose the +execution of `make' will be. For these packages, running `./configure +--enable-silent-rules' sets the default to minimal output, which can be +overridden with `make V=1'; while running `./configure +--disable-silent-rules' sets the default to verbose, which can be +overridden with `make V=0'. + +Particular systems +================== + + On HP-UX, the default C compiler is not ANSI C compatible. If GNU +CC is not installed, it is recommended to use the following options in +order to use an ANSI C compiler: + + ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" + +and if that doesn't work, install pre-built binaries of GCC for HP-UX. + + HP-UX `make' updates targets which have the same time stamps as +their prerequisites, which makes it generally unusable when shipped +generated files such as `configure' are involved. Use GNU `make' +instead. + + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot +parse its `' header file. The option `-nodtk' can be used as +a workaround. If GNU CC is not installed, it is therefore recommended +to try + + ./configure CC="cc" + +and if that doesn't work, try + + ./configure CC="cc -nodtk" + + On Solaris, don't put `/usr/ucb' early in your `PATH'. This +directory contains several dysfunctional programs; working variants of +these programs are available in `/usr/bin'. So, if you need `/usr/ucb' +in your `PATH', put it _after_ `/usr/bin'. + + On Haiku, software installed for all users goes in `/boot/common', +not `/usr/local'. It is recommended to use the following options: + + ./configure --prefix=/boot/common + +Specifying the System Type +========================== + + There may be some features `configure' cannot figure out +automatically, but needs to determine by the type of machine the package +will run on. Usually, assuming the package is built to be run on the +_same_ architectures, `configure' can figure that out, but if it prints +a message saying it cannot guess the machine type, give it the +`--build=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name which has the form: + + CPU-COMPANY-SYSTEM + +where SYSTEM can have one of these forms: + + OS + KERNEL-OS + + See the file `config.sub' for the possible values of each field. If +`config.sub' isn't included in this package, then this package doesn't +need to know the machine type. + + If you are _building_ compiler tools for cross-compiling, you should +use the option `--target=TYPE' to select the type of system they will +produce code for. + + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with `--host=TYPE'. + +Sharing Defaults +================ + + If you want to set default values for `configure' scripts to share, +you can create a site shell script called `config.site' that gives +default values for variables like `CC', `cache_file', and `prefix'. +`configure' looks for `PREFIX/share/config.site' if it exists, then +`PREFIX/etc/config.site' if it exists. Or, you can set the +`CONFIG_SITE' environment variable to the location of the site script. +A warning: not all `configure' scripts look for a site script. + +Defining Variables +================== + + Variables not defined in a site shell script can be set in the +environment passed to `configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the `configure' command line, using `VAR=value'. For example: + + ./configure CC=/usr/local2/bin/gcc + +causes the specified `gcc' to be used as the C compiler (unless it is +overridden in the site shell script). + +Unfortunately, this technique does not work for `CONFIG_SHELL' due to +an Autoconf bug. Until the bug is fixed you can use this workaround: + + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + +`configure' Invocation +====================== + + `configure' recognizes the following options to control how it +operates. + +`--help' +`-h' + Print a summary of all of the options to `configure', and exit. + +`--help=short' +`--help=recursive' + Print a summary of the options unique to this package's + `configure', and exit. The `short' variant lists options used + only in the top level, while the `recursive' variant lists options + also present in any nested packages. + +`--version' +`-V' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally `config.cache'. FILE defaults to `/dev/null' to + disable caching. + +`--config-cache' +`-C' + Alias for `--cache-file=config.cache'. + +`--quiet' +`--silent' +`-q' + Do not print messages saying which checks are being made. To + suppress all normal output, redirect it to `/dev/null' (any error + messages will still be shown). + +`--srcdir=DIR' + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + +`--prefix=DIR' + Use DIR as the installation prefix. *note Installation Names:: + for more details, including other options available for fine-tuning + the installation locations. + +`--no-create' +`-n' + Run the configure checks, but stop before creating any output + files. -> I recently found a video showing Fedora booting with plymouth and I -> liked it. So I wanted to use plymouth with my favorite distri (gentoo). -> I know I'm enduser and the info text on freedesktop.org says plymouth -> is not meant to be installed by end users but I want to give it a try. -> I have KMS running and am using my own initramfs anyway (encrypted root -> disk) so how hard can it be? Can anybody please give me some straight -> forward hints on how to use plymouth? (The INSTALL file is empty and -> the README file is boring) +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. -So the basic idea is you need to: - -1) build plymouth into the system. On fedora we use these conffigure flags: - -.%configure --enable-tracing --disable-tests --without-boot-entry \ - --without-default-plugin \ - --with-logo=%{_datadir}/pixmaps/system-logo-white.png \ - --with-background-start-color-stop=0x0073B3 \ - --with-background-end-color-stop=0x00457E \ - --with-background-color=0x3391cd \ - --enable-gdm-transition \ - --with-system-root-install \ - --with-rhgb-compat-link - -%configure is a macro that expands to: - -./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var - -(and some other stuff) - -%{_datadir} is just /usr/share - -You probably won't need --with-rhgb-compat-link since that's only -there for compatibility with Fedora's old infrastructure. - ---with-system-root-install makes plymouthd and plymouth install -themselves into / instead of /usr. This is important so that the -plymouth client can work in cases where the root fs is mounted, but -/usr isn't yet. - -Somehow you need to hook into your distros mkinitrd mechanism. I -mean you need to copy the plymouth binaries, plugins, and data files -into the initrd everytime you rebuild your initrd. See -plymouth-populate-initrd for how we do it on fedora (mkinitrd calls -plymouth-populate-initrd). I would like to upstream hooks for other -distros mkinitrd systems, so the out of the box experience is easier. - -Inside the initrd, you need to start plymouthd early. The earlier the -better, but not before /sys, /proc/, and /dev/pts are mounted, and -not before /dev/tty[01] and /dev/fb0 are created. - -At some point during the initrd you need to load the kms driver. -After it's loaded the graphics mode should get set up and /dev/fb0 -will be functional. That's when you call plymouth --show-splash to -show the splash screen. - -To decrypt your root, run - -lymouth ask-for-password --command="/sbin/cryptsetup luksOpen -T ..." - -where the --command is whatever makes sense for you. - -Right after you mount the root file system (but before you switch to it), run - -plymouth --newroot=/wherevertherootismounted - -This tells plymouth it can load some files off the real filesystem -(like fonts, and stuff we don't want to stick in the initrd). - -while boot you need to run plymouth --update=some-milestone-id - -periodically to update the progress bar. - -When / is mounted read-write you need to run - -plymouth --sysinit - -Finally, when plymouth is done, you need to run plymouth --quit - -I have to run to catch a bus but i think that's the basics. - -> I'm even willing to give something back and convert your hints -> into an easy step by step howto. -That'd be great! - ---Ray --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.11.3 -*- Autoconf -*- +# generated automatically by aclocal 1.11.6 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, # 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, @@ -14,8 +14,8 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, -[m4_warning([this file was generated for autoconf 2.68. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, +[m4_warning([this file was generated for autoconf 2.69. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) @@ -2526,17 +2526,6 @@ esac ;; -gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no @@ -2653,7 +2642,7 @@ ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no @@ -2683,14 +2672,10 @@ # before this can be enabled. hardcode_into_libs=yes - # Add ABI-specific directories to the system library path. - sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" - # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" - + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -2702,6 +2687,18 @@ dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -3261,10 +3258,6 @@ fi ;; -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -3303,11 +3296,11 @@ ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) lt_cv_deplibs_check_method=pass_all ;; -netbsd*) +netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' else @@ -4055,7 +4048,7 @@ ;; esac ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # KAI C++ Compiler @@ -4119,7 +4112,7 @@ ;; esac ;; - netbsd*) + netbsd* | netbsdelf*-gnu) ;; *qnx* | *nto*) # QNX uses GNU C++, but need to define -shared option too, otherwise @@ -4354,7 +4347,7 @@ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -4596,6 +4589,9 @@ ;; esac ;; + linux* | k*bsd*-gnu | gnu*) + _LT_TAGVAR(link_all_deplibs, $1)=no + ;; *) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; @@ -4658,6 +4654,9 @@ openbsd*) with_gnu_ld=no ;; + linux* | k*bsd*-gnu | gnu*) + _LT_TAGVAR(link_all_deplibs, $1)=no + ;; esac _LT_TAGVAR(ld_shlibs, $1)=yes @@ -4879,7 +4878,7 @@ fi ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -5056,6 +5055,7 @@ if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi + _LT_TAGVAR(link_all_deplibs, $1)=no else # not using gcc if test "$host_cpu" = ia64; then @@ -5360,7 +5360,7 @@ _LT_TAGVAR(link_all_deplibs, $1)=yes ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -6236,9 +6236,6 @@ _LT_TAGVAR(ld_shlibs, $1)=yes ;; - gnu*) - ;; - haiku*) _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' _LT_TAGVAR(link_all_deplibs, $1)=yes @@ -6400,7 +6397,7 @@ _LT_TAGVAR(inherit_rpath, $1)=yes ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler @@ -8639,7 +8636,8 @@ # ---------------------------------- AC_DEFUN([PKG_PROG_PKG_CONFIG], [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) +m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) +m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) @@ -8685,7 +8683,8 @@ pkg_cv_[]$1="$$1" elif test -n "$PKG_CONFIG"; then PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes ], [pkg_failed=yes]) else pkg_failed=untried @@ -8733,9 +8732,9 @@ AC_MSG_RESULT([no]) _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD @@ -8748,7 +8747,7 @@ Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -_PKG_TEXT]) +_PKG_TEXT])[]dnl ]) elif test $pkg_failed = untried; then AC_MSG_RESULT([no]) @@ -8759,7 +8758,7 @@ _PKG_TEXT -To get pkg-config, see .]) +To get pkg-config, see .])[]dnl ]) else $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS @@ -8787,7 +8786,7 @@ [am__api_version='1.11' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.3], [], +m4_if([$1], [1.11.6], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -8803,7 +8802,7 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.3])dnl +[AM_AUTOMAKE_VERSION([1.11.6])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) --- a/build-tools/config.guess +++ b/build-tools/config.guess @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, # 2011, 2012 Free Software Foundation, Inc. -timestamp='2012-01-01' +timestamp='2012-02-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -17,9 +17,7 @@ # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -863,6 +861,13 @@ i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; + aarch64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + aarch64_be:Linux:*:*) + UNAME_MACHINE=aarch64_be + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in EV5) UNAME_MACHINE=alphaev5 ;; @@ -1320,6 +1325,9 @@ i*86:AROS:*:*) echo ${UNAME_MACHINE}-pc-aros exit ;; + x86_64:VMkernel:*:*) + echo ${UNAME_MACHINE}-unknown-esx + exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 --- a/build-tools/config.sub +++ b/build-tools/config.sub @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, # 2011, 2012 Free Software Foundation, Inc. -timestamp='2012-01-01' +timestamp='2012-04-18' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -21,9 +21,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -132,6 +130,10 @@ os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; + android-linux) + os=-linux-android + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown + ;; *) basic_machine=`echo $1 | sed 's/-[^-]*$//'` if [ $basic_machine != $1 ] @@ -223,6 +225,12 @@ -isc*) basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -lynx*178) + os=-lynxos178 + ;; + -lynx*5) + os=-lynxos5 + ;; -lynx*) os=-lynxos ;; @@ -247,6 +255,7 @@ # Some are omitted here because they have special meanings below. 1750a | 580 \ | a29k \ + | aarch64 | aarch64_be \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ @@ -319,7 +328,7 @@ c6x) basic_machine=tic6x-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12 | picochip) + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) basic_machine=$basic_machine-unknown os=-none ;; @@ -332,7 +341,10 @@ strongarm | thumb | xscale) basic_machine=arm-unknown ;; - + xgate) + basic_machine=$basic_machine-unknown + os=-none + ;; xscaleeb) basic_machine=armeb-unknown ;; @@ -355,6 +367,7 @@ # Recognize the basic CPU types with company name. 580-* \ | a29k-* \ + | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ @@ -1530,6 +1543,9 @@ c4x-* | tic4x-*) os=-coff ;; + hexagon-*) + os=-elf + ;; tic54x-*) os=-coff ;; --- a/build-tools/ltmain.sh +++ b/build-tools/ltmain.sh @@ -70,7 +70,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4.2 +# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.1ubuntu1 # automake: $automake_version # autoconf: $autoconf_version # @@ -80,7 +80,7 @@ PROGRAM=libtool PACKAGE=libtool -VERSION=2.4.2 +VERSION="2.4.2 Debian-2.4.2-1.1ubuntu1" TIMESTAMP="" package_revision=1.3337 @@ -6124,7 +6124,10 @@ case $pass in dlopen) libs="$dlfiles" ;; dlpreopen) libs="$dlprefiles" ;; - link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; + link) + libs="$deplibs %DEPLIBS%" + test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" + ;; esac fi if test "$linkmode,$pass" = "lib,dlpreopen"; then @@ -6444,19 +6447,19 @@ # It is a libtool convenience library, so add in its objects. func_append convenience " $ladir/$objdir/$old_library" func_append old_convenience " $ladir/$objdir/$old_library" + tmp_libs= + for deplib in $dependency_libs; do + deplibs="$deplib $deplibs" + if $opt_preserve_dup_deps ; then + case "$tmp_libs " in + *" $deplib "*) func_append specialdeplibs " $deplib" ;; + esac + fi + func_append tmp_libs " $deplib" + done elif test "$linkmode" != prog && test "$linkmode" != lib; then func_fatal_error "\`$lib' is not a convenience library" fi - tmp_libs= - for deplib in $dependency_libs; do - deplibs="$deplib $deplibs" - if $opt_preserve_dup_deps ; then - case "$tmp_libs " in - *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi - func_append tmp_libs " $deplib" - done continue fi # $pass = conv @@ -7349,6 +7352,9 @@ revision="$number_minor" lt_irix_increment=no ;; + *) + func_fatal_configuration "$modename: unknown library version type \`$version_type'" + ;; esac ;; no) --- a/configure +++ b/configure @@ -1,13 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for plymouth 0.8.8. +# Generated by GNU Autoconf 2.69 for plymouth 0.8.8. # # Report bugs to . # # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -136,6 +134,31 @@ # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -169,7 +192,8 @@ else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1" +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && @@ -222,21 +246,25 @@ if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - # Preserve -v and -x to the replacement shell. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; - esac - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi if test x$as_have_required = xno; then : @@ -340,6 +368,14 @@ } # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -461,6 +497,10 @@ chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -495,16 +535,16 @@ # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -516,28 +556,8 @@ as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -624,6 +644,8 @@ PLYMOUTH_POLICY_DIR PLYMOUTH_PLUGIN_PATH PLYMOUTH_THEME_PATH +BUILD_VGA16FB_FALSE +BUILD_VGA16FB_TRUE RELEASE_FILE background_end_color background_start_color @@ -1333,8 +1355,6 @@ if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1667,9 +1687,9 @@ if $ac_init_version; then cat <<\_ACEOF plymouth configure 0.8.8 -generated by GNU Autoconf 2.68 +generated by GNU Autoconf 2.69 -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1946,7 +1966,7 @@ test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext + test -x conftest$ac_exeext }; then : ac_retval=0 else @@ -2031,12 +2051,58 @@ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_func + +# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES +# --------------------------------------------- +# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR +# accordingly. +ac_fn_c_check_decl () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + as_decl_name=`echo $2|sed 's/ *(.*//'` + as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 +$as_echo_n "checking whether $as_decl_name is declared... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +#ifndef $as_decl_name +#ifdef __cplusplus + (void) $as_decl_use; +#else + (void) $as_decl_name; +#endif +#endif + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_decl cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by plymouth $as_me 0.8.8, which was -generated by GNU Autoconf 2.68. Invocation command line was +generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2438,7 +2504,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2478,7 +2544,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2531,7 +2597,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2572,7 +2638,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -2630,7 +2696,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2674,7 +2740,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3120,8 +3186,7 @@ /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -3361,7 +3426,7 @@ for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue + as_fn_executable_p "$ac_path_GREP" || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in @@ -3427,7 +3492,7 @@ for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue + as_fn_executable_p "$ac_path_EGREP" || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in @@ -3634,8 +3699,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -# define __EXTENSIONS__ 1 - $ac_includes_default +# define __EXTENSIONS__ 1 + $ac_includes_default int main () { @@ -3861,6 +3926,8 @@ esac rm -rf conftest* fi + + fi for ac_prog in gawk mawk nawk awk @@ -3881,7 +3948,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AWK="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3927,7 +3994,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3967,7 +4034,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4020,7 +4087,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4061,7 +4128,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -4119,7 +4186,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4163,7 +4230,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4359,8 +4426,7 @@ /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -4697,11 +4763,11 @@ int main () { -/* FIXME: Include the comments suggested by Paul. */ + #ifndef __cplusplus - /* Ultrix mips cc rejects this. */ + /* Ultrix mips cc rejects this sort of thing. */ typedef int charset[2]; - const charset cs; + const charset cs = { 0, 0 }; /* SunOS 4.1.1 cc rejects this. */ char const *const *pcpcc; char **ppc; @@ -4718,8 +4784,9 @@ ++pcpcc; ppc = (char**) pcpcc; pcpcc = (char const *const *) ppc; - { /* SCO 3.2v4 cc rejects this. */ - char *t; + { /* SCO 3.2v4 cc rejects this sort of thing. */ + char tx; + char *t = &tx; char const *s = 0 ? (char *) 0 : (char const *) 0; *t++ = 0; @@ -4735,10 +4802,10 @@ iptr p = 0; ++p; } - { /* AIX XL C 1.02.0.0 rejects this saying + { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ - struct s { int j; const int *ap[3]; }; - struct s *b; b->j = 5; + struct s { int j; const int *ap[3]; } bx; + struct s *b = &bx; b->j = 5; } { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ const int foo = 10; @@ -4806,7 +4873,7 @@ # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -4972,7 +5039,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5012,7 +5079,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5063,7 +5130,7 @@ test -z "$as_dir" && as_dir=. for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue + as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( 'mkdir (GNU coreutils) '* | \ 'mkdir (coreutils) '* | \ @@ -5460,6 +5527,7 @@ + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. @@ -5480,7 +5548,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5523,7 +5591,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5760,7 +5828,7 @@ for ac_prog in sed gsed; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue + as_fn_executable_p "$ac_path_SED" || continue # Check for GNU ac_path_SED and select it if it is found. # Check for GNU $ac_path_SED case `"$ac_path_SED" --version 2>&1` in @@ -5839,7 +5907,7 @@ for ac_prog in fgrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue + as_fn_executable_p "$ac_path_FGREP" || continue # Check for GNU ac_path_FGREP and select it if it is found. # Check for GNU $ac_path_FGREP case `"$ac_path_FGREP" --version 2>&1` in @@ -6095,7 +6163,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6139,7 +6207,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6563,7 +6631,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6603,7 +6671,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OBJDUMP="objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6729,10 +6797,6 @@ fi ;; -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -6771,11 +6835,11 @@ ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) lt_cv_deplibs_check_method=pass_all ;; -netbsd*) +netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' else @@ -6909,7 +6973,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6949,7 +7013,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DLLTOOL="dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7052,7 +7116,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AR="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7096,7 +7160,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_AR="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7221,7 +7285,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7261,7 +7325,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7320,7 +7384,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7360,7 +7424,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_RANLIB="ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8009,7 +8073,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8049,7 +8113,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8129,7 +8193,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8169,7 +8233,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8221,7 +8285,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8261,7 +8325,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_NMEDIT="nmedit" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8313,7 +8377,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_LIPO="${ac_tool_prefix}lipo" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8353,7 +8417,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_LIPO="lipo" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8405,7 +8469,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL="${ac_tool_prefix}otool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8445,7 +8509,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL="otool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8497,7 +8561,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8537,7 +8601,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL64="otool64" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9426,7 +9490,7 @@ lt_prog_compiler_static='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -9904,6 +9968,9 @@ openbsd*) with_gnu_ld=no ;; + linux* | k*bsd*-gnu | gnu*) + link_all_deplibs=no + ;; esac ld_shlibs=yes @@ -10125,7 +10192,7 @@ fi ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -10302,6 +10369,7 @@ if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi + link_all_deplibs=no else # not using gcc if test "$host_cpu" = ia64; then @@ -10755,7 +10823,7 @@ link_all_deplibs=yes ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -11592,17 +11660,6 @@ esac ;; -gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no @@ -11719,7 +11776,7 @@ ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no @@ -11768,14 +11825,10 @@ # before this can be enabled. hardcode_into_libs=yes - # Add ABI-specific directories to the system library path. - sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" - # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" - + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -11787,6 +11840,18 @@ dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -12789,6 +12854,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_IMAGE_CFLAGS=`$PKG_CONFIG --cflags "libpng >= 1.2.16 " 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -12805,6 +12871,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_IMAGE_LIBS=`$PKG_CONFIG --libs "libpng >= 1.2.16 " 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -12824,9 +12891,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - IMAGE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libpng >= 1.2.16 " 2>&1` + IMAGE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libpng >= 1.2.16 " 2>&1` else - IMAGE_PKG_ERRORS=`$PKG_CONFIG --print-errors "libpng >= 1.2.16 " 2>&1` + IMAGE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libpng >= 1.2.16 " 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$IMAGE_PKG_ERRORS" >&5 @@ -12841,7 +12908,6 @@ Alternatively, you may set the environment variables IMAGE_CFLAGS and IMAGE_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 - elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -12857,7 +12923,6 @@ To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } - else IMAGE_CFLAGS=$pkg_cv_IMAGE_CFLAGS IMAGE_LIBS=$pkg_cv_IMAGE_LIBS @@ -12906,6 +12971,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_PANGO_CFLAGS=`$PKG_CONFIG --cflags "pangocairo >= 1.21.0 " 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -12922,6 +12988,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_PANGO_LIBS=`$PKG_CONFIG --libs "pangocairo >= 1.21.0 " 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -12941,9 +13008,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - PANGO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "pangocairo >= 1.21.0 " 2>&1` + PANGO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "pangocairo >= 1.21.0 " 2>&1` else - PANGO_PKG_ERRORS=`$PKG_CONFIG --print-errors "pangocairo >= 1.21.0 " 2>&1` + PANGO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "pangocairo >= 1.21.0 " 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$PANGO_PKG_ERRORS" >&5 @@ -12958,7 +13025,6 @@ Alternatively, you may set the environment variables PANGO_CFLAGS and PANGO_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 - elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -12974,7 +13040,6 @@ To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } - else PANGO_CFLAGS=$pkg_cv_PANGO_CFLAGS PANGO_LIBS=$pkg_cv_PANGO_LIBS @@ -13018,6 +13083,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.12.0 " 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -13034,6 +13100,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.12.0 " 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -13053,9 +13120,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0 >= 2.12.0 " 2>&1` + GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-2.0 >= 2.12.0 " 2>&1` else - GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0 >= 2.12.0 " 2>&1` + GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-2.0 >= 2.12.0 " 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GTK_PKG_ERRORS" >&5 @@ -13070,7 +13137,6 @@ Alternatively, you may set the environment variables GTK_CFLAGS and GTK_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 - elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -13086,7 +13152,6 @@ To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } - else GTK_CFLAGS=$pkg_cv_GTK_CFLAGS GTK_LIBS=$pkg_cv_GTK_LIBS @@ -13130,6 +13195,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DRM_INTEL_CFLAGS=`$PKG_CONFIG --cflags "libdrm libdrm_intel" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -13146,6 +13212,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DRM_INTEL_LIBS=`$PKG_CONFIG --libs "libdrm libdrm_intel" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -13165,9 +13232,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - DRM_INTEL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libdrm libdrm_intel" 2>&1` + DRM_INTEL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libdrm libdrm_intel" 2>&1` else - DRM_INTEL_PKG_ERRORS=`$PKG_CONFIG --print-errors "libdrm libdrm_intel" 2>&1` + DRM_INTEL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libdrm libdrm_intel" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$DRM_INTEL_PKG_ERRORS" >&5 @@ -13182,7 +13249,6 @@ Alternatively, you may set the environment variables DRM_INTEL_CFLAGS and DRM_INTEL_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 - elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -13198,7 +13264,6 @@ To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } - else DRM_INTEL_CFLAGS=$pkg_cv_DRM_INTEL_CFLAGS DRM_INTEL_LIBS=$pkg_cv_DRM_INTEL_LIBS @@ -13315,6 +13380,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DRM_RADEON_CFLAGS=`$PKG_CONFIG --cflags "libdrm libdrm_radeon" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -13331,6 +13397,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DRM_RADEON_LIBS=`$PKG_CONFIG --libs "libdrm libdrm_radeon" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -13350,9 +13417,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - DRM_RADEON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libdrm libdrm_radeon" 2>&1` + DRM_RADEON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libdrm libdrm_radeon" 2>&1` else - DRM_RADEON_PKG_ERRORS=`$PKG_CONFIG --print-errors "libdrm libdrm_radeon" 2>&1` + DRM_RADEON_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libdrm libdrm_radeon" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$DRM_RADEON_PKG_ERRORS" >&5 @@ -13367,7 +13434,6 @@ Alternatively, you may set the environment variables DRM_RADEON_CFLAGS and DRM_RADEON_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 - elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -13383,7 +13449,6 @@ To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } - else DRM_RADEON_CFLAGS=$pkg_cv_DRM_RADEON_CFLAGS DRM_RADEON_LIBS=$pkg_cv_DRM_RADEON_LIBS @@ -13500,6 +13565,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DRM_NOUVEAU_CFLAGS=`$PKG_CONFIG --cflags "libdrm libdrm_nouveau" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -13516,6 +13582,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DRM_NOUVEAU_LIBS=`$PKG_CONFIG --libs "libdrm libdrm_nouveau" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -13535,9 +13602,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - DRM_NOUVEAU_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libdrm libdrm_nouveau" 2>&1` + DRM_NOUVEAU_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libdrm libdrm_nouveau" 2>&1` else - DRM_NOUVEAU_PKG_ERRORS=`$PKG_CONFIG --print-errors "libdrm libdrm_nouveau" 2>&1` + DRM_NOUVEAU_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libdrm libdrm_nouveau" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$DRM_NOUVEAU_PKG_ERRORS" >&5 @@ -13552,7 +13619,6 @@ Alternatively, you may set the environment variables DRM_NOUVEAU_CFLAGS and DRM_NOUVEAU_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 - elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -13568,7 +13634,6 @@ To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } - else DRM_NOUVEAU_CFLAGS=$pkg_cv_DRM_NOUVEAU_CFLAGS DRM_NOUVEAU_LIBS=$pkg_cv_DRM_NOUVEAU_LIBS @@ -13685,6 +13750,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBKMS_CFLAGS=`$PKG_CONFIG --cflags "libdrm libkms" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -13701,6 +13767,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBKMS_LIBS=`$PKG_CONFIG --libs "libdrm libkms" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -13720,9 +13787,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBKMS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libdrm libkms" 2>&1` + LIBKMS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libdrm libkms" 2>&1` else - LIBKMS_PKG_ERRORS=`$PKG_CONFIG --print-errors "libdrm libkms" 2>&1` + LIBKMS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libdrm libkms" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$LIBKMS_PKG_ERRORS" >&5 @@ -13737,7 +13804,6 @@ Alternatively, you may set the environment variables LIBKMS_CFLAGS and LIBKMS_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 - elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -13753,7 +13819,6 @@ To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } - else LIBKMS_CFLAGS=$pkg_cv_LIBKMS_CFLAGS LIBKMS_LIBS=$pkg_cv_LIBKMS_LIBS @@ -13800,6 +13865,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DRM_CFLAGS=`$PKG_CONFIG --cflags "libdrm" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -13816,6 +13882,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DRM_LIBS=`$PKG_CONFIG --libs "libdrm" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -13835,9 +13902,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - DRM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libdrm" 2>&1` + DRM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libdrm" 2>&1` else - DRM_PKG_ERRORS=`$PKG_CONFIG --print-errors "libdrm" 2>&1` + DRM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libdrm" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$DRM_PKG_ERRORS" >&5 @@ -13852,7 +13919,6 @@ Alternatively, you may set the environment variables DRM_CFLAGS and DRM_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 - elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -13868,7 +13934,6 @@ To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } - else DRM_CFLAGS=$pkg_cv_DRM_CFLAGS DRM_LIBS=$pkg_cv_DRM_LIBS @@ -13951,6 +14016,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-1" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -13967,6 +14033,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs "dbus-1" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -13986,9 +14053,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-1" 2>&1` + DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "dbus-1" 2>&1` else - DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-1" 2>&1` + DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "dbus-1" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$DBUS_PKG_ERRORS" >&5 @@ -14003,7 +14070,6 @@ Alternatively, you may set the environment variables DBUS_CFLAGS and DBUS_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 - elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -14019,7 +14085,6 @@ To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } - else DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS DBUS_LIBS=$pkg_cv_DBUS_LIBS @@ -14495,6 +14560,40 @@ _ACEOF +for ac_header in sys/io.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "sys/io.h" "ac_cv_header_sys_io_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_io_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_SYS_IO_H 1 +_ACEOF + +fi + +done + + if test "x$ac_cv_header_sys_io_h" = xyes; then + BUILD_VGA16FB_TRUE= + BUILD_VGA16FB_FALSE='#' +else + BUILD_VGA16FB_TRUE='#' + BUILD_VGA16FB_FALSE= +fi + + +ac_fn_c_check_decl "$LINENO" "MSG_NOSIGNAL" "ac_cv_have_decl_MSG_NOSIGNAL" " #include +" +if test "x$ac_cv_have_decl_MSG_NOSIGNAL" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_MSG_NOSIGNAL $ac_have_decl +_ACEOF + + # Turn on the additional warnings last, so -Werror doesn't affect other tests. @@ -14804,7 +14903,7 @@ exec_prefix=$exec_prefix_save -ac_config_files="$ac_config_files Makefile src/libply/Makefile src/libply-splash-core/Makefile src/libply-splash-graphics/Makefile src/ply-splash-core.pc src/ply-splash-graphics.pc src/plugins/Makefile src/plugins/renderers/Makefile src/plugins/renderers/frame-buffer/Makefile src/plugins/renderers/drm/Makefile src/plugins/renderers/x11/Makefile src/plugins/splash/Makefile src/plugins/splash/throbgress/Makefile src/plugins/splash/fade-throbber/Makefile src/plugins/splash/text/Makefile src/plugins/splash/details/Makefile src/plugins/splash/space-flares/Makefile src/plugins/splash/two-step/Makefile src/plugins/splash/script/Makefile src/plugins/controls/Makefile src/plugins/controls/label/Makefile src/Makefile src/client/ply-boot-client.pc src/client/Makefile src/viewer/Makefile src/upstart-bridge/Makefile src/tests/Makefile src/libply/tests/Makefile src/client/tests/Makefile themes/Makefile themes/spinfinity/Makefile themes/fade-in/Makefile themes/text/Makefile themes/details/Makefile themes/solar/Makefile themes/glow/Makefile themes/spinner/Makefile themes/script/Makefile images/Makefile scripts/plymouth-generate-initrd scripts/plymouth-populate-initrd scripts/plymouth-set-default-theme scripts/Makefile systemd-units/plymouth-halt.service systemd-units/plymouth-kexec.service systemd-units/plymouth-poweroff.service systemd-units/plymouth-quit.service systemd-units/plymouth-quit-wait.service systemd-units/plymouth-read-write.service systemd-units/plymouth-reboot.service systemd-units/plymouth-start.service systemd-units/plymouth-switch-root.service systemd-units/systemd-ask-password-plymouth.path systemd-units/systemd-ask-password-plymouth.service systemd-units/Makefile docs/Makefile" +ac_config_files="$ac_config_files Makefile src/libply/Makefile src/libply-splash-core/Makefile src/libply-splash-graphics/Makefile src/ply-splash-core.pc src/ply-splash-graphics.pc src/plugins/Makefile src/plugins/renderers/Makefile src/plugins/renderers/frame-buffer/Makefile src/plugins/renderers/drm/Makefile src/plugins/renderers/x11/Makefile src/plugins/renderers/vga16fb/Makefile src/plugins/splash/Makefile src/plugins/splash/throbgress/Makefile src/plugins/splash/fade-throbber/Makefile src/plugins/splash/ubuntu-text/Makefile src/plugins/splash/text/Makefile src/plugins/splash/details/Makefile src/plugins/splash/space-flares/Makefile src/plugins/splash/two-step/Makefile src/plugins/splash/script/Makefile src/plugins/controls/Makefile src/plugins/controls/label/Makefile src/Makefile src/client/ply-boot-client.pc src/client/Makefile src/viewer/Makefile src/upstart-bridge/Makefile src/tests/Makefile src/libply/tests/Makefile src/client/tests/Makefile themes/Makefile themes/spinfinity/Makefile themes/fade-in/Makefile themes/text/Makefile themes/details/Makefile themes/solar/Makefile themes/glow/Makefile themes/spinner/Makefile themes/script/Makefile themes/ubuntu-logo/Makefile themes/ubuntu-text/Makefile images/Makefile scripts/plymouth-generate-initrd scripts/plymouth-populate-initrd scripts/plymouth-set-default-theme scripts/Makefile systemd-units/plymouth-halt.service systemd-units/plymouth-kexec.service systemd-units/plymouth-poweroff.service systemd-units/plymouth-quit.service systemd-units/plymouth-quit-wait.service systemd-units/plymouth-read-write.service systemd-units/plymouth-reboot.service systemd-units/plymouth-start.service systemd-units/plymouth-switch-root.service systemd-units/systemd-ask-password-plymouth.path systemd-units/systemd-ask-password-plymouth.service systemd-units/Makefile docs/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -14995,6 +15094,10 @@ as_fn_error $? "conditional \"INSTALL_FALLBACK_LOGO\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${BUILD_VGA16FB_TRUE}" && test -z "${BUILD_VGA16FB_FALSE}"; then + as_fn_error $? "conditional \"BUILD_VGA16FB\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 @@ -15293,16 +15396,16 @@ # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -15362,28 +15465,16 @@ as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -15405,7 +15496,7 @@ # values after options handling. ac_log=" This file was extended by plymouth $as_me 0.8.8, which was -generated by GNU Autoconf 2.68. Invocation command line was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -15471,10 +15562,10 @@ ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ plymouth config.status 0.8.8 -configured by $0, generated by GNU Autoconf 2.68, +configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -15565,7 +15656,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' @@ -15890,9 +15981,11 @@ "src/plugins/renderers/frame-buffer/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/renderers/frame-buffer/Makefile" ;; "src/plugins/renderers/drm/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/renderers/drm/Makefile" ;; "src/plugins/renderers/x11/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/renderers/x11/Makefile" ;; + "src/plugins/renderers/vga16fb/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/renderers/vga16fb/Makefile" ;; "src/plugins/splash/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/splash/Makefile" ;; "src/plugins/splash/throbgress/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/splash/throbgress/Makefile" ;; "src/plugins/splash/fade-throbber/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/splash/fade-throbber/Makefile" ;; + "src/plugins/splash/ubuntu-text/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/splash/ubuntu-text/Makefile" ;; "src/plugins/splash/text/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/splash/text/Makefile" ;; "src/plugins/splash/details/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/splash/details/Makefile" ;; "src/plugins/splash/space-flares/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/splash/space-flares/Makefile" ;; @@ -15917,6 +16010,8 @@ "themes/glow/Makefile") CONFIG_FILES="$CONFIG_FILES themes/glow/Makefile" ;; "themes/spinner/Makefile") CONFIG_FILES="$CONFIG_FILES themes/spinner/Makefile" ;; "themes/script/Makefile") CONFIG_FILES="$CONFIG_FILES themes/script/Makefile" ;; + "themes/ubuntu-logo/Makefile") CONFIG_FILES="$CONFIG_FILES themes/ubuntu-logo/Makefile" ;; + "themes/ubuntu-text/Makefile") CONFIG_FILES="$CONFIG_FILES themes/ubuntu-text/Makefile" ;; "images/Makefile") CONFIG_FILES="$CONFIG_FILES images/Makefile" ;; "scripts/plymouth-generate-initrd") CONFIG_FILES="$CONFIG_FILES scripts/plymouth-generate-initrd" ;; "scripts/plymouth-populate-initrd") CONFIG_FILES="$CONFIG_FILES scripts/plymouth-populate-initrd" ;; --- /dev/null +++ b/src/plugins/splash/ubuntu-text/Makefile.in @@ -0,0 +1,648 @@ +# Makefile.in generated by automake 1.11.6 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = src/plugins/splash/ubuntu-text +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(plugindir)" +LTLIBRARIES = $(plugin_LTLIBRARIES) +am__DEPENDENCIES_1 = +ubuntu_text_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ + ../../../libply/libply.la \ + ../../../libply-splash-core/libply-splash-core.la +am_ubuntu_text_la_OBJECTS = ubuntu_text_la-plugin.lo +ubuntu_text_la_OBJECTS = $(am_ubuntu_text_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +ubuntu_text_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(ubuntu_text_la_CFLAGS) $(CFLAGS) $(ubuntu_text_la_LDFLAGS) \ + $(LDFLAGS) -o $@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/build-tools/depcomp +am__depfiles_maybe = depfiles +am__mv = mv -f +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +CCLD = $(CC) +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +SOURCES = $(ubuntu_text_la_SOURCES) +DIST_SOURCES = $(ubuntu_text_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CURSES_LIBS = @CURSES_LIBS@ +CYGPATH_W = @CYGPATH_W@ +DBUS_CFLAGS = @DBUS_CFLAGS@ +DBUS_LIBS = @DBUS_LIBS@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ +DRM_CFLAGS = @DRM_CFLAGS@ +DRM_INTEL_CFLAGS = @DRM_INTEL_CFLAGS@ +DRM_INTEL_LIBS = @DRM_INTEL_LIBS@ +DRM_LIBS = @DRM_LIBS@ +DRM_NOUVEAU_CFLAGS = @DRM_NOUVEAU_CFLAGS@ +DRM_NOUVEAU_LIBS = @DRM_NOUVEAU_LIBS@ +DRM_RADEON_CFLAGS = @DRM_RADEON_CFLAGS@ +DRM_RADEON_LIBS = @DRM_RADEON_LIBS@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GREP = @GREP@ +GTK_CFLAGS = @GTK_CFLAGS@ +GTK_LIBS = @GTK_LIBS@ +IMAGE_CFLAGS = @IMAGE_CFLAGS@ +IMAGE_LIBS = @IMAGE_LIBS@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBKMS_CFLAGS = @LIBKMS_CFLAGS@ +LIBKMS_LIBS = @LIBKMS_LIBS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +LT_AGE = @LT_AGE@ +LT_CURRENT = @LT_CURRENT@ +LT_REVISION = @LT_REVISION@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PANGO_CFLAGS = @PANGO_CFLAGS@ +PANGO_LIBS = @PANGO_LIBS@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +PLYMOUTH_CFLAGS = @PLYMOUTH_CFLAGS@ +PLYMOUTH_CLIENT_DIR = @PLYMOUTH_CLIENT_DIR@ +PLYMOUTH_CONF_DIR = @PLYMOUTH_CONF_DIR@ +PLYMOUTH_DAEMON_DIR = @PLYMOUTH_DAEMON_DIR@ +PLYMOUTH_DATADIR = @PLYMOUTH_DATADIR@ +PLYMOUTH_LIBDIR = @PLYMOUTH_LIBDIR@ +PLYMOUTH_LIBEXECDIR = @PLYMOUTH_LIBEXECDIR@ +PLYMOUTH_LIBS = @PLYMOUTH_LIBS@ +PLYMOUTH_LOGO_FILE = @PLYMOUTH_LOGO_FILE@ +PLYMOUTH_PLUGIN_PATH = @PLYMOUTH_PLUGIN_PATH@ +PLYMOUTH_POLICY_DIR = @PLYMOUTH_POLICY_DIR@ +PLYMOUTH_RUNTIME_DIR = @PLYMOUTH_RUNTIME_DIR@ +PLYMOUTH_THEME_PATH = @PLYMOUTH_THEME_PATH@ +RANLIB = @RANLIB@ +RELEASE_FILE = @RELEASE_FILE@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +SYSTEMD_UNIT_DIR = @SYSTEMD_UNIT_DIR@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +background_color = @background_color@ +background_end_color = @background_end_color@ +background_start_color = @background_start_color@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +logofile = @logofile@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +plymouthclientdir = @plymouthclientdir@ +plymouthdaemondir = @plymouthdaemondir@ +plymouthruntimedir = @plymouthruntimedir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +INCLUDES = -I$(top_srcdir) \ + -I$(srcdir)/../../../libply \ + -I$(srcdir)/../../../libply-splash-core \ + -I$(srcdir)/../../.. \ + -I$(srcdir)/../.. \ + -I$(srcdir)/.. \ + -I$(srcdir) + +plugindir = $(libdir)/plymouth +plugin_LTLIBRARIES = ubuntu-text.la +ubuntu_text_la_CFLAGS = $(PLYMOUTH_CFLAGS) \ + -DPLYMOUTH_BACKGROUND_COLOR=$(background_color) \ + -DPLYMOUTH_BACKGROUND_END_COLOR=$(background_end_color) \ + -DPLYMOUTH_BACKGROUND_START_COLOR=$(background_start_color) + +ubuntu_text_la_LDFLAGS = -module -avoid-version -export-dynamic +ubuntu_text_la_LIBADD = $(PLYMOUTH_LIBS) \ + ../../../libply/libply.la \ + ../../../libply-splash-core/libply-splash-core.la + +ubuntu_text_la_SOURCES = $(srcdir)/plugin.c +MAINTAINERCLEANFILES = Makefile.in +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .lo .o .obj +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/plugins/splash/ubuntu-text/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu src/plugins/splash/ubuntu-text/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): +install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) + @$(NORMAL_INSTALL) + @list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \ + list2=; for p in $$list; do \ + if test -f $$p; then \ + list2="$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \ + } + +uninstall-pluginLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$f"; \ + done + +clean-pluginLTLIBRARIES: + -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done +ubuntu-text.la: $(ubuntu_text_la_OBJECTS) $(ubuntu_text_la_DEPENDENCIES) $(EXTRA_ubuntu_text_la_DEPENDENCIES) + $(AM_V_CCLD)$(ubuntu_text_la_LINK) -rpath $(plugindir) $(ubuntu_text_la_OBJECTS) $(ubuntu_text_la_LIBADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ubuntu_text_la-plugin.Plo@am__quote@ + +.c.o: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< + +.c.obj: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` + +.c.lo: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< + +ubuntu_text_la-plugin.lo: $(srcdir)/plugin.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ubuntu_text_la_CFLAGS) $(CFLAGS) -MT ubuntu_text_la-plugin.lo -MD -MP -MF $(DEPDIR)/ubuntu_text_la-plugin.Tpo -c -o ubuntu_text_la-plugin.lo `test -f '$(srcdir)/plugin.c' || echo '$(srcdir)/'`$(srcdir)/plugin.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ubuntu_text_la-plugin.Tpo $(DEPDIR)/ubuntu_text_la-plugin.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/plugin.c' object='ubuntu_text_la-plugin.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ubuntu_text_la_CFLAGS) $(CFLAGS) -c -o ubuntu_text_la-plugin.lo `test -f '$(srcdir)/plugin.c' || echo '$(srcdir)/'`$(srcdir)/plugin.c + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + set x; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: CTAGS +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(LTLIBRARIES) +installdirs: + for dir in "$(DESTDIR)$(plugindir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) +clean: clean-am + +clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \ + mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: install-pluginLTLIBRARIES + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-pluginLTLIBRARIES + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-pluginLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-pluginLTLIBRARIES \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags uninstall uninstall-am uninstall-pluginLTLIBRARIES + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: --- /dev/null +++ b/themes/kubuntu-text/Makefile.in @@ -0,0 +1,466 @@ +# Makefile.in generated by automake 1.11.3 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = themes/kubuntu-text +DIST_COMMON = $(dist_theme_DATA) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +SOURCES = +DIST_SOURCES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(themedir)" +DATA = $(dist_theme_DATA) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CURSES_LIBS = @CURSES_LIBS@ +CYGPATH_W = @CYGPATH_W@ +DBUS_CFLAGS = @DBUS_CFLAGS@ +DBUS_LIBS = @DBUS_LIBS@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ +DRM_CFLAGS = @DRM_CFLAGS@ +DRM_INTEL_CFLAGS = @DRM_INTEL_CFLAGS@ +DRM_INTEL_LIBS = @DRM_INTEL_LIBS@ +DRM_LIBS = @DRM_LIBS@ +DRM_NOUVEAU_CFLAGS = @DRM_NOUVEAU_CFLAGS@ +DRM_NOUVEAU_LIBS = @DRM_NOUVEAU_LIBS@ +DRM_RADEON_CFLAGS = @DRM_RADEON_CFLAGS@ +DRM_RADEON_LIBS = @DRM_RADEON_LIBS@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GREP = @GREP@ +GTK_CFLAGS = @GTK_CFLAGS@ +GTK_LIBS = @GTK_LIBS@ +IMAGE_CFLAGS = @IMAGE_CFLAGS@ +IMAGE_LIBS = @IMAGE_LIBS@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBKMS_CFLAGS = @LIBKMS_CFLAGS@ +LIBKMS_LIBS = @LIBKMS_LIBS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +LT_AGE = @LT_AGE@ +LT_CURRENT = @LT_CURRENT@ +LT_REVISION = @LT_REVISION@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PANGO_CFLAGS = @PANGO_CFLAGS@ +PANGO_LIBS = @PANGO_LIBS@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +PLYMOUTH_CFLAGS = @PLYMOUTH_CFLAGS@ +PLYMOUTH_CLIENT_DIR = @PLYMOUTH_CLIENT_DIR@ +PLYMOUTH_CONF_DIR = @PLYMOUTH_CONF_DIR@ +PLYMOUTH_DAEMON_DIR = @PLYMOUTH_DAEMON_DIR@ +PLYMOUTH_DATADIR = @PLYMOUTH_DATADIR@ +PLYMOUTH_LIBDIR = @PLYMOUTH_LIBDIR@ +PLYMOUTH_LIBEXECDIR = @PLYMOUTH_LIBEXECDIR@ +PLYMOUTH_LIBS = @PLYMOUTH_LIBS@ +PLYMOUTH_LOGO_FILE = @PLYMOUTH_LOGO_FILE@ +PLYMOUTH_PLUGIN_PATH = @PLYMOUTH_PLUGIN_PATH@ +PLYMOUTH_POLICY_DIR = @PLYMOUTH_POLICY_DIR@ +PLYMOUTH_RUNTIME_DIR = @PLYMOUTH_RUNTIME_DIR@ +PLYMOUTH_THEME_PATH = @PLYMOUTH_THEME_PATH@ +RANLIB = @RANLIB@ +RELEASE_FILE = @RELEASE_FILE@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +background_color = @background_color@ +background_end_color = @background_end_color@ +background_start_color = @background_start_color@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +logofile = @logofile@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +plymouthclientdir = @plymouthclientdir@ +plymouthdaemondir = @plymouthdaemondir@ +plymouthruntimedir = @plymouthruntimedir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +themedir = $(datadir)/plymouth/themes/kubuntu-text +dist_theme_DATA = kubuntu-text.plymouth.in +MAINTAINERCLEANFILES = Makefile.in +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu themes/kubuntu-text/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu themes/kubuntu-text/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +install-dist_themeDATA: $(dist_theme_DATA) + @$(NORMAL_INSTALL) + test -z "$(themedir)" || $(MKDIR_P) "$(DESTDIR)$(themedir)" + @list='$(dist_theme_DATA)'; test -n "$(themedir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(themedir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(themedir)" || exit $$?; \ + done + +uninstall-dist_themeDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_theme_DATA)'; test -n "$(themedir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(themedir)'; $(am__uninstall_files_from_dir) +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(DATA) +installdirs: + for dir in "$(DESTDIR)$(themedir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: install-dist_themeDATA + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-dist_themeDATA + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dist_themeDATA \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am uninstall uninstall-am uninstall-dist_themeDATA + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: --- /dev/null +++ b/themes/ubuntu-logo/Makefile.in @@ -0,0 +1,532 @@ +# Makefile.in generated by automake 1.11.6 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = themes/ubuntu-logo +DIST_COMMON = $(dist_theme_DATA) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +SOURCES = +DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(themedir)" "$(DESTDIR)$(themedir)" +DATA = $(dist_theme_DATA) $(nodist_theme_DATA) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CURSES_LIBS = @CURSES_LIBS@ +CYGPATH_W = @CYGPATH_W@ +DBUS_CFLAGS = @DBUS_CFLAGS@ +DBUS_LIBS = @DBUS_LIBS@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ +DRM_CFLAGS = @DRM_CFLAGS@ +DRM_INTEL_CFLAGS = @DRM_INTEL_CFLAGS@ +DRM_INTEL_LIBS = @DRM_INTEL_LIBS@ +DRM_LIBS = @DRM_LIBS@ +DRM_NOUVEAU_CFLAGS = @DRM_NOUVEAU_CFLAGS@ +DRM_NOUVEAU_LIBS = @DRM_NOUVEAU_LIBS@ +DRM_RADEON_CFLAGS = @DRM_RADEON_CFLAGS@ +DRM_RADEON_LIBS = @DRM_RADEON_LIBS@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GREP = @GREP@ +GTK_CFLAGS = @GTK_CFLAGS@ +GTK_LIBS = @GTK_LIBS@ +IMAGE_CFLAGS = @IMAGE_CFLAGS@ +IMAGE_LIBS = @IMAGE_LIBS@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBKMS_CFLAGS = @LIBKMS_CFLAGS@ +LIBKMS_LIBS = @LIBKMS_LIBS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +LT_AGE = @LT_AGE@ +LT_CURRENT = @LT_CURRENT@ +LT_REVISION = @LT_REVISION@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PANGO_CFLAGS = @PANGO_CFLAGS@ +PANGO_LIBS = @PANGO_LIBS@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +PLYMOUTH_CFLAGS = @PLYMOUTH_CFLAGS@ +PLYMOUTH_CLIENT_DIR = @PLYMOUTH_CLIENT_DIR@ +PLYMOUTH_CONF_DIR = @PLYMOUTH_CONF_DIR@ +PLYMOUTH_DAEMON_DIR = @PLYMOUTH_DAEMON_DIR@ +PLYMOUTH_DATADIR = @PLYMOUTH_DATADIR@ +PLYMOUTH_LIBDIR = @PLYMOUTH_LIBDIR@ +PLYMOUTH_LIBEXECDIR = @PLYMOUTH_LIBEXECDIR@ +PLYMOUTH_LIBS = @PLYMOUTH_LIBS@ +PLYMOUTH_LOGO_FILE = @PLYMOUTH_LOGO_FILE@ +PLYMOUTH_PLUGIN_PATH = @PLYMOUTH_PLUGIN_PATH@ +PLYMOUTH_POLICY_DIR = @PLYMOUTH_POLICY_DIR@ +PLYMOUTH_RUNTIME_DIR = @PLYMOUTH_RUNTIME_DIR@ +PLYMOUTH_THEME_PATH = @PLYMOUTH_THEME_PATH@ +RANLIB = @RANLIB@ +RELEASE_FILE = @RELEASE_FILE@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +SYSTEMD_UNIT_DIR = @SYSTEMD_UNIT_DIR@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +background_color = @background_color@ +background_end_color = @background_end_color@ +background_start_color = @background_start_color@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +logofile = @logofile@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +plymouthclientdir = @plymouthclientdir@ +plymouthdaemondir = @plymouthdaemondir@ +plymouthruntimedir = @plymouthruntimedir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +themedir = $(datadir)/plymouth/themes/ubuntu-logo +nodist_theme_DATA = ubuntu-logo.plymouth +dist_theme_DATA = ubuntu-logo.script \ + ubuntu-logo.grub \ + ubuntu_logo.png \ + ubuntu_logo16.png \ + password_field.png \ + password_field16.png \ + progress_dot_off.png \ + progress_dot_off16.png \ + progress_dot_on.png \ + progress_dot_on16.png + +MAINTAINERCLEANFILES = Makefile.in ubuntu-logo.plymouth +CLEANFILES = ubuntu-logo.plymouth +EXTRA_DIST = ubuntu-logo.plymouth.in +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu themes/ubuntu-logo/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu themes/ubuntu-logo/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +install-dist_themeDATA: $(dist_theme_DATA) + @$(NORMAL_INSTALL) + @list='$(dist_theme_DATA)'; test -n "$(themedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(themedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(themedir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(themedir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(themedir)" || exit $$?; \ + done + +uninstall-dist_themeDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_theme_DATA)'; test -n "$(themedir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(themedir)'; $(am__uninstall_files_from_dir) +install-nodist_themeDATA: $(nodist_theme_DATA) + @$(NORMAL_INSTALL) + @list='$(nodist_theme_DATA)'; test -n "$(themedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(themedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(themedir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(themedir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(themedir)" || exit $$?; \ + done + +uninstall-nodist_themeDATA: + @$(NORMAL_UNINSTALL) + @list='$(nodist_theme_DATA)'; test -n "$(themedir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(themedir)'; $(am__uninstall_files_from_dir) +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(DATA) +installdirs: + for dir in "$(DESTDIR)$(themedir)" "$(DESTDIR)$(themedir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: install-dist_themeDATA install-nodist_themeDATA + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-dist_themeDATA uninstall-nodist_themeDATA + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dist_themeDATA \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ + install-man install-nodist_themeDATA install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_themeDATA uninstall-nodist_themeDATA + + +ubuntu-logo.plymouth: $(srcdir)/ubuntu-logo.plymouth.in + sed -e 's,[@]PLYMOUTH_THEME_PATH[@],$(PLYMOUTH_THEME_PATH),g' \ + $(srcdir)/ubuntu-logo.plymouth.in > ubuntu-logo.plymouth + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: --- /dev/null +++ b/themes/ubuntu-text/Makefile.in @@ -0,0 +1,492 @@ +# Makefile.in generated by automake 1.11.6 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = themes/ubuntu-text +DIST_COMMON = $(dist_theme_DATA) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +SOURCES = +DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(themedir)" +DATA = $(dist_theme_DATA) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CURSES_LIBS = @CURSES_LIBS@ +CYGPATH_W = @CYGPATH_W@ +DBUS_CFLAGS = @DBUS_CFLAGS@ +DBUS_LIBS = @DBUS_LIBS@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ +DRM_CFLAGS = @DRM_CFLAGS@ +DRM_INTEL_CFLAGS = @DRM_INTEL_CFLAGS@ +DRM_INTEL_LIBS = @DRM_INTEL_LIBS@ +DRM_LIBS = @DRM_LIBS@ +DRM_NOUVEAU_CFLAGS = @DRM_NOUVEAU_CFLAGS@ +DRM_NOUVEAU_LIBS = @DRM_NOUVEAU_LIBS@ +DRM_RADEON_CFLAGS = @DRM_RADEON_CFLAGS@ +DRM_RADEON_LIBS = @DRM_RADEON_LIBS@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GREP = @GREP@ +GTK_CFLAGS = @GTK_CFLAGS@ +GTK_LIBS = @GTK_LIBS@ +IMAGE_CFLAGS = @IMAGE_CFLAGS@ +IMAGE_LIBS = @IMAGE_LIBS@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBKMS_CFLAGS = @LIBKMS_CFLAGS@ +LIBKMS_LIBS = @LIBKMS_LIBS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +LT_AGE = @LT_AGE@ +LT_CURRENT = @LT_CURRENT@ +LT_REVISION = @LT_REVISION@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PANGO_CFLAGS = @PANGO_CFLAGS@ +PANGO_LIBS = @PANGO_LIBS@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +PLYMOUTH_CFLAGS = @PLYMOUTH_CFLAGS@ +PLYMOUTH_CLIENT_DIR = @PLYMOUTH_CLIENT_DIR@ +PLYMOUTH_CONF_DIR = @PLYMOUTH_CONF_DIR@ +PLYMOUTH_DAEMON_DIR = @PLYMOUTH_DAEMON_DIR@ +PLYMOUTH_DATADIR = @PLYMOUTH_DATADIR@ +PLYMOUTH_LIBDIR = @PLYMOUTH_LIBDIR@ +PLYMOUTH_LIBEXECDIR = @PLYMOUTH_LIBEXECDIR@ +PLYMOUTH_LIBS = @PLYMOUTH_LIBS@ +PLYMOUTH_LOGO_FILE = @PLYMOUTH_LOGO_FILE@ +PLYMOUTH_PLUGIN_PATH = @PLYMOUTH_PLUGIN_PATH@ +PLYMOUTH_POLICY_DIR = @PLYMOUTH_POLICY_DIR@ +PLYMOUTH_RUNTIME_DIR = @PLYMOUTH_RUNTIME_DIR@ +PLYMOUTH_THEME_PATH = @PLYMOUTH_THEME_PATH@ +RANLIB = @RANLIB@ +RELEASE_FILE = @RELEASE_FILE@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +SYSTEMD_UNIT_DIR = @SYSTEMD_UNIT_DIR@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +background_color = @background_color@ +background_end_color = @background_end_color@ +background_start_color = @background_start_color@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +logofile = @logofile@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +plymouthclientdir = @plymouthclientdir@ +plymouthdaemondir = @plymouthdaemondir@ +plymouthruntimedir = @plymouthruntimedir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +themedir = $(datadir)/plymouth/themes/ubuntu-text +dist_theme_DATA = ubuntu-text.plymouth.in +MAINTAINERCLEANFILES = Makefile.in +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu themes/ubuntu-text/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu themes/ubuntu-text/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +install-dist_themeDATA: $(dist_theme_DATA) + @$(NORMAL_INSTALL) + @list='$(dist_theme_DATA)'; test -n "$(themedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(themedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(themedir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(themedir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(themedir)" || exit $$?; \ + done + +uninstall-dist_themeDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_theme_DATA)'; test -n "$(themedir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(themedir)'; $(am__uninstall_files_from_dir) +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(DATA) +installdirs: + for dir in "$(DESTDIR)$(themedir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: install-dist_themeDATA + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-dist_themeDATA + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dist_themeDATA \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am uninstall uninstall-am uninstall-dist_themeDATA + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: --- /dev/null +++ b/src/plugins/renderers/vga16fb/Makefile.in @@ -0,0 +1,643 @@ +# Makefile.in generated by automake 1.11.6 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = src/plugins/renderers/vga16fb +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(plugindir)" +LTLIBRARIES = $(plugin_LTLIBRARIES) +am__DEPENDENCIES_1 = +vga16fb_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ + ../../../libply/libply.la \ + ../../../libply-splash-core/libply-splash-core.la +am_vga16fb_la_OBJECTS = vga16fb_la-plugin.lo +vga16fb_la_OBJECTS = $(am_vga16fb_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +vga16fb_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(vga16fb_la_CFLAGS) \ + $(CFLAGS) $(vga16fb_la_LDFLAGS) $(LDFLAGS) -o $@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/build-tools/depcomp +am__depfiles_maybe = depfiles +am__mv = mv -f +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +CCLD = $(CC) +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +SOURCES = $(vga16fb_la_SOURCES) +DIST_SOURCES = $(vga16fb_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CURSES_LIBS = @CURSES_LIBS@ +CYGPATH_W = @CYGPATH_W@ +DBUS_CFLAGS = @DBUS_CFLAGS@ +DBUS_LIBS = @DBUS_LIBS@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ +DRM_CFLAGS = @DRM_CFLAGS@ +DRM_INTEL_CFLAGS = @DRM_INTEL_CFLAGS@ +DRM_INTEL_LIBS = @DRM_INTEL_LIBS@ +DRM_LIBS = @DRM_LIBS@ +DRM_NOUVEAU_CFLAGS = @DRM_NOUVEAU_CFLAGS@ +DRM_NOUVEAU_LIBS = @DRM_NOUVEAU_LIBS@ +DRM_RADEON_CFLAGS = @DRM_RADEON_CFLAGS@ +DRM_RADEON_LIBS = @DRM_RADEON_LIBS@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GREP = @GREP@ +GTK_CFLAGS = @GTK_CFLAGS@ +GTK_LIBS = @GTK_LIBS@ +IMAGE_CFLAGS = @IMAGE_CFLAGS@ +IMAGE_LIBS = @IMAGE_LIBS@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBKMS_CFLAGS = @LIBKMS_CFLAGS@ +LIBKMS_LIBS = @LIBKMS_LIBS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +LT_AGE = @LT_AGE@ +LT_CURRENT = @LT_CURRENT@ +LT_REVISION = @LT_REVISION@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PANGO_CFLAGS = @PANGO_CFLAGS@ +PANGO_LIBS = @PANGO_LIBS@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +PLYMOUTH_CFLAGS = @PLYMOUTH_CFLAGS@ +PLYMOUTH_CLIENT_DIR = @PLYMOUTH_CLIENT_DIR@ +PLYMOUTH_CONF_DIR = @PLYMOUTH_CONF_DIR@ +PLYMOUTH_DAEMON_DIR = @PLYMOUTH_DAEMON_DIR@ +PLYMOUTH_DATADIR = @PLYMOUTH_DATADIR@ +PLYMOUTH_LIBDIR = @PLYMOUTH_LIBDIR@ +PLYMOUTH_LIBEXECDIR = @PLYMOUTH_LIBEXECDIR@ +PLYMOUTH_LIBS = @PLYMOUTH_LIBS@ +PLYMOUTH_LOGO_FILE = @PLYMOUTH_LOGO_FILE@ +PLYMOUTH_PLUGIN_PATH = @PLYMOUTH_PLUGIN_PATH@ +PLYMOUTH_POLICY_DIR = @PLYMOUTH_POLICY_DIR@ +PLYMOUTH_RUNTIME_DIR = @PLYMOUTH_RUNTIME_DIR@ +PLYMOUTH_THEME_PATH = @PLYMOUTH_THEME_PATH@ +RANLIB = @RANLIB@ +RELEASE_FILE = @RELEASE_FILE@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +SYSTEMD_UNIT_DIR = @SYSTEMD_UNIT_DIR@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +background_color = @background_color@ +background_end_color = @background_end_color@ +background_start_color = @background_start_color@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +logofile = @logofile@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +plymouthclientdir = @plymouthclientdir@ +plymouthdaemondir = @plymouthdaemondir@ +plymouthruntimedir = @plymouthruntimedir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +INCLUDES = -I$(top_srcdir) \ + -I$(srcdir)/../../../libply \ + -I$(srcdir)/../../../libply-splash-core \ + -I$(srcdir)/../../.. \ + -I$(srcdir)/../.. \ + -I$(srcdir)/.. \ + -I$(srcdir) + +plugindir = $(libdir)/plymouth/renderers +plugin_LTLIBRARIES = vga16fb.la +vga16fb_la_CFLAGS = $(PLYMOUTH_CFLAGS) +vga16fb_la_LDFLAGS = -module -avoid-version -export-dynamic +vga16fb_la_LIBADD = $(PLYMOUTH_LIBS) \ + ../../../libply/libply.la \ + ../../../libply-splash-core/libply-splash-core.la + +vga16fb_la_SOURCES = $(srcdir)/plugin.c +MAINTAINERCLEANFILES = Makefile.in +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .lo .o .obj +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/plugins/renderers/vga16fb/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu src/plugins/renderers/vga16fb/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): +install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) + @$(NORMAL_INSTALL) + @list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \ + list2=; for p in $$list; do \ + if test -f $$p; then \ + list2="$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \ + } + +uninstall-pluginLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$f"; \ + done + +clean-pluginLTLIBRARIES: + -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done +vga16fb.la: $(vga16fb_la_OBJECTS) $(vga16fb_la_DEPENDENCIES) $(EXTRA_vga16fb_la_DEPENDENCIES) + $(AM_V_CCLD)$(vga16fb_la_LINK) -rpath $(plugindir) $(vga16fb_la_OBJECTS) $(vga16fb_la_LIBADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vga16fb_la-plugin.Plo@am__quote@ + +.c.o: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< + +.c.obj: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` + +.c.lo: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< + +vga16fb_la-plugin.lo: $(srcdir)/plugin.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vga16fb_la_CFLAGS) $(CFLAGS) -MT vga16fb_la-plugin.lo -MD -MP -MF $(DEPDIR)/vga16fb_la-plugin.Tpo -c -o vga16fb_la-plugin.lo `test -f '$(srcdir)/plugin.c' || echo '$(srcdir)/'`$(srcdir)/plugin.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vga16fb_la-plugin.Tpo $(DEPDIR)/vga16fb_la-plugin.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/plugin.c' object='vga16fb_la-plugin.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vga16fb_la_CFLAGS) $(CFLAGS) -c -o vga16fb_la-plugin.lo `test -f '$(srcdir)/plugin.c' || echo '$(srcdir)/'`$(srcdir)/plugin.c + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + set x; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: CTAGS +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(LTLIBRARIES) +installdirs: + for dir in "$(DESTDIR)$(plugindir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) +clean: clean-am + +clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \ + mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: install-pluginLTLIBRARIES + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-pluginLTLIBRARIES + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-pluginLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-pluginLTLIBRARIES \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags uninstall uninstall-am uninstall-pluginLTLIBRARIES + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: --- a/src/plugins/renderers/drm/Makefile.in +++ b/src/plugins/renderers/drm/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -151,6 +168,11 @@ am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(drm_la_SOURCES) DIST_SOURCES = $(am__drm_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -376,7 +398,6 @@ $(am__aclocal_m4_deps): install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" @list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -384,6 +405,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \ } --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -15,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -67,6 +84,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -521,13 +543,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -612,7 +631,7 @@ *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod a+w $(distdir) + chmod -R a-w $(distdir); chmod u+w $(distdir) mkdir $(distdir)/_build mkdir $(distdir)/_inst chmod a-w $(distdir) --- a/build-tools/compile +++ b/build-tools/compile @@ -1,7 +1,7 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2012-01-04.17; # UTC +scriptversion=2012-03-05.13; # UTC # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free # Software Foundation, Inc. @@ -79,6 +79,48 @@ esac } +# func_cl_dashL linkdir +# Make cl look for libraries in LINKDIR +func_cl_dashL () +{ + func_file_conv "$1" + if test -z "$lib_path"; then + lib_path=$file + else + lib_path="$lib_path;$file" + fi + linker_opts="$linker_opts -LIBPATH:$file" +} + +# func_cl_dashl library +# Do a library search-path lookup for cl +func_cl_dashl () +{ + lib=$1 + found=no + save_IFS=$IFS + IFS=';' + for dir in $lib_path $LIB + do + IFS=$save_IFS + if $shared && test -f "$dir/$lib.dll.lib"; then + found=yes + lib=$dir/$lib.dll.lib + break + fi + if test -f "$dir/$lib.lib"; then + found=yes + lib=$dir/$lib.lib + break + fi + done + IFS=$save_IFS + + if test "$found" != yes; then + lib=$lib.lib + fi +} + # func_cl_wrapper cl arg... # Adjust compile command to suit cl func_cl_wrapper () @@ -109,43 +151,34 @@ ;; esac ;; + -I) + eat=1 + func_file_conv "$2" mingw + set x "$@" -I"$file" + shift + ;; -I*) func_file_conv "${1#-I}" mingw set x "$@" -I"$file" shift ;; + -l) + eat=1 + func_cl_dashl "$2" + set x "$@" "$lib" + shift + ;; -l*) - lib=${1#-l} - found=no - save_IFS=$IFS - IFS=';' - for dir in $lib_path $LIB - do - IFS=$save_IFS - if $shared && test -f "$dir/$lib.dll.lib"; then - found=yes - set x "$@" "$dir/$lib.dll.lib" - break - fi - if test -f "$dir/$lib.lib"; then - found=yes - set x "$@" "$dir/$lib.lib" - break - fi - done - IFS=$save_IFS - - test "$found" != yes && set x "$@" "$lib.lib" + func_cl_dashl "${1#-l}" + set x "$@" "$lib" shift ;; + -L) + eat=1 + func_cl_dashL "$2" + ;; -L*) - func_file_conv "${1#-L}" - if test -z "$lib_path"; then - lib_path=$file - else - lib_path="$lib_path;$file" - fi - linker_opts="$linker_opts -LIBPATH:$file" + func_cl_dashL "${1#-L}" ;; -static) shared=false --- a/build-tools/depcomp +++ b/build-tools/depcomp @@ -1,10 +1,10 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2011-12-04.11; # UTC +scriptversion=2012-03-27.16; # UTC # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010, -# 2011 Free Software Foundation, Inc. +# 2011, 2012 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -28,7 +28,7 @@ case $1 in '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 + echo "$0: No command. Try '$0 --help' for more information." 1>&2 exit 1; ;; -h | --h*) @@ -40,8 +40,8 @@ Environment variables: depmode Dependency tracking mode. - source Source file read by `PROGRAMS ARGS'. - object Object file output by `PROGRAMS ARGS'. + source Source file read by 'PROGRAMS ARGS'. + object Object file output by 'PROGRAMS ARGS'. DEPDIR directory where to store dependencies. depfile Dependency file to output. tmpdepfile Temporary file to use when outputting dependencies. @@ -57,6 +57,12 @@ ;; esac +# A tabulation character. +tab=' ' +# A newline character. +nl=' +' + if test -z "$depmode" || test -z "$source" || test -z "$object"; then echo "depcomp: Variables source, object and depmode must be set" 1>&2 exit 1 @@ -102,6 +108,12 @@ depmode=msvc7 fi +if test "$depmode" = xlc; then + # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations. + gccflag=-qmakedep=gcc,-MF + depmode=gcc +fi + case "$depmode" in gcc3) ## gcc 3 implements dependency tracking that does exactly what @@ -156,15 +168,14 @@ ## The second -e expression handles DOS-style file names with drive letters. sed -e 's/^[^:]*: / /' \ -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" -## This next piece of magic avoids the `deleted header file' problem. +## This next piece of magic avoids the "deleted header file" problem. ## The problem is that when a header file which appears in a .P file ## is deleted, the dependency causes make to die (because there is ## typically no way to rebuild the header). We avoid this by adding ## dummy dependencies for each header file. Too bad gcc doesn't do ## this for us directly. - tr ' ' ' -' < "$tmpdepfile" | -## Some versions of gcc put a space before the `:'. On the theory + tr ' ' "$nl" < "$tmpdepfile" | +## Some versions of gcc put a space before the ':'. On the theory ## that the space means something, we add a space to the output as ## well. hp depmode also adds that space, but also prefixes the VPATH ## to the object. Take care to not repeat it in the output. @@ -203,18 +214,15 @@ # clever and replace this with sed code, as IRIX sed won't handle # lines with more than a fixed number of characters (4096 in # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; - # the IRIX cc adds comments like `#:fec' to the end of the + # the IRIX cc adds comments like '#:fec' to the end of the # dependency line. - tr ' ' ' -' < "$tmpdepfile" \ + tr ' ' "$nl" < "$tmpdepfile" \ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ - tr ' -' ' ' >> "$depfile" + tr "$nl" ' ' >> "$depfile" echo >> "$depfile" # The second pass generates a dummy entry for each header file. - tr ' ' ' -' < "$tmpdepfile" \ + tr ' ' "$nl" < "$tmpdepfile" \ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ >> "$depfile" else @@ -226,10 +234,17 @@ rm -f "$tmpdepfile" ;; +xlc) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + aix) # The C for AIX Compiler uses -M and outputs the dependencies # in a .u file. In older versions, this file always lives in the - # current directory. Also, the AIX compiler puts `$object:' at the + # current directory. Also, the AIX compiler puts '$object:' at the # start of each line; $object doesn't have directory information. # Version 6 uses the directory in both cases. dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` @@ -259,12 +274,11 @@ test -f "$tmpdepfile" && break done if test -f "$tmpdepfile"; then - # Each line is of the form `foo.o: dependent.h'. + # Each line is of the form 'foo.o: dependent.h'. # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. + # '$object: dependent.h' and one to simply 'dependent.h:'. sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" + sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" else # The sourcefile does not contain any dependencies, so just # store a dummy comment line, to avoid errors with the Makefile @@ -275,23 +289,26 @@ ;; icc) - # Intel's C compiler understands `-MD -MF file'. However on - # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c + # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'. + # However on + # $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c # ICC 7.0 will fill foo.d with something like # foo.o: sub/foo.c # foo.o: sub/foo.h - # which is wrong. We want: + # which is wrong. We want # sub/foo.o: sub/foo.c # sub/foo.o: sub/foo.h # sub/foo.c: # sub/foo.h: # ICC 7.1 will output # foo.o: sub/foo.c sub/foo.h - # and will wrap long lines using \ : + # and will wrap long lines using '\': # foo.o: sub/foo.c ... \ # sub/foo.h ... \ # ... - + # tcc 0.9.26 (FIXME still under development at the moment of writing) + # will emit a similar output, but also prepend the continuation lines + # with horizontal tabulation characters. "$@" -MD -MF "$tmpdepfile" stat=$? if test $stat -eq 0; then : @@ -300,15 +317,21 @@ exit $stat fi rm -f "$depfile" - # Each line is of the form `foo.o: dependent.h', - # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. + # Each line is of the form 'foo.o: dependent.h', + # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'. # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. - sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" - # Some versions of the HPUX 10.20 sed can't process this invocation - # correctly. Breaking it into two sed invocations is a workaround. - sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | - sed -e 's/$/ :/' >> "$depfile" + # '$object: dependent.h' and one to simply 'dependent.h:'. + sed -e "s/^[ $tab][ $tab]*/ /" -e "s,^[^:]*:,$object :," \ + < "$tmpdepfile" > "$depfile" + sed ' + s/[ '"$tab"'][ '"$tab"']*/ /g + s/^ *// + s/ *\\*$// + s/^[^:]*: *// + /^$/d + /:$/d + s/$/ :/ + ' < "$tmpdepfile" >> "$depfile" rm -f "$tmpdepfile" ;; @@ -344,7 +367,7 @@ done if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" - # Add `dependent.h:' lines. + # Add 'dependent.h:' lines. sed -ne '2,${ s/^ *// s/ \\*$// @@ -359,9 +382,9 @@ tru64) # The Tru64 compiler uses -MD to generate dependencies as a side - # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. + # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in `foo.d' instead, so we check for that too. + # dependencies in 'foo.d' instead, so we check for that too. # Subdirectories are respected. dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` test "x$dir" = "x$object" && dir= @@ -407,8 +430,7 @@ done if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" + sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" else echo "#dummy" > "$depfile" fi @@ -443,11 +465,11 @@ p }' | $cygpath_u | sort -u | sed -n ' s/ /\\ /g -s/\(.*\)/ \1 \\/p +s/\(.*\)/'"$tab"'\1 \\/p s/.\(.*\) \\/\1:/ H $ { - s/.*/ / + s/.*/'"$tab"'/ G p }' >> "$depfile" @@ -478,7 +500,7 @@ shift fi - # Remove `-o $object'. + # Remove '-o $object'. IFS=" " for arg do @@ -498,15 +520,14 @@ done test -z "$dashmflag" && dashmflag=-M - # Require at least two characters before searching for `:' + # Require at least two characters before searching for ':' # in the target name. This is to cope with DOS-style filenames: - # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. + # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise. "$@" $dashmflag | - sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" + sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile" rm -f "$depfile" cat < "$tmpdepfile" > "$depfile" - tr ' ' ' -' < "$tmpdepfile" | \ + tr ' ' "$nl" < "$tmpdepfile" | \ ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" @@ -562,8 +583,7 @@ # makedepend may prepend the VPATH from the source file name to the object. # No need to regex-escape $object, excess matching of '.' is harmless. sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" - sed '1,2d' "$tmpdepfile" | tr ' ' ' -' | \ + sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \ ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" @@ -583,7 +603,7 @@ shift fi - # Remove `-o $object'. + # Remove '-o $object'. IFS=" " for arg do @@ -652,8 +672,8 @@ sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" - sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" - echo " " >> "$depfile" + sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile" + echo "$tab" >> "$depfile" sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile" rm -f "$tmpdepfile" ;; --- a/docs/Makefile.in +++ b/docs/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -15,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -53,6 +70,11 @@ am__v_at_0 = @ SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -289,11 +311,18 @@ -rm -rf .libs _libs install-man8: $(dist_man_MANS) @$(NORMAL_INSTALL) - test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)" - @list=''; test -n "$(man8dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.8[a-z]*$$/p'; \ + @list1=''; \ + list2='$(dist_man_MANS)'; \ + test -n "$(man8dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.8[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ --- a/images/Makefile.in +++ b/images/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -53,6 +70,11 @@ am__v_at_0 = @ SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -290,8 +312,11 @@ -rm -rf .libs _libs install-imageDATA: $(image_DATA) @$(NORMAL_INSTALL) - test -z "$(imagedir)" || $(MKDIR_P) "$(DESTDIR)$(imagedir)" @list='$(image_DATA)'; test -n "$(imagedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(imagedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(imagedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -88,6 +105,11 @@ am__v_at_0 = @ SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -304,8 +326,11 @@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-initrdscriptSCRIPTS: $(initrdscript_SCRIPTS) @$(NORMAL_INSTALL) - test -z "$(initrdscriptdir)" || $(MKDIR_P) "$(DESTDIR)$(initrdscriptdir)" @list='$(initrdscript_SCRIPTS)'; test -n "$(initrdscriptdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(initrdscriptdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(initrdscriptdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ @@ -336,8 +361,11 @@ dir='$(DESTDIR)$(initrdscriptdir)'; $(am__uninstall_files_from_dir) install-sbinscriptsSCRIPTS: $(sbinscripts_SCRIPTS) @$(NORMAL_INSTALL) - test -z "$(sbinscriptsdir)" || $(MKDIR_P) "$(DESTDIR)$(sbinscriptsdir)" @list='$(sbinscripts_SCRIPTS)'; test -n "$(sbinscriptsdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(sbinscriptsdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(sbinscriptsdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -103,6 +120,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -407,8 +429,11 @@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-plymouthdbinPROGRAMS: $(plymouthdbin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(plymouthdbindir)" || $(MKDIR_P) "$(DESTDIR)$(plymouthdbindir)" @list='$(plymouthdbin_PROGRAMS)'; test -n "$(plymouthdbindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(plymouthdbindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(plymouthdbindir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ while read p p1; do if test -f $$p || test -f $$p1; \ @@ -532,8 +557,11 @@ -rm -rf .libs _libs install-dist_plymouthd_confDATA: $(dist_plymouthd_conf_DATA) @$(NORMAL_INSTALL) - test -z "$(plymouthd_confdir)" || $(MKDIR_P) "$(DESTDIR)$(plymouthd_confdir)" @list='$(dist_plymouthd_conf_DATA)'; test -n "$(plymouthd_confdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(plymouthd_confdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(plymouthd_confdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -550,8 +578,11 @@ dir='$(DESTDIR)$(plymouthd_confdir)'; $(am__uninstall_files_from_dir) install-dist_plymouthd_defaultsDATA: $(dist_plymouthd_defaults_DATA) @$(NORMAL_INSTALL) - test -z "$(plymouthd_defaultsdir)" || $(MKDIR_P) "$(DESTDIR)$(plymouthd_defaultsdir)" @list='$(dist_plymouthd_defaults_DATA)'; test -n "$(plymouthd_defaultsdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(plymouthd_defaultsdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(plymouthd_defaultsdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -568,8 +599,11 @@ dir='$(DESTDIR)$(plymouthd_defaultsdir)'; $(am__uninstall_files_from_dir) install-pkgconfigDATA: $(pkgconfig_DATA) @$(NORMAL_INSTALL) - test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -752,13 +786,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ --- a/src/client/Makefile.in +++ b/src/client/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -19,6 +19,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -137,6 +154,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DATA = $(pkgconfig_DATA) HEADERS = $(libply_boot_client_HEADERS) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ @@ -409,7 +431,6 @@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -417,6 +438,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ } @@ -442,8 +465,11 @@ $(AM_V_CCLD)$(libply_boot_client_la_LINK) -rpath $(libdir) $(libply_boot_client_la_OBJECTS) $(libply_boot_client_la_LIBADD) $(LIBS) install-plymouthPROGRAMS: $(plymouth_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(plymouthdir)" || $(MKDIR_P) "$(DESTDIR)$(plymouthdir)" @list='$(plymouth_PROGRAMS)'; test -n "$(plymouthdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(plymouthdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(plymouthdir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ while read p p1; do if test -f $$p || test -f $$p1; \ @@ -560,8 +586,11 @@ -rm -rf .libs _libs install-pkgconfigDATA: $(pkgconfig_DATA) @$(NORMAL_INSTALL) - test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -578,8 +607,11 @@ dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) install-libply_boot_clientHEADERS: $(libply_boot_client_HEADERS) @$(NORMAL_INSTALL) - test -z "$(libply_boot_clientdir)" || $(MKDIR_P) "$(DESTDIR)$(libply_boot_clientdir)" @list='$(libply_boot_client_HEADERS)'; test -n "$(libply_boot_clientdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libply_boot_clientdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libply_boot_clientdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -762,13 +794,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ --- a/src/client/tests/Makefile.in +++ b/src/client/tests/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -57,6 +74,11 @@ am__v_at_0 = @ SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__tty_colors = \ red=; grn=; lgn=; blu=; std= DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) --- a/src/libply-splash-core/Makefile.in +++ b/src/libply-splash-core/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -126,6 +143,11 @@ am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libply_splash_core_la_SOURCES) DIST_SOURCES = $(libply_splash_core_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac HEADERS = $(libply_splash_core_HEADERS) ETAGS = etags CTAGS = ctags @@ -372,7 +394,6 @@ $(am__aclocal_m4_deps): install-libraryLTLIBRARIES: $(library_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(librarydir)" || $(MKDIR_P) "$(DESTDIR)$(librarydir)" @list='$(library_LTLIBRARIES)'; test -n "$(librarydir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -380,6 +401,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(librarydir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(librarydir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(librarydir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(librarydir)"; \ } @@ -503,8 +526,11 @@ -rm -rf .libs _libs install-libply_splash_coreHEADERS: $(libply_splash_core_HEADERS) @$(NORMAL_INSTALL) - test -z "$(libply_splash_coredir)" || $(MKDIR_P) "$(DESTDIR)$(libply_splash_coredir)" @list='$(libply_splash_core_HEADERS)'; test -n "$(libply_splash_coredir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libply_splash_coredir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libply_splash_coredir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ --- a/src/libply-splash-graphics/Makefile.in +++ b/src/libply-splash-graphics/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -127,6 +144,11 @@ am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libply_splash_graphics_la_SOURCES) DIST_SOURCES = $(libply_splash_graphics_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac HEADERS = $(libply_splash_graphics_HEADERS) ETAGS = etags CTAGS = ctags @@ -370,7 +392,6 @@ $(am__aclocal_m4_deps): install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -378,6 +399,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ } @@ -493,8 +516,11 @@ -rm -rf .libs _libs install-libply_splash_graphicsHEADERS: $(libply_splash_graphics_HEADERS) @$(NORMAL_INSTALL) - test -z "$(libply_splash_graphicsdir)" || $(MKDIR_P) "$(DESTDIR)$(libply_splash_graphicsdir)" @list='$(libply_splash_graphics_HEADERS)'; test -n "$(libply_splash_graphicsdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libply_splash_graphicsdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libply_splash_graphicsdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ --- a/src/libply/Makefile.in +++ b/src/libply/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -129,6 +146,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac HEADERS = $(libply_HEADERS) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive @@ -412,7 +434,6 @@ $(am__aclocal_m4_deps): install-libraryLTLIBRARIES: $(library_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(librarydir)" || $(MKDIR_P) "$(DESTDIR)$(librarydir)" @list='$(library_LTLIBRARIES)'; test -n "$(librarydir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -420,6 +441,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(librarydir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(librarydir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(librarydir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(librarydir)"; \ } @@ -599,8 +622,11 @@ -rm -rf .libs _libs install-libplyHEADERS: $(libply_HEADERS) @$(NORMAL_INSTALL) - test -z "$(libplydir)" || $(MKDIR_P) "$(DESTDIR)$(libplydir)" @list='$(libply_HEADERS)'; test -n "$(libplydir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libplydir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libplydir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -783,13 +809,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ --- a/src/libply/tests/Makefile.in +++ b/src/libply/tests/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -69,6 +86,11 @@ am__v_at_0 = @ SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__tty_colors = \ red=; grn=; lgn=; blu=; std= DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) --- a/src/plugins/Makefile.in +++ b/src/plugins/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -15,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -59,6 +76,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -464,13 +486,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ --- a/src/plugins/controls/Makefile.in +++ b/src/plugins/controls/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -15,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -59,6 +76,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -464,13 +486,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ --- a/src/plugins/controls/label/Makefile.in +++ b/src/plugins/controls/label/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -115,6 +132,11 @@ am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(label_la_SOURCES) DIST_SOURCES = $(label_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -336,7 +358,6 @@ $(am__aclocal_m4_deps): install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" @list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -344,6 +365,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \ } --- a/src/plugins/renderers/frame-buffer/Makefile.in +++ b/src/plugins/renderers/frame-buffer/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -115,6 +132,11 @@ am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(frame_buffer_la_SOURCES) DIST_SOURCES = $(frame_buffer_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -334,7 +356,6 @@ $(am__aclocal_m4_deps): install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" @list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -342,6 +363,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \ } --- a/src/plugins/renderers/x11/Makefile.in +++ b/src/plugins/renderers/x11/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -117,6 +134,11 @@ am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(x11_la_SOURCES) DIST_SOURCES = $(am__x11_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -337,7 +359,6 @@ $(am__aclocal_m4_deps): install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" @list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -345,6 +366,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \ } --- a/src/plugins/splash/details/Makefile.in +++ b/src/plugins/splash/details/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -114,6 +131,11 @@ am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(details_la_SOURCES) DIST_SOURCES = $(details_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -333,7 +355,6 @@ $(am__aclocal_m4_deps): install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" @list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -341,6 +362,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \ } --- a/src/plugins/splash/fade-throbber/Makefile.in +++ b/src/plugins/splash/fade-throbber/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -116,6 +133,11 @@ am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(fade_throbber_la_SOURCES) DIST_SOURCES = $(fade_throbber_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -343,7 +365,6 @@ $(am__aclocal_m4_deps): install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" @list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -351,6 +372,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \ } --- a/src/plugins/splash/script/Makefile.in +++ b/src/plugins/splash/script/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -121,6 +138,11 @@ am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(script_la_SOURCES) DIST_SOURCES = $(script_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -385,7 +407,6 @@ $(am__aclocal_m4_deps): install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" @list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -393,6 +414,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \ } --- a/src/plugins/splash/space-flares/Makefile.in +++ b/src/plugins/splash/space-flares/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -116,6 +133,11 @@ am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(space_flares_la_SOURCES) DIST_SOURCES = $(space_flares_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -343,7 +365,6 @@ $(am__aclocal_m4_deps): install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" @list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -351,6 +372,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \ } --- a/src/plugins/splash/text/Makefile.in +++ b/src/plugins/splash/text/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -113,6 +130,11 @@ am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(text_la_SOURCES) DIST_SOURCES = $(text_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -336,7 +358,6 @@ $(am__aclocal_m4_deps): install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" @list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -344,6 +365,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \ } --- a/src/plugins/splash/throbgress/Makefile.in +++ b/src/plugins/splash/throbgress/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -115,6 +132,11 @@ am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(throbgress_la_SOURCES) DIST_SOURCES = $(throbgress_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -343,7 +365,6 @@ $(am__aclocal_m4_deps): install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" @list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -351,6 +372,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \ } --- a/src/plugins/splash/two-step/Makefile.in +++ b/src/plugins/splash/two-step/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -115,6 +132,11 @@ am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(two_step_la_SOURCES) DIST_SOURCES = $(two_step_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -342,7 +364,6 @@ $(am__aclocal_m4_deps): install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" @list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -350,6 +371,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \ } --- a/src/tests/Makefile.in +++ b/src/tests/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -61,6 +78,11 @@ am__v_at_0 = @ SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__tty_colors = \ red=; grn=; lgn=; blu=; std= DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) --- a/src/upstart-bridge/Makefile.in +++ b/src/upstart-bridge/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -92,6 +109,11 @@ am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(plymouth_upstart_bridge_SOURCES) DIST_SOURCES = $(plymouth_upstart_bridge_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -314,8 +336,11 @@ $(am__aclocal_m4_deps): install-plymouthPROGRAMS: $(plymouth_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(plymouthdir)" || $(MKDIR_P) "$(DESTDIR)$(plymouthdir)" @list='$(plymouth_PROGRAMS)'; test -n "$(plymouthdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(plymouthdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(plymouthdir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ while read p p1; do if test -f $$p || test -f $$p1; \ --- a/src/viewer/Makefile.in +++ b/src/viewer/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -100,6 +117,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -372,8 +394,11 @@ $(am__aclocal_m4_deps): install-plymouth_log_viewerPROGRAMS: $(plymouth_log_viewer_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(plymouth_log_viewerdir)" || $(MKDIR_P) "$(DESTDIR)$(plymouth_log_viewerdir)" @list='$(plymouth_log_viewer_PROGRAMS)'; test -n "$(plymouth_log_viewerdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(plymouth_log_viewerdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(plymouth_log_viewerdir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ while read p p1; do if test -f $$p || test -f $$p1; \ @@ -467,8 +492,11 @@ -rm -rf .libs _libs install-gdmautostartDATA: $(gdmautostart_DATA) @$(NORMAL_INSTALL) - test -z "$(gdmautostartdir)" || $(MKDIR_P) "$(DESTDIR)$(gdmautostartdir)" @list='$(gdmautostart_DATA)'; test -n "$(gdmautostartdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(gdmautostartdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(gdmautostartdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -651,13 +679,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ --- a/themes/details/Makefile.in +++ b/themes/details/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -54,6 +71,11 @@ am__v_at_0 = @ SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -290,8 +312,11 @@ -rm -rf .libs _libs install-dist_themeDATA: $(dist_theme_DATA) @$(NORMAL_INSTALL) - test -z "$(themedir)" || $(MKDIR_P) "$(DESTDIR)$(themedir)" @list='$(dist_theme_DATA)'; test -n "$(themedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(themedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(themedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ --- a/themes/fade-in/Makefile.in +++ b/themes/fade-in/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -54,6 +71,11 @@ am__v_at_0 = @ SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -293,8 +315,11 @@ -rm -rf .libs _libs install-dist_themeDATA: $(dist_theme_DATA) @$(NORMAL_INSTALL) - test -z "$(themedir)" || $(MKDIR_P) "$(DESTDIR)$(themedir)" @list='$(dist_theme_DATA)'; test -n "$(themedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(themedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(themedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -311,8 +336,11 @@ dir='$(DESTDIR)$(themedir)'; $(am__uninstall_files_from_dir) install-nodist_themeDATA: $(nodist_theme_DATA) @$(NORMAL_INSTALL) - test -z "$(themedir)" || $(MKDIR_P) "$(DESTDIR)$(themedir)" @list='$(nodist_theme_DATA)'; test -n "$(themedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(themedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(themedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ --- a/themes/glow/Makefile.in +++ b/themes/glow/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -54,6 +71,11 @@ am__v_at_0 = @ SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -351,8 +373,11 @@ -rm -rf .libs _libs install-dist_themeDATA: $(dist_theme_DATA) @$(NORMAL_INSTALL) - test -z "$(themedir)" || $(MKDIR_P) "$(DESTDIR)$(themedir)" @list='$(dist_theme_DATA)'; test -n "$(themedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(themedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(themedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -369,8 +394,11 @@ dir='$(DESTDIR)$(themedir)'; $(am__uninstall_files_from_dir) install-nodist_themeDATA: $(nodist_theme_DATA) @$(NORMAL_INSTALL) - test -z "$(themedir)" || $(MKDIR_P) "$(DESTDIR)$(themedir)" @list='$(nodist_theme_DATA)'; test -n "$(themedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(themedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(themedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ --- a/themes/script/Makefile.in +++ b/themes/script/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -54,6 +71,11 @@ am__v_at_0 = @ SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -303,8 +325,11 @@ -rm -rf .libs _libs install-dist_themeDATA: $(dist_theme_DATA) @$(NORMAL_INSTALL) - test -z "$(themedir)" || $(MKDIR_P) "$(DESTDIR)$(themedir)" @list='$(dist_theme_DATA)'; test -n "$(themedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(themedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(themedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -321,8 +346,11 @@ dir='$(DESTDIR)$(themedir)'; $(am__uninstall_files_from_dir) install-nodist_themeDATA: $(nodist_theme_DATA) @$(NORMAL_INSTALL) - test -z "$(themedir)" || $(MKDIR_P) "$(DESTDIR)$(themedir)" @list='$(nodist_theme_DATA)'; test -n "$(themedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(themedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(themedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ --- a/themes/solar/Makefile.in +++ b/themes/solar/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -54,6 +71,11 @@ am__v_at_0 = @ SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -300,8 +322,11 @@ -rm -rf .libs _libs install-dist_themeDATA: $(dist_theme_DATA) @$(NORMAL_INSTALL) - test -z "$(themedir)" || $(MKDIR_P) "$(DESTDIR)$(themedir)" @list='$(dist_theme_DATA)'; test -n "$(themedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(themedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(themedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -318,8 +343,11 @@ dir='$(DESTDIR)$(themedir)'; $(am__uninstall_files_from_dir) install-nodist_themeDATA: $(nodist_theme_DATA) @$(NORMAL_INSTALL) - test -z "$(themedir)" || $(MKDIR_P) "$(DESTDIR)$(themedir)" @list='$(nodist_theme_DATA)'; test -n "$(themedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(themedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(themedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ --- a/themes/spinfinity/Makefile.in +++ b/themes/spinfinity/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -54,6 +71,11 @@ am__v_at_0 = @ SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -332,8 +354,11 @@ -rm -rf .libs _libs install-dist_themeDATA: $(dist_theme_DATA) @$(NORMAL_INSTALL) - test -z "$(themedir)" || $(MKDIR_P) "$(DESTDIR)$(themedir)" @list='$(dist_theme_DATA)'; test -n "$(themedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(themedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(themedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -350,8 +375,11 @@ dir='$(DESTDIR)$(themedir)'; $(am__uninstall_files_from_dir) install-nodist_themeDATA: $(nodist_theme_DATA) @$(NORMAL_INSTALL) - test -z "$(themedir)" || $(MKDIR_P) "$(DESTDIR)$(themedir)" @list='$(nodist_theme_DATA)'; test -n "$(themedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(themedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(themedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ --- a/themes/spinner/Makefile.in +++ b/themes/spinner/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -54,6 +71,11 @@ am__v_at_0 = @ SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -346,8 +368,11 @@ -rm -rf .libs _libs install-dist_themeDATA: $(dist_theme_DATA) @$(NORMAL_INSTALL) - test -z "$(themedir)" || $(MKDIR_P) "$(DESTDIR)$(themedir)" @list='$(dist_theme_DATA)'; test -n "$(themedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(themedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(themedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -364,8 +389,11 @@ dir='$(DESTDIR)$(themedir)'; $(am__uninstall_files_from_dir) install-nodist_themeDATA: $(nodist_theme_DATA) @$(NORMAL_INSTALL) - test -z "$(themedir)" || $(MKDIR_P) "$(DESTDIR)$(themedir)" @list='$(nodist_theme_DATA)'; test -n "$(themedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(themedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(themedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ --- a/themes/text/Makefile.in +++ b/themes/text/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -54,6 +71,11 @@ am__v_at_0 = @ SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -290,8 +312,11 @@ -rm -rf .libs _libs install-dist_themeDATA: $(dist_theme_DATA) @$(NORMAL_INSTALL) - test -z "$(themedir)" || $(MKDIR_P) "$(DESTDIR)$(themedir)" @list='$(dist_theme_DATA)'; test -n "$(themedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(themedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(themedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ --- a/systemd-units/Makefile.in +++ b/systemd-units/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -70,6 +87,11 @@ am__v_at_0 = @ SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -342,8 +364,11 @@ -rm -rf .libs _libs install-systemdunitDATA: $(systemdunit_DATA) @$(NORMAL_INSTALL) - test -z "$(systemdunitdir)" || $(MKDIR_P) "$(DESTDIR)$(systemdunitdir)" @list='$(systemdunit_DATA)'; test -n "$(systemdunitdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(systemdunitdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(systemdunitdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ debian/patches/nouveau-framebuffer.patch0000664000000000000000000000475212310333016015604 0ustar Description: Temporarily disable the drm backend for nouveau This is until we can get to the bottom of the DRM lockup in https://bugs.launchpad.net/bugs/539655. This is not as pretty, but it boots to the desktop without hanging regardless of how many displays are used, and that takes precedence. . plymouth:force-drm on the kernel command line disables this behaviour. Author: Steve Langasek Author: Colin Watson Bug-Ubuntu: https://bugs.launchpad.net/bugs/533135 Forwarded: not-needed Last-Update: 2011-03-18 Index: trunk/src/plugins/renderers/drm/plugin.c =================================================================== --- trunk.orig/src/plugins/renderers/drm/plugin.c +++ trunk/src/plugins/renderers/drm/plugin.c @@ -76,6 +76,10 @@ #define BYTES_PER_PIXEL (4) +#ifndef PLY_MAX_COMMAND_LINE_SIZE +#define PLY_MAX_COMMAND_LINE_SIZE 512 +#endif + struct _ply_renderer_head { ply_renderer_backend_t *backend; @@ -505,6 +509,40 @@ } } +#ifdef PLY_ENABLE_LIBDRM_NOUVEAU +static bool +nouveau_force_drm (void) +{ + int fd; + char kernel_command_line[PLY_MAX_COMMAND_LINE_SIZE]; + + ply_trace ("opening /proc/cmdline"); + fd = open ("/proc/cmdline", O_RDONLY); + + if (fd < 0) + { + ply_trace ("couldn't open it: %m"); + return false; + } + + ply_trace ("reading kernel command line"); + if (read (fd, kernel_command_line, sizeof (kernel_command_line)) < 0) + { + ply_trace ("couldn't read it: %m"); + return false; + } + + ply_trace ("Kernel command line is: '%s'", kernel_command_line); + close (fd); + + if (ply_string_has_prefix (kernel_command_line, "plymouth:force-drm") || + strstr (kernel_command_line, " plymouth:force-drm") != NULL) + return true; + else + return false; +} +#endif + static bool load_driver (ply_renderer_backend_t *backend) { @@ -559,8 +597,13 @@ if (backend->driver_interface == NULL && (strcmp (driver_name, "nouveau") == 0 || strcmp (driver_name, "lbm-nouveau") == 0)) { - backend->driver_interface = ply_renderer_nouveau_driver_get_interface (); - backend->driver_supports_mapping_console = false; + if (nouveau_force_drm ()) + { + backend->driver_interface = ply_renderer_nouveau_driver_get_interface (); + backend->driver_supports_mapping_console = false; + } + else + ply_trace("falling back to framebuffer for nouveau to avoid DRM hang"); } #endif debian/patches/supress-notifications.patch0000664000000000000000000000117712322007274016220 0ustar Description: Suppress job-name update notifications to plymouthd from plymouth-upstart-bridge. Author: Dimitri John Ledkov Bug-Ubuntu: https://bugs.launchpad.net/bugs/1303815 --- plymouth-0.8.8.orig/src/upstart-bridge/plymouth-upstart-bridge.c +++ plymouth-0.8.8/src/upstart-bridge/plymouth-upstart-bridge.c @@ -147,8 +147,6 @@ update_status (state_t const char *action, bool is_okay) { - ply_boot_client_update_daemon (state->client, job->name, NULL, NULL, state); - if (job->description == NULL) return; debian/patches/tty1-after-boot.patch0000664000000000000000000000443412310333016014576 0ustar Description: Switch back to tty1 on exit if started with vt.handoff Author: Steve Langasek Last-Update: 2012-04-10 Bug-Ubuntu: https://bugs.launchpad.net/bugs/913731 Index: trunk/src/main.c =================================================================== --- trunk.orig/src/main.c +++ trunk/src/main.c @@ -1534,7 +1534,8 @@ ply_keyboard_t *keyboard; // urgh - if (!ply_terminal_open (state->terminal)) + if (state->local_console_terminal != NULL && + !ply_terminal_open (state->local_console_terminal)) return; keyboard = ply_keyboard_new_for_terminal (terminal); @@ -2164,6 +2165,21 @@ ply_trace ("After processing serial consoles there are now %d text displays", ply_list_get_length (state->text_displays)); + + if (state->mode == PLY_MODE_BOOT && state->local_console_terminal) + { + int vt_handoff = -1; + char *arg; + + arg = strstr (state->kernel_command_line, "vt.handoff="); + if (arg != NULL) + sscanf (arg, "vt.handoff=%d", &vt_handoff); + if (vt_handoff > 0) + { + ply_trace ("bootloader handed off on VT%d.", vt_handoff); + ply_terminal_handle_vt_handoff (state->local_console_terminal, vt_handoff); + } + } } static bool Index: trunk/src/libply-splash-core/ply-terminal.c =================================================================== --- trunk.orig/src/libply-splash-core/ply-terminal.c +++ trunk/src/libply-splash-core/ply-terminal.c @@ -651,6 +651,14 @@ return true; } +void +ply_terminal_handle_vt_handoff (ply_terminal_t *terminal, int vt) +{ + if (vt == terminal->initial_vt_number) + terminal->initial_vt_number = 1; +} + + int ply_terminal_get_fd (ply_terminal_t *terminal) { Index: trunk/src/libply-splash-core/ply-terminal.h =================================================================== --- trunk.orig/src/libply-splash-core/ply-terminal.h +++ trunk/src/libply-splash-core/ply-terminal.h @@ -60,6 +60,7 @@ void ply_terminal_free (ply_terminal_t *terminal); bool ply_terminal_open (ply_terminal_t *terminal); +void ply_terminal_handle_vt_handoff (ply_terminal_t *, int); int ply_terminal_get_fd (ply_terminal_t *terminal); bool ply_terminal_is_vt (ply_terminal_t *terminal); bool ply_terminal_is_open (ply_terminal_t *terminal); debian/patches/no-print-empty-description.patch0000664000000000000000000000120412321753274017066 0ustar Description: do not store empty descriptions Author: Dimitri John Ledkov --- plymouth-0.8.8.orig/src/upstart-bridge/ply-upstart-monitor.c +++ plymouth-0.8.8/src/upstart-bridge/ply-upstart-monitor.c @@ -273,7 +273,7 @@ on_get_all_job_properties_finished (DBus DBUS_TYPE_STRING) goto next_item; dbus_message_iter_get_basic (&variant_iter, &description); - if (description != NULL) + if (description != NULL && description[0]) { ply_trace ("description = '%s'", description); job->properties.description = strdup (description); debian/patches/dont-bail-on-dummy-terms.patch0000664000000000000000000000123412321753274016412 0ustar Description: don't bail plymouth-upstart-bridge if TERM is not set and/or running on a dummy terminal, as we can run on those. Author: Dimitri John Ledkov --- a/src/upstart-bridge/plymouth-upstart-bridge.c +++ b/src/upstart-bridge/plymouth-upstart-bridge.c @@ -307,7 +307,9 @@ if (should_be_verbose && !ply_is_tracing ()) ply_toggle_tracing (); - setupterm (NULL, STDOUT_FILENO, NULL); + /* Don't bail on dummy/hardcopy terminals */ + int errret=0; + setupterm (NULL, STDOUT_FILENO, &errret); is_connected = ply_boot_client_connect (state.client, (ply_boot_client_disconnect_handler_t) debian/patches/ubuntu-logo-scale-factor-2.patch0000664000000000000000000012252012321753274016630 0ustar Description: Make ubuntu-logo theme support scale factor, provide one plymouth theme with scale 1 and another with scale 2, until scale factor can be dynamically detected. Author: Dimitri John Ledkov --- a/themes/ubuntu-logo/Makefile.am +++ b/themes/ubuntu-logo/Makefile.am @@ -1,6 +1,7 @@ themedir = $(datadir)/plymouth/themes/ubuntu-logo -nodist_theme_DATA = ubuntu-logo.plymouth +nodist_theme_DATA = ubuntu-logo.plymouth ubuntu-logo-scale-2.plymouth dist_theme_DATA = ubuntu-logo.script \ + ubuntu-logo-scale-2.script \ ubuntu-logo.grub \ ubuntu_logo.png \ ubuntu_logo16.png \ @@ -13,11 +14,23 @@ -MAINTAINERCLEANFILES = Makefile.in ubuntu-logo.plymouth -CLEANFILES = ubuntu-logo.plymouth +MAINTAINERCLEANFILES = Makefile.in ubuntu-logo.plymouth ubuntu-logo-scale-2.plymouth ubuntu-logo.script ubuntu-logo-scale-2.script +CLEANFILES = ubuntu-logo.plymouth ubuntu-logo-scale-2.plymouth ubuntu-logo.script ubuntu-logo-scale-2.script ubuntu-logo.plymouth: $(srcdir)/ubuntu-logo.plymouth.in - sed -e 's,[@]PLYMOUTH_THEME_PATH[@],$(PLYMOUTH_THEME_PATH),g' \ + sed -e 's,[@]PLYMOUTH_THEME_PATH[@],$(PLYMOUTH_THEME_PATH),g;s,[@]EXTRA_NAME[@],,g;s,[@]SCRIPT_NAME[@],ubuntu-logo,g' \ $(srcdir)/ubuntu-logo.plymouth.in > ubuntu-logo.plymouth -EXTRA_DIST = ubuntu-logo.plymouth.in +ubuntu-logo-scale-2.plymouth: $(srcdir)/ubuntu-logo.plymouth.in + sed -e 's,[@]PLYMOUTH_THEME_PATH[@],$(PLYMOUTH_THEME_PATH),g;s,[@]EXTRA_NAME[@],(Scale x2),g;s,[@]SCRIPT_NAME[@],ubuntu-logo-scale-2,g' \ + $(srcdir)/ubuntu-logo.plymouth.in > ubuntu-logo-scale-2.plymouth + +ubuntu-logo.script: $(srcdir)/ubuntu-logo.script.in + sed -e 's,[@]SCALEFACTOR[@],1,g' \ + $(srcdir)/ubuntu-logo.script.in > ubuntu-logo.script + +ubuntu-logo-scale-2.script: $(srcdir)/ubuntu-logo.script.in + sed -e 's,[@]SCALEFACTOR[@],2,g' \ + $(srcdir)/ubuntu-logo.script.in > ubuntu-logo-scale-2.script + +EXTRA_DIST = ubuntu-logo.plymouth.in ubuntu-logo.script.in --- a/themes/ubuntu-logo/ubuntu-logo.plymouth.in +++ b/themes/ubuntu-logo/ubuntu-logo.plymouth.in @@ -1,8 +1,8 @@ [Plymouth Theme] -Name=Ubuntu Logo +Name=Ubuntu Logo @EXTRA_NAME@ Description=A theme that features a blank background with a logo. ModuleName=script [script] ImageDir=@PLYMOUTH_THEME_PATH@/ubuntu-logo -ScriptFile=@PLYMOUTH_THEME_PATH@/ubuntu-logo/ubuntu-logo.script +ScriptFile=@PLYMOUTH_THEME_PATH@/ubuntu-logo/@SCRIPT_NAME@.script --- /dev/null +++ b/themes/ubuntu-logo/ubuntu-logo.script.in @@ -0,0 +1,1142 @@ +# ubuntu-logo.script - boot splash plugin +# +# Copyright (C) 2009 Canonical Ltd. +# +# This program 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; either version 2, or (at your option) +# any later version. +# +# This program 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 program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. +# +# Written by: Alberto Milone +# +# Based on the example provided with the "script plugin" written by: +# Charlie Brej +# +# Question stuff written by: Markus Waas +# +# + +# Set the text colour in (rgb / 256) +text_colour.red = 1.0; +text_colour.green = 1.0; +text_colour.blue = 1.0; + +# Tinted text #988592 +tinted_text_colour.red = 0.59; +tinted_text_colour.green = 0.52; +tinted_text_colour.blue = 0.57; + +# Action Text - #ffffff - RGB 255 255 255 +action_text_colour.red = 1.0; +action_text_colour.green = 1.0; +action_text_colour.blue = 1.0; + +# Orange - #ff4012 - RGB 255 64 18 +debugsprite = Sprite(); +debugsprite_bottom = Sprite(); +debugsprite_medium = Sprite(); + +# Ubuntu Font +ubuntufont = "Ubuntu 11"; +ubuntualignment = "center"; + +# Scale factor +scalefactor = @SCALEFACTOR@; + +# are we currently prompting for a password? +prompt_active = 0; + +# Generic scalable image loader +fun LoadScaleImage (imagepath) { + image = Image (imagepath); + image = image.Scale (image.GetWidth() * scalefactor, image.GetHeight() * scalefactor); + return image; +} + +# General purpose function to create text +fun WriteText (text, colour) { + image = Image.Text (text, colour.red, colour.green, colour.blue, color.alpha, ubuntufont, ubuntualignment); + image = image.Scale (image.GetWidth() * scalefactor, image.GetHeight() * scalefactor); + return image; +} + +fun ImageToText (text) { + image = WriteText (text, text_colour); + return image; +} + +fun ImageToTintedText (text) { + image = WriteText (text, tinted_text_colour); + return image; +} + +fun ImageToActionText (text) { + image = WriteText (text, action_text_colour); + return image; +} + +fun Debug(text) { + debugsprite.SetImage(ImageToText (text)); +} + +fun DebugBottom(text) { + debugsprite_bottom.SetImage(ImageToText (text)); + debugsprite_bottom.SetPosition(0, (Window.GetHeight (0) - 20), 1); +} + +fun DebugMedium(text) { + debugsprite_medium.SetImage(ImageToText (text)); + debugsprite_medium.SetPosition(0, (Window.GetHeight (0) - 60), 1); +} + +fun TextYOffset() { + local.y; + local.text_height; + local.min_height; + + # Put the 1st line below the logo + some spacing + y = logo.y + logo.height + (progress_indicator.bullet_height * 7 ); # + logo_spacing; + + text_height = first_line_height * 7.5; + + min_height = Window.GetHeight(); + if (y + text_height > min_height) + y = min_height - text_height; + + if (y < progress_indicator.y + progress_indicator.height) + return progress_indicator.y + progress_indicator.height; + return y; +} + +#------------------------------String functions------------------------------- + +# This is the equivalent for strstr() +fun StringString(string, substring) { + start = 0; + while (String(string).CharAt (start)) { + walk = 0; + while (String(substring).CharAt (walk) == String(string).CharAt (start + walk) ) { + walk++; + if (!String(substring).CharAt (walk)) return start; + } + start++; + } + + return NULL; +} + +fun StringLength (string) { + index = 0; + while (String(string).CharAt(index)) index++; + return index; +} + +fun StringCopy (source, beginning, end) { + local.destination = ""; + for (index = beginning; ( ( (end == NULL) || (index <= end) ) && (String(source).CharAt(index)) ); index++) { + local.destination += String(source).CharAt(index); + } + + return local.destination; +} + +fun StringReplace (source, pattern, replacement) { + local.found = StringString(source, pattern); + if (local.found == NULL) + return source; + + local.new_string = StringCopy (source, 0, local.found - 1) + + replacement + + StringCopy (source, local.found + StringLength(pattern), NULL); + + return local.new_string; +} + +# it makes sense to use it only for +# numbers up to 100 +fun StringToInteger (str) { + int = -1; + for (i=0; i<=100; i++) { + if (i+"" == str) { + int = i; + break; + } + } + return int; +} + +#----------------------------------------------------------------------------- +# Previous background colour +# #300a24 --> 0.19, 0.04, 0.14 +# New background colour +# #2c001e --> 0.16, 0.00, 0.12 +# +Window.SetBackgroundTopColor (0.16, 0.00, 0.12); # Nice colour on top of the screen fading to +Window.SetBackgroundBottomColor (0.16, 0.00, 0.12); # an equally nice colour on the bottom + +bits_per_pixel = Window.GetBitsPerPixel (); +if (bits_per_pixel == 4) { + logo_filename = "ubuntu_logo16.png"; + progress_dot_off_filename = "progress_dot_off16.png"; + progress_dot_on_filename = "progress_dot_on16.png"; + password_field_filename = "password_field16.png"; + question_field_filename = "password_field16.png"; +} else { + logo_filename = "ubuntu_logo.png"; + progress_dot_off_filename = "progress_dot_off.png"; + progress_dot_on_filename = "progress_dot_on.png"; + password_field_filename = "password_field.png"; + question_field_filename = "password_field.png"; +} + +logo.image = LoadScaleImage (logo_filename); +logo.sprite = Sprite (); +logo.sprite.SetImage (logo.image); +logo.width = logo.image.GetWidth (); +logo.height = logo.image.GetHeight (); +logo.x = Window.GetX () + Window.GetWidth () / 2 - logo.width / 2; +logo.y = Window.GetY () + Window.GetHeight () / 2 - logo.height; +logo.z = 1000; +logo.sprite.SetX (logo.x); +logo.sprite.SetY (logo.y); +logo.sprite.SetZ (logo.z); +logo.sprite.SetOpacity (1); + +# Spacing below the logo - in pixels +logo_spacing = logo.height * 4; + +message_notification[0].image = ImageToTintedText (""); +message_notification[1].image = ImageToTintedText (""); +fsck_notification.image = ImageToActionText (""); + +status = "normal"; + +progress_indicator.bullet_off = LoadScaleImage (progress_dot_off_filename); +progress_indicator.bullet_on = LoadScaleImage (progress_dot_on_filename); +progress_indicator.bullet_width = progress_indicator.bullet_off.GetWidth (); +progress_indicator.bullet_height = progress_indicator.bullet_off.GetHeight (); +progress_indicator.bullet_hspacing = progress_indicator.bullet_width * 1.1; +progress_indicator.width = progress_indicator.bullet_width * 5; +progress_indicator.height = progress_indicator.bullet_height; +progress_indicator.y = logo.y + logo.height + (logo.height / 4); +progress_indicator.x = Window.GetX () + Window.GetWidth () / 2 - progress_indicator.width / 2; # logo.x + 26; + +# use a fixed string with ascending and descending stems to calibrate the +# bounding box for the first message, so the messages below don't move up +# and down according to *their* height. +first_line_height = ImageToTintedText ("AfpqtM").GetHeight(); + +# if the user has a 640x480 or 800x600 display, we can't quite fit everything +# (including passphrase prompts) with the target spacing, so scoot the text up +# a bit if needed. +top_of_the_text = TextYOffset(); + +#-----------------------------------------Logo functions------------------------------ + +# Call this when updating the screen +fun draw_logo () { + logo.sprite.SetX (logo.x); + logo.sprite.SetY (logo.y); + logo.sprite.SetZ (logo.z); + logo.sprite.SetOpacity (1); +} + + +#-----------------------------------------Progress Indicator-------------------------- +fun set_progress_indicator () { + + + # Here we assume that we can store half bullets on each half of the screen + # together with some spacing + local.x = progress_indicator.x; + + for (index = 0; index <= 4; index++) { + # Set the "off" bullets + progress_indicator.bullets_off[index].sprite = Sprite (progress_indicator.bullet_off); + progress_indicator.bullets_off[index].sprite.SetPosition (local.x, progress_indicator.y, 1000); + progress_indicator.bullets_off[index].x = local.x; + progress_indicator.bullets_off[index].y = progress_indicator.y; + progress_indicator.bullets_off[index].sprite.SetOpacity (1); + + #local.debug_medium_string = "Progress indicator " + index + ": x = " + progress_indicator.bullets_off[index].x + + # ", y = " + progress_indicator.bullets_off[index].y + ", logo width = " + logo.width + + # ", logo height = " + logo.height + " " + screen_width + " " + screen_height; + # + #(index % 2) && DebugMedium (local.debug_medium_string) || DebugBottom (local.debug_medium_string); + + # Set the "on" bullets on top of the "off" bullets and make them transparent + progress_indicator.bullets_on[index].sprite = Sprite (progress_indicator.bullet_on); + progress_indicator.bullets_on[index].x = progress_indicator.bullets_off[index].x; + progress_indicator.bullets_on[index].y = progress_indicator.bullets_off[index].y; + progress_indicator.bullets_on[index].sprite.SetPosition (progress_indicator.bullets_on[index].x, progress_indicator.bullets_on[index].y, 10000); + + progress_indicator.bullets_on[index].sprite.SetOpacity (0); + + local.x += progress_indicator.bullet_hspacing; + } + #local.debug_string = "Progress indicator: x1 = " + progress_indicator.x + ", x2 = " + local.x + ", y = " + progress_indicator.y + + # ", x logo = " + logo.x + ", y logo = " + logo.y + ", indicator width = " + progress_indicator.width; + #Debug(progress_indicator.bullets_off[0].x); +} + + +# We have 2 bullets, one on top of the other: +# The white one is on top of the red one and the former should +# slowly fade so as to get a nice transition effect. +fun switch_on_bullet (bullets_off, bullets_on, bullet_number, opacity) { + local.x = bullets_on[bullet_number].x; + local.y = bullets_on[bullet_number].y; + local.z = bullets_on[bullet_number].z; + + # Hide the bullets which are off + bullets_off[bullet_number].sprite.SetOpacity (0); + + # Show the bullets which are on + bullets_on[bullet_number].sprite.SetPosition (local.x, local.y, local.z); + bullets_on[bullet_number].sprite.SetOpacity (opacity); + + # Bump the number of times we have switched on bullets + global.times_bullets_switched++; +} + +fun switch_off_bullets () { + # Debug("Switching off progress indicator"); + + set_progress_indicator (); + global.times_bullets_switched = 0; + global.on_off = 1; +} + +# This is something that we can call when we exit +fun switch_on_bullets () { + # Debug("Switching off progress indicator"); + if (!global.progress_indicator.bullets_on) set_progress_indicator (); + local = global.progress_indicator; + + for (index = 0; bullets_on[index]; index++) { + switch_on_bullet (bullets_off, bullets_on, index, 1.0); + } +} + + +# Implement in boot progress callback +fun animate_progress_indicator (progress, time) { + if (global.progress_time == NULL) { + global.progress_time = progress; #time; + switch_off_bullets (); + } + +# Debug ("progress = " + progress + ", time = " + time + " times switched = " + global.times_bullets_switched + " on_off " + global.on_off); + +# if (global.times_bullets_switched == NULL) +# global.times_bullets_switched = 5; + +# if (global.on_off == NULL) +# global.on_off = 0; + + if ((progress - global.progress_time) >= 1.0) { + global.progress_time = progress; + + if (global.times_bullets_switched == 5) { + # Change which bullets are switched on + # and which ones are switched off + global.on_off = !global.on_off; + global.times_bullets_switched = 0; + } + + if (global.on_off) { + switch_on_bullet (progress_indicator.bullets_off, progress_indicator.bullets_on, + global.times_bullets_switched, 1.0); + } + else { + switch_on_bullet (progress_indicator.bullets_on, progress_indicator.bullets_off, + global.times_bullets_switched, 1.0); + } + } + + + # Start setting bullets to "on" with translucency +# for (index = 0; index <= 5; index++) { +# opacity = 0.0; +# while (opacity <= 1.0) { +# switch_on_bullet (progress_indicator.bullets_off, progress_indicator.bullets_on, +# index, opacity); +# opacity += 0.1; +# } +# } +} + + +#-----------------------------------------Label utility functions--------------------- + +# label should be either a string or NULL +# Images for n lines will be created and returned as items of the +# message_label array +# +fun get_message_label (label, is_fake, is_action_line) { + # Debug("Get Label position"); + local.message_label; + + if (is_fake) + # Create a fake label so as to get the y coordinate of + # a standard-length label. + local.message_image = ImageToTintedText ("This is a fake message"); + else + local.message_image = (is_action_line) && ImageToActionText (label) || ImageToTintedText (label); + + message_label.width = message_image.GetWidth (); + message_label.height = message_image.GetHeight (); + + # Center the line horizontally + message_label.x = Window.GetX () + Window.GetWidth () / 2 - message_label.width / 2; + + message_label.y = top_of_the_text; + + # Put the 2nd line below the fsck line + if (is_action_line) { + local.fsck_label.y = message_label.y + (first_line_height + first_line_height / 2); + message_label.y = local.fsck_label.y + (first_line_height * 2); + } + + # Debug("action label x = " + message_label.x + " y = " + message_label.y ); + +# message_debug = "msg_x = " + message_label.x + " msg_y = " + message_label.y + +# "msg_width = " + message_label.width + " msg_height = " + +# message_label.height + " message = " + label; +# Debug(message_debug); + + return message_label; + +} + +# Create an fsck label and/or get its position +fun get_fsck_label (label, is_fake) { + # Debug("Get Label position"); + local.fsck_label = global.progress_label; + + if (is_fake) + fsck_label.image = ImageToTintedText ("This is a fake message"); + else + fsck_label.image = ImageToTintedText (label); + + fsck_label.width = fsck_label.image.GetWidth (); + fsck_label.height = fsck_label.image.GetHeight (); + + # Centre the label horizontally + fsck_label.x = Window.GetX () + Window.GetWidth () / 2 - fsck_label.width / 2; + + local.first_label = get_message_label (label, 1, 0); + + # Place the label below the 1st message line + fsck_label.y = local.first_label.y + local.first_label.height + (local.first_label.height / 2); + +# message_debug = "msg_x = " + fsck_label.x + " msg_y = " + fsck_label.y + +# "msg_width = " + fsck_label.width + " msg_height = " + +# fsck_label.height + " message = " + label; +# Debug(message_debug); + + return fsck_label; +} + +#-----------------------------------------Message stuff -------------------------------- +# + +# Set up a message label +# +# NOTE: this is called when doing something like 'plymouth message "hello world"' +# +fun setup_message (message_text, x, y, z, index) { + # Debug("Message setup"); + global.message_notification[index].image = (index) && ImageToActionText (message_text) || ImageToTintedText (message_text); + + # Set up the text message, if any + message_notification[index].x = x; + message_notification[index].y = y; + message_notification[index].z = z; + + message_notification[index].sprite = Sprite (); + message_notification[index].sprite.SetImage (message_notification[index].image); + message_notification[index].sprite.SetX (message_notification[index].x); + message_notification[index].sprite.SetY (message_notification[index].y); + message_notification[index].sprite.SetZ (message_notification[index].z); + +} + +fun show_message (index) { + if (global.message_notification[index].sprite) global.message_notification[index].sprite.SetOpacity(1); +} + +fun hide_message (index) { + if (global.message_notification[index].sprite) global.message_notification[index].sprite.SetOpacity(0); +} + + + + +# the callback function is called when new message should be displayed. +# First arg is message to display. +fun message_callback (message) +{ + # Debug("Message callback"); + is_fake = 0; + if (!message || (message == "")) is_fake = 1; + + local.substring = "keys:"; + + # Look for the "keys:" prefix + local.keys = StringString(message, local.substring); + + local.is_action_line = (keys != NULL); + #Debug("keys " + local.keys + " substring length = " + StringLength(local.substring)); + + # Get the message without the "keys:" prefix + if (keys != NULL) + message = StringCopy (message, keys + StringLength(local.substring), NULL); + + local.label.is_fake = is_fake; + label = get_message_label(message, is_fake, is_action_line); + label.z = 10000; + + setup_message (message, label.x, label.y, label.z, is_action_line); + if (prompt_active && local.is_action_line) + hide_message (is_action_line); + else + show_message (is_action_line); + +} + + +#-----------------------------------------Display Password stuff ----------------------- +# + +fun password_dialogue_setup (message_label) { + # Debug("Password dialog setup"); + + local.entry; + local.bullet_image; + bullet_image = LoadScaleImage (progress_dot_off_filename); + entry.image = LoadScaleImage (password_field_filename); + + # Hide the normal labels + prompt_active = 1; + if (message_notification[1].sprite) hide_message (1); + + # Set the prompt label + label = get_message_label(message_label, 0, 1); + label.z = 10000; + + setup_message (message_label, label.x, label.y, label.z, 2); + show_message (2); + + # Set up the text entry which contains the bullets + entry.sprite = Sprite (); + entry.sprite.SetImage (entry.image); + + # Centre the box horizontally + entry.x = Window.GetX () + Window.GetWidth () / 2 - entry.image.GetWidth () / 2; + + # Put the entry below the second label. + entry.y = message_notification[2].y + label.height; + + #Debug ("entry x = " + entry.x + ", y = " + entry.y); + entry.z = 10000; + entry.sprite.SetX (entry.x); + entry.sprite.SetY (entry.y); + entry.sprite.SetZ (entry.z); + + global.password_dialogue = local; +} + +fun password_dialogue_opacity (opacity) { + # Debug("Password dialog opacity"); + global.password_dialogue.opacity = opacity; + local = global.password_dialogue; + + # You can make the box translucent with a float + # entry.sprite.SetOpacity (0.3); + entry.sprite.SetOpacity (opacity); + label.sprite.SetOpacity (opacity); + + if (bullets) { + for (index = 0; bullets[index]; index++) { + bullets[index].sprite.SetOpacity (opacity); + } + } +} + + +# The callback function is called when the display should display a password dialogue. +# First arg is prompt string, the second is the number of bullets. +fun display_password_callback (prompt, bullets) { + # Debug("Password dialog setup"); + + global.status = "password"; + if (!global.password_dialogue) password_dialogue_setup(prompt); + password_dialogue_opacity (1); + bullet_width = password_dialogue.bullet_image.GetWidth(); + bullet_y = password_dialogue.entry.y + + password_dialogue.entry.image.GetHeight () / 2 - + password_dialogue.bullet_image.GetHeight () / 2; + margin = bullet_width; + spaces = Math.Int( (password_dialogue.entry.image.GetWidth () - (margin * 2) ) / ( 2 * bullet_width / 3 ) ); + #Debug ("spaces = " + spaces + ", bullets = " + bullets); + bullets_area.width = margin + spaces * ( 2 * bullet_width / 3); + bullets_area.x = Window.GetX () + Window.GetWidth () / 2 - bullets_area.width / 2; + #DebugBottom ("pwd_entry x = " + password_dialogue.entry.x + ", bullets_area.x = " + bullets_area.x + ", bullets_area.width = " + bullets_area.width); + if (bullets > spaces) + bullets = spaces; + for (index = 0; password_dialogue.bullets[index] || index < spaces ; index++){ + if (!password_dialogue.bullets[index]) { + password_dialogue.bullets[index].sprite = Sprite (); + password_dialogue.bullets[index].sprite.SetImage (password_dialogue.bullet_image); + password_dialogue.bullets[index].x = bullets_area.x + # password_dialogue.entry.x + margin + + index * ( 2 * bullet_width / 3 ) ; + password_dialogue.bullets[index].sprite.SetX (password_dialogue.bullets[index].x); + password_dialogue.bullets[index].y = bullet_y; + password_dialogue.bullets[index].sprite.SetY (password_dialogue.bullets[index].y); + password_dialogue.bullets[index].z = password_dialogue.entry.z + 100 - index; + password_dialogue.bullets[index].sprite.SetZ (password_dialogue.bullets[index].z); + } + + password_dialogue.bullets[index].sprite.SetOpacity (0); + + if (index < bullets ) { + password_dialogue.bullets[index].sprite.SetOpacity (1); + } + } +} + +Plymouth.SetDisplayPasswordFunction (display_password_callback); + +Plymouth.SetMessageFunction (message_callback); + +Plymouth.SetBootProgressFunction (animate_progress_indicator); + +# Plymouth.SetBootProgressFunction: the callback function is called with two numbers, the progress (between 0 and 1) and the time spent booting so far +# Plymouth.SetRootMountedFunction: the callback function is called when a new root is mounted +# Plymouth.SetKeyboardInputFunction: the callback function is called with a string containing a new character entered on the keyboard + +#----------------------------------------- FSCK Counter -------------------------------- + +# Initialise the counter +fun init_fsck_count () { + # The number of fsck checks in this cycle + global.counter.total = 0; + # The number of fsck checks already performed + the current one + global.counter.current = 1; + # The previous fsck + global.counter.last = 0; +} + +# Increase the total counter +fun increase_fsck_count () { + global.counter.total++; +} + +fun increase_current_fsck_count () { + global.counter.last = global.counter.current++; +} + +# Clear the counter +fun clear_fsck_count () { + global.counter = NULL; + init_fsck_count (); +} + +#----------------------------------------- Progress Label ------------------------------ + + +# Change the opacity level of a progress label +# +# opacity = 1 -> show +# opacity = 0 -> hide +# opacity = 0.3 (or any other float) -> translucent +# +fun set_progress_label_opacity (opacity) { + # the label + progress_label.sprite.SetOpacity (opacity); + + # Make the slot available again when hiding the bar + # So that another bar can take its place + if (opacity == 0) { + progress_label.is_available = 1; + progress_label.device = ""; + } +} + +# Set up a new Progress Bar +# +# TODO: Make it possible to reuse (rather than recreate) a bar +# if .is_available = 1. Ideally this would just reset the +# label, the associated +# device and the image size of the sprite. + +fun init_progress_label (device, status_string) { + # Make the slot unavailable + global.progress_label.is_available = 0; + progress_label.progress = 0; + progress_label.device = device; + progress_label.status_string = status_string; +} + +# See if the progress label is keeping track of the fsck +# of "device" +# +fun device_has_progress_label (device) { + #DebugBottom ("label device = " + progress_label.device + " checking device " + device); + return (progress_label.device == device); +} + +# Update the Progress bar which corresponds to index +# +fun update_progress_label (progress) { + # If progress is NULL then we just refresh the label. + # This happens when only counter.total has changed. + if (progress != NULL) { + progress_label.progress = progress; + + #Debug("device " + progress_label.device + " progress " + progress); + + # If progress >= 100% hide the label and make it available again + if (progress >= 100) { + set_progress_label_opacity (0); + + # See if we any other fsck check is complete + # and, if so, hide the progress bars and the labels + on_fsck_completed (); + + return 0; + } + } + # Update progress label here + # + # FIXME: the queue logic from this theme should really be moved into mountall + # instead of using string replacement to deal with localised strings. + label = StringReplace (progress_label.status_string[0], "%1$d", global.counter.current); + label = StringReplace (label, "%2$d", global.counter.total); + label = StringReplace (label, "%3$d", progress_label.progress); + label = StringReplace (label, "%%", "%"); + + progress_label = get_fsck_label (label, 0); + #progress_label.progress = progress; + + progress_label.sprite = Sprite (progress_label.image); + + # Set up the bar + progress_label.sprite.SetPosition(progress_label.x, progress_label.y, 1); + + set_progress_label_opacity (1); + +} + +# Refresh the label so as to update counters +fun refresh_progress_label () { + update_progress_label (NULL); +} + +#----------------------------------------- FSCK Queue ---------------------------------- + +# Initialise the fsck queue +fun init_queue () { + global.fsck_queue[0].device; + global.fsck_queue[0].progress; + global.fsck_queue.counter = 0; + global.fsck_queue.biggest_item = 0; +} + +fun clear_queue () { + global.fsck_queue = NULL; + init_queue (); +} + +# Return either the device index in the queue or -1 +fun queue_look_up_by_device (device) { + for (i=0; i <= fsck_queue.biggest_item; i++) { + if ((fsck_queue[i]) && (fsck_queue[i].device == device)) + return i; + } + return -1; +} + +# Keep track of an fsck process in the queue +fun add_fsck_to_queue (device, progress) { + # Look for an empty slot in the queue + for (i=0; global.fsck_queue[i].device; i++) { + continue; + } + local.index = i; + + # Set device and progress + global.fsck_queue[local.index].device = device; + global.fsck_queue[local.index].progress = progress; + + # Increase the queue counter + global.fsck_queue.counter++; + + # Update the max index of the array for iterations + if (local.index > global.fsck_queue.biggest_item) + global.fsck_queue.biggest_item = local.index; + + #DebugMedium ("Adding " + device + " at " + local.index); +} + +fun is_queue_empty () { + return (fsck_queue.counter == 0); +} + +fun is_progress_label_available () { + return (progress_label.is_available == 1); +} + + +# This should cover the case in which the fsck checks in +# the queue are completed before the ones showed in the +# progress label +fun on_queued_fsck_completed () { + if (!is_queue_empty ()) + return; + + # Hide the extra label, if any + #if (progress_bar.extra_label.sprite) + # progress_bar.extra_label.sprite.SetOpacity(0); +} + +fun remove_fsck_from_queue (index) { + # Free memory which was previously allocated for + # device and progress + global.fsck_queue[index].device = NULL; + global.fsck_queue[index].progress = NULL; + + # Decrease the queue counter + global.fsck_queue.counter--; + + # See if there are other processes in the queue + # if not, clear the extra_label + on_queued_fsck_completed (); +} + +fun on_fsck_completed () { + # We have moved on to tracking the next fsck + increase_current_fsck_count (); + + if (!is_progress_label_available ()) + return; + + if (!is_queue_empty ()) + return; + + # Hide the progress label + if (progress_label.sprite) + progress_label.sprite.SetOpacity (0); + + # Clear the queue + clear_queue (); + + # Clear the fsck counter + clear_fsck_count (); +} + +# Update an fsck process that we keep track of in the queue +fun update_progress_in_queue (index, device, progress) { + # If the fsck is complete, remove it from the queue + if (progress >= 100) { + remove_fsck_from_queue (index); + on_queued_fsck_completed (); + return; + } + + global.fsck_queue[index].device = device; + global.fsck_queue[index].progress = progress; + +} + +# TODO: Move it to some function +# Create an empty queue +#init_queue (); + + +#----------------------------------------- FSCK Functions ------------------------------ + + +# Either add a new bar for fsck checks or update an existing bar +# +# NOTE: no more than "progress_bar.max_number" bars are allowed +# +fun fsck_check (device, progress, status_string) { + + # The 1st time this will take place + if (!global.progress_label) { + # Increase the fsck counter + increase_fsck_count (); + + # Set up a new label for the check + init_progress_label (device, status_string); + update_progress_label (progress); + + return; + } + + + if (device_has_progress_label (device)) { + # Update the progress of the existing label + update_progress_label (progress); + } + else { + # See if there's already a slot in the queue for the device + local.queue_device_index = queue_look_up_by_device(device); + + # See if the progress_label is available + if (progress_label.is_available) { + +# local.my_string = "available index " + local.available_index + " progress_bar counter is " + progress_bar.counter; +# Debug(local.my_string); + + + # If the fsck check for the device was in the queue, then + # remove it from the queue + if (local.queue_device_index >= 0) { + remove_fsck_from_queue (index); + } + else { + # Increase the fsck counter + increase_fsck_count (); + } + +# local.my_string += local.message; + #Debug("setting new label for device " + device + " progress " + progress); + + # Set up a new label for the check + init_progress_label (device, status_string); + update_progress_label (progress); + + } + # If the progress_label is not available + else { + + # If the fsck check for the device is already in the queue + # just update its progress in the queue + if (local.queue_device_index >= 0) { + #DebugMedium("Updating queue at " + local.queue_device_index + " for device " + device); + update_progress_in_queue (local.queue_device_index, device, progress); + } + # Otherwise add the check to the queue + else { + #DebugMedium("Adding device " + device + " to queue at " + local.queue_device_index); + add_fsck_to_queue (device, progress); + + # Increase the fsck counter + increase_fsck_count (); + + refresh_progress_label (); + } + + } + } + +# if (!is_queue_empty ()) { +# DebugBottom("Extra label for "+ device); + #} +# else { +# DebugBottom("No extra label for " + device + ". 1st Device in the queue "+ fsck_queue[0].device + " counter = " + global.fsck_queue.counter); +# } +} + + +#-----------------------------------------Update Status stuff -------------------------- +# +# The update_status_callback is what we can use to pass plymouth whatever we want so +# as to make use of features which are available only in this program (as opposed to +# being available for any theme for the script plugin). +# +# Example: +# +# Thanks to the current implementation, some scripts can call "plymouth --update=fsck:sda1:40" +# and this program will know that 1) we're performing and fsck check, 2) we're checking sda1, +# 3) the program should set the label progress to 40% +# +# Other features can be easily added by parsing the string that we pass plymouth with "--update" +# +fun update_status_callback (status) { +# Debug(status); + if (!status) return; + + string_it = 0; + update_strings[string_it] = ""; + + for (i=0; (String(status).CharAt(i) != ""); i++) { + local.temp_char = String(status).CharAt(i); + if (temp_char != ":") + update_strings[string_it] += temp_char; + else + update_strings[++string_it] = ""; + } + +# my_string = update_strings[0] + " " + update_strings[1] + " " + update_strings[2]; +# Debug(my_string); + # Let's assume that we're dealing with these strings fsck:sda1:40 + if ((string_it >= 2) && (update_strings[0] == "fsck")) { + + device = update_strings[1]; + progress = update_strings[2]; + status_string[0] = update_strings[3]; # "Checking disk %1$d of %2$d (%3$d %% complete)" + if (!status_string[0]) + status_string[0] = "Checking disk %1$d of %2$d (%3$d %% complete)"; + + if ((device != "") && (progress != "")) { + progress = StringToInteger (progress); + + # Make sure that the fsck_queue is initialised + if (!global.fsck_queue) + init_queue (); + + # Make sure that the fsck counter is initialised + if (!global.counter) + init_fsck_count (); + +# if (!global.progress_bar.extra_label.sprite) +# create_extra_fsck_label (); + + # Keep track of the fsck check + fsck_check (device, progress, status_string); + } + + } + +} +Plymouth.SetUpdateStatusFunction (update_status_callback); + +#-----------------------------------------Display Question stuff ----------------------- + +fun question_dialogue_setup (message_label, text_image) { + #Debug("Question dialog setup"); + + local.field; + local.content; + local.margin; + + field.image = LoadScaleImage (question_field_filename); + content = Sprite (); + bullet_image = LoadScaleImage (progress_dot_off_filename); + margin = bullet_image.GetWidth() / 2; + + # Hide the normal labels + prompt_active = 1; + if (message_notification[1].sprite) hide_message (1); + + # Set the prompt label + label = get_message_label(message_label, 0, 1); + label.z = 10000; + + setup_message (message_label, label.x, label.y, label.z, 2); + show_message (2); + + # Set up the text field which contains the contents + field.sprite = Sprite (); + field.sprite.SetImage (field.image); + + # Centre the box horizontally + field.x = Window.GetX () + Window.GetWidth () / 2 - field.image.GetWidth () / 2; + content_x = field.x + margin; + + # Put the field below the second label. + field.y = message_notification[2].y + label.height; + content_y = field.y + field.image.GetHeight () / 2 - text_image.GetHeight () / 2; + + #Debug ("field x = " + field.x + ", y = " + field.y); + field.z = 10000; + field.sprite.SetX (field.x); + field.sprite.SetY (field.y); + field.sprite.SetZ (field.z); + + #Debug ("content_x = " + content_x + " content_y = " + content_y); + content_z = field.z + 1; + content.SetPosition (content_x, content_y, content_z); + + global.question_dialogue = local; +} + +# The callback function is called when the display should display a question dialogue. +# First arg is prompt string, the second is the field contents. +fun display_question_callback (prompt, contents) { + global.status = "question"; + #Debug ("Reply: " + contents); + + textImage = ImageToText(contents); + if (!global.question_dialogue) { + question_dialogue_setup(prompt, textImage); + } + + margin = global.question_dialogue.margin; + fieldWidth = global.question_dialogue.field.image.GetWidth (); + for (i = 0; ( (textImage.GetWidth () + 2 * margin ) > fieldWidth ); i++) { + textImage = ImageToText(StringCopy (contents, i, StringLength (contents))); + } + + global.question_dialogue.content.SetImage (textImage); +} + + +Plymouth.SetDisplayQuestionFunction (display_question_callback); + +#-----------------------------------------Refresh stuff -------------------------------- +# +# Calling Plymouth.SetRefreshFunction with a function will set that function to be +# called up to 50 times every second, e.g. +# +# NOTE: if a refresh function is not set, Plymouth doesn't seem to be able to update +# the screen correctly +# +fun refresh_callback () +{ + draw_logo (); +} +Plymouth.SetRefreshFunction (refresh_callback); + + +#-----------------------------------------Display Normal stuff ----------------------- +# +# The callback function is called when the display should return to normal +fun display_normal_callback () +{ + global.status = "normal"; + if (global.password_dialogue) { + password_dialogue_opacity (0); + global.password_dialogue = NULL; + if (message_notification[2].sprite) hide_message(2); + prompt_active = 0; + } + if (global.question_dialogue) { + question_dialogue_opacity (0); + global.question_dialogue = NULL; + if (message_notification[2].sprite) hide_message(2); + prompt_active = 0; + } + + if (message_notification[1].sprite) show_message (1); + +} + +Plymouth.SetDisplayNormalFunction (display_normal_callback); + + +#----------------------------------------- Quit -------------------------------- + +# TODO: Maybe we should also hide any other dialog +# Show the logo and make the progress indicator look full when on exit +fun quit_callback () +{ + logo.sprite.SetOpacity (1); + switch_on_bullets (); +} + +Plymouth.SetQuitFunction(quit_callback); debian/patches/Fix-missing-prototype-of-ply_get_timestamp.patch0000664000000000000000000000210612310333016022215 0ustar From 98f7fc434d3718be0689671854bece47ed7fef93 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Fri, 28 Jun 2013 10:52:59 -0700 Ubuntu-Bug: https://bugs.launchpad.net/ubuntu/+source/plymouth/+bug/1187318 Subject: [PATCH] Fix missing prototype of ply_get_timestamp() Because ply_get_timestamp() returns a double, a missing prototype on x86 corrupts the processor's floating point state with astonishing knock-on effects (the label plugin fails to display any text). Bug: https://bugs.launchpad.net/ubuntu/+source/plymouth/+bug/1187318 --- src/plugins/splash/script/script-lib-math.c | 1 + 1 file changed, 1 insertion(+) Index: trunk/src/plugins/splash/script/script-lib-math.c =================================================================== --- trunk.orig/src/plugins/splash/script/script-lib-math.c +++ trunk/src/plugins/splash/script/script-lib-math.c @@ -20,6 +20,7 @@ * Written by: Charlie Brej */ #define _GNU_SOURCE +#include "ply-utils.h" #include "script.h" #include "script-parse.h" #include "script-execute.h" debian/patches/initramfsless-boot.patch0000664000000000000000000000274012310333016015457 0ustar Author: Steve Langasek Description: support initramfsless boot Don't fail if --attach-to-session is passed and /dev/pts isn't mounted yet, as this breaks booting without an initramfs. Bug-Ubuntu: https://bugs.launchpad.net/bugs/981314 Last-Update: 2012-04-15 Index: trunk/src/main.c =================================================================== --- trunk.orig/src/main.c +++ trunk/src/main.c @@ -1701,6 +1701,7 @@ session = ply_terminal_session_new (NULL); ply_terminal_session_attach_to_event_loop (session, state->loop); + state->session = session; } else { @@ -1715,12 +1716,6 @@ (should_be_redirected? on_session_hangup: NULL), -1, state)) { - ply_save_errno (); - ply_terminal_session_free (session); - ply_buffer_free (state->boot_buffer); - state->boot_buffer = NULL; - ply_restore_errno (); - state->is_redirected = false; state->is_attached = false; return false; @@ -1728,7 +1723,6 @@ state->is_redirected = should_be_redirected; state->is_attached = true; - state->session = session; return true; } @@ -2408,9 +2402,6 @@ if (!attach_to_running_session (&state)) { ply_trace ("could not redirect console session: %m"); - if (! no_daemon) - ply_detach_daemon (daemon_handle, EX_UNAVAILABLE); - return EX_UNAVAILABLE; } } debian/patches/series0000664000000000000000000000103412322007243012025 0ustar ubuntu_details.patch details_removeSeparator.patch misc-changes.patch initramfsless-boot.patch vga16fb-renderer.patch lbm-nouveau.patch nouveau-framebuffer.patch ubuntu-logo.patch ubuntu-text.patch avoid-sigpipe.patch tty1-after-boot.patch Fix-missing-prototype-of-ply_get_timestamp.patch Miscellaneous-fixes-for-compiler-warnings.patch autoreconf.patch details-update-status.patch use-upstart-private-socket.patch dont-bail-on-dummy-terms.patch no-print-empty-description.patch ubuntu-logo-scale-factor-2.patch supress-notifications.patch debian/patches/ubuntu_details.patch0000664000000000000000000000225712310333016014665 0ustar Index: trunk/src/plugins/splash/details/plugin.c =================================================================== --- trunk.orig/src/plugins/splash/details/plugin.c +++ trunk/src/plugins/splash/details/plugin.c @@ -359,6 +359,27 @@ } } +/* @shorten_prompt: + * + * Points prompt to the character immediately after the + * last '\n' in prompt + */ +static void shorten_prompt(const char ** prompt) +{ + int last_nl=-1, i=0; + const char * str = *prompt; + for(i=0; str[i] != '\0'; i++) { + if(str[i] == '\n') { + last_nl = i; + } + } + if (last_nl >= 0) { + if((str[last_nl] == '\n') && (last_nl < i)){ + *prompt = &str[last_nl + 1]; + } + } +} + static void display_password (ply_boot_splash_plugin_t *plugin, const char *prompt, @@ -373,10 +394,13 @@ strlen (CLEAR_LINE_SEQUENCE)); plugin->state = PLY_BOOT_SPLASH_DISPLAY_PASSWORD_ENTRY; - if (prompt) + if (prompt) { + if (bullets > 0) + shorten_prompt(&prompt); write_on_views (plugin, prompt, strlen (prompt)); + } else write_on_views (plugin, "Password", debian/plymouth.postinst0000664000000000000000000000146612310333016012655 0ustar #!/bin/sh -e # This script can be called in the following ways: # # After the package was installed: # configure # # # If prerm fails during upgrade or fails on failed upgrade: # abort-upgrade # # If prerm fails during deconfiguration of a package: # abort-deconfigure in-favour # removing # # If prerm fails during replacement due to conflict: # abort-remove in-favour case "$1" in configure) if which update-initramfs >/dev/null 2>&1 then update-initramfs -u fi ;; abort-upgrade|abort-deconfigure|abort-remove) ;; *) echo "$0 called with unknown argument \`$1'" 1>&2 exit 1 ;; esac #DEBHELPER# exit 0 debian/plymouth.plymouth-log.upstart0000664000000000000000000000050612310333016015125 0ustar # plymouth-log - Flush boot log to disk # # plymouth buffers console messages during boot, once the filesystem # is up they should be flushed to the boot log on disk and further # messages written directly to it. description "Flush boot log to disk" start on filesystem task exec /bin/plymouth update-root-fs --read-write debian/compat0000664000000000000000000000000212310333016010356 0ustar 9 debian/plymouth.plymouth-stop.upstart0000664000000000000000000000143412310333016015332 0ustar # plymouth-stop - Hide the splash screen # # This job ensures that only one service stops the plymouth splash screen, # without it there can be a race between gdm starting up and beginning the # proper transition procedure and rc2 ending and quitting plymouth resulting # in it doing a VT switch. start on (starting gdm or starting kdm or starting xdm or starting lxdm or starting lightdm or starting uxlaunch or starting ubiquity or starting oem-config or stopped rc RUNLEVEL=[2345] or starting rcS or starting mountall-shell) stop on stopped plymouth pre-start script case "$JOB" in gdm|lightdm|ubiquity|oem-config) exit 0 ;; *) exec /bin/plymouth quit ;; esac end script debian/plymouth-theme-spinfinity.install0000664000000000000000000000007512310333016015725 0ustar lib/*/plymouth/throbgress.so lib/plymouth/themes/spinfinity/ debian/plymouth-theme-solar.prerm0000664000000000000000000000023512310333016014326 0ustar #!/bin/sh set -e if [ "x$1" = xremove ]; then update-alternatives \ --remove default.plymouth /lib/plymouth/themes/solar/solar.plymouth fi #DEBHELPER# debian/plymouth.postrm0000664000000000000000000000205612310333016012312 0ustar #!/bin/sh -e # This script can be called in the following ways: # # After the package was removed: # remove # # After the package was purged: # purge # # After the package was upgraded: # upgrade # if that fails: # failed-upgrade # # # After all of the packages files have been replaced: # disappear # # # If preinst fails during install: # abort-install # # If preinst fails during upgrade of removed package: # abort-install # # If preinst fails during upgrade: # abort-upgrade case "$1" in remove) rmdir /lib/plymouth/themes || : rmdir /lib/plymouth || : if which update-initramfs >/dev/null 2>&1 then update-initramfs -u fi ;; purge) ;; upgrade|failed-upgrade|disappear) ;; abort-install|abort-upgrade) ;; *) echo "$0 called with unknown argument \`$1'" 1>&2 exit 1 ;; esac #DEBHELPER# exit 0 debian/plymouth-theme-ubuntu-text.install0000664000000000000000000000007712310333016016037 0ustar lib/*/plymouth/ubuntu-text.so lib/plymouth/themes/ubuntu-text/ debian/libplymouth2.symbols0000664000000000000000000004505712310333016013237 0ustar libply.so.2 libplymouth2 #MINVER# ply_array_add_pointer_element@Base 0.8.4 ply_array_add_uint32_element@Base 0.8.4 ply_array_free@Base 0.8.0~ ply_array_get_pointer_elements@Base 0.8.4 ply_array_get_size@Base 0.8.0~ ply_array_get_uint32_elements@Base 0.8.4 ply_array_new@Base 0.8.0~ ply_array_steal_pointer_elements@Base 0.8.4 ply_array_steal_uint32_elements@Base 0.8.4 ply_bitarray_count@Base 0.8.0~ ply_buffer_append_bytes@Base 0.8.0~ ply_buffer_append_from_fd@Base 0.8.0~ ply_buffer_append_with_non_literal_format_string@Base 0.8.0~ ply_buffer_clear@Base 0.8.0~ ply_buffer_free@Base 0.8.0~ ply_buffer_get_bytes@Base 0.8.0~ ply_buffer_get_size@Base 0.8.0~ ply_buffer_new@Base 0.8.0~ ply_buffer_remove_bytes@Base 0.8.0~ ply_buffer_remove_bytes_at_end@Base 0.8.0~ ply_buffer_steal_bytes@Base 0.8.0~ ply_character_device_exists@Base 0.8.4 ply_close_all_fds@Base 0.8.0~ ply_close_module@Base 0.8.0~ ply_command_parser_add_command@Base 0.8.0~ ply_command_parser_add_command_alias@Base 0.8.4 ply_command_parser_add_options@Base 0.8.0~ ply_command_parser_free@Base 0.8.0~ ply_command_parser_get_command_option@Base 0.8.0~ ply_command_parser_get_command_options@Base 0.8.0~ ply_command_parser_get_help_string@Base 0.8.0~ ply_command_parser_get_option@Base 0.8.0~ ply_command_parser_get_options@Base 0.8.0~ ply_command_parser_new@Base 0.8.0~ ply_command_parser_parse_arguments@Base 0.8.0~ ply_command_parser_stop_parsing_arguments@Base 0.8.0~ ply_connect_to_unix_socket@Base 0.8.0~ ply_copy_string_array@Base 0.8.0~ ply_create_daemon@Base 0.8.0~ ply_create_directory@Base 0.8.0~ ply_create_file_link@Base 0.8.0~ ply_detach_daemon@Base 0.8.0~ ply_directory_exists@Base 0.8.0~ ply_event_loop_exit@Base 0.8.0~ ply_event_loop_free@Base 0.8.0~ ply_event_loop_get_default@Base 0.8.0~ ply_event_loop_new@Base 0.8.0~ ply_event_loop_process_pending_events@Base 0.8.0~ ply_event_loop_run@Base 0.8.0~ ply_event_loop_stop_watching_fd@Base 0.8.0~ ply_event_loop_stop_watching_for_exit@Base 0.8.0~ ply_event_loop_stop_watching_for_timeout@Base 0.8.0~ ply_event_loop_stop_watching_signal@Base 0.8.0~ ply_event_loop_watch_fd@Base 0.8.0~ ply_event_loop_watch_for_exit@Base 0.8.0~ ply_event_loop_watch_for_timeout@Base 0.8.0~ ply_event_loop_watch_signal@Base 0.8.0~ ply_fd_can_take_data@Base 0.8.0~ ply_fd_has_data@Base 0.8.0~ ply_fd_may_block@Base 0.8.0~ ply_file_exists@Base 0.8.0~ ply_free_string_array@Base 0.8.0~ ply_get_credentials_from_fd@Base 0.8.0~ ply_get_process_command_line@Base 0.8.4 ply_get_process_parent_pid@Base 0.8.4 ply_get_timestamp@Base 0.8.0~ ply_hashtable_direct_compare@Base 0.8.0~ ply_hashtable_direct_hash@Base 0.8.0~ ply_hashtable_foreach@Base 0.8.0~ ply_hashtable_free@Base 0.8.0~ ply_hashtable_insert@Base 0.8.0~ ply_hashtable_lookup@Base 0.8.0~ ply_hashtable_lookup_full@Base 0.8.0~ ply_hashtable_new@Base 0.8.0~ ply_hashtable_remove@Base 0.8.0~ ply_hashtable_resize@Base 0.8.0~ ply_hashtable_string_compare@Base 0.8.0~ ply_hashtable_string_hash@Base 0.8.0~ ply_key_file_foreach_entry@Base 0.8.3 ply_key_file_free@Base 0.8.0~ ply_key_file_get_value@Base 0.8.0~ ply_key_file_has_key@Base 0.8.0~ ply_key_file_load@Base 0.8.0~ ply_key_file_new@Base 0.8.0~ ply_list_append_data@Base 0.8.0~ ply_list_find_node@Base 0.8.0~ ply_list_free@Base 0.8.0~ ply_list_get_first_node@Base 0.8.0~ ply_list_get_last_node@Base 0.8.0~ ply_list_get_length@Base 0.8.0~ ply_list_get_next_node@Base 0.8.0~ ply_list_get_nth_node@Base 0.8.0~ ply_list_insert_data@Base 0.8.0~ ply_list_new@Base 0.8.0~ ply_list_node_get_data@Base 0.8.0~ ply_list_prepend_data@Base 0.8.0~ ply_list_remove_all_nodes@Base 0.8.0~ ply_list_remove_data@Base 0.8.0~ ply_list_remove_node@Base 0.8.0~ ply_list_sort@Base 0.8.0~ ply_list_sort_stable@Base 0.8.0~ ply_listen_to_unix_socket@Base 0.8.0~ ply_logger_add_filter@Base 0.8.0~ ply_logger_close_file@Base 0.8.0~ ply_logger_flush@Base 0.8.0~ ply_logger_free@Base 0.8.0~ ply_logger_get_default@Base 0.8.0~ ply_logger_get_error_default@Base 0.8.0~ ply_logger_get_flush_policy@Base 0.8.0~ ply_logger_get_output_fd@Base 0.8.0~ ply_logger_inject_bytes@Base 0.8.0~ ply_logger_inject_with_non_literal_format_string@Base 0.8.0~ ply_logger_is_logging@Base 0.8.0~ ply_logger_is_tracing_enabled@Base 0.8.0~ ply_logger_new@Base 0.8.0~ ply_logger_open_file@Base 0.8.0~ ply_logger_set_flush_policy@Base 0.8.0~ ply_logger_set_output_fd@Base 0.8.0~ ply_logger_toggle_logging@Base 0.8.0~ ply_logger_toggle_tracing@Base 0.8.0~ ply_module_look_up_function@Base 0.8.0~ ply_open_built_in_module@Base 0.8.4 ply_open_module@Base 0.8.0~ ply_open_unidirectional_pipe@Base 0.8.0~ ply_progress_free@Base 0.8.0~ ply_progress_get_percentage@Base 0.8.0~ ply_progress_get_time@Base 0.8.0~ ply_progress_load_cache@Base 0.8.0~ ply_progress_new@Base 0.8.0~ ply_progress_pause@Base 0.8.0~ ply_progress_save_cache@Base 0.8.0~ ply_progress_set_percentage@Base 0.8.0~ ply_progress_status_update@Base 0.8.0~ ply_progress_unpause@Base 0.8.0~ ply_read@Base 0.8.0~ ply_read_uint32@Base 0.8.0~ ply_rectangle_contains_point@Base 0.8.0~ ply_rectangle_find_overlap@Base 0.8.0~ ply_rectangle_intersect@Base 0.8.0~ ply_rectangle_is_empty@Base 0.8.0~ ply_region_add_rectangle@Base 0.8.0~ ply_region_clear@Base 0.8.0~ ply_region_free@Base 0.8.0~ ply_region_get_rectangle_list@Base 0.8.0~ ply_region_get_sorted_rectangle_list@Base 0.8.0~ ply_region_new@Base 0.8.0~ ply_restore_errno@Base 0.8.0~ ply_save_errno@Base 0.8.0~ ply_show_new_kernel_messages@Base 0.8.0~ ply_string_has_prefix@Base 0.8.0~ ply_terminal_session_attach@Base 0.8.0~ ply_terminal_session_attach_to_event_loop@Base 0.8.0~ ply_terminal_session_close_log@Base 0.8.0~ ply_terminal_session_detach@Base 0.8.0~ ply_terminal_session_free@Base 0.8.0~ ply_terminal_session_get_fd@Base 0.8.0~ ply_terminal_session_new@Base 0.8.0~ ply_terminal_session_open_log@Base 0.8.0~ ply_terminal_session_run@Base 0.8.0~ ply_trigger_add_handler@Base 0.8.0~ ply_trigger_free@Base 0.8.0~ ply_trigger_ignore_next_pull@Base 0.8.0~ ply_trigger_new@Base 0.8.0~ ply_trigger_pull@Base 0.8.0~ ply_trigger_remove_handler@Base 0.8.0~ ply_utf8_character_get_size@Base 0.8.0~ ply_utf8_string_get_length@Base 0.8.0~ ply_write@Base 0.8.0~ ply_write_uint32@Base 0.8.0~ libply-boot-client.so.2 libplymouth2 #MINVER# ply_boot_client_ask_daemon_for_cached_passwords@Base 0.8.0~-13~ppa1 ply_boot_client_ask_daemon_for_password@Base 0.8.0~-13~ppa1 ply_boot_client_ask_daemon_has_active_vt@Base 0.8.0~-13~ppa1 ply_boot_client_ask_daemon_question@Base 0.8.0~-13~ppa1 ply_boot_client_ask_daemon_to_ignore_keystroke@Base 0.8.0~-13~ppa1 ply_boot_client_ask_daemon_to_watch_for_keystroke@Base 0.8.0~-13~ppa1 ply_boot_client_attach_to_event_loop@Base 0.8.0~-13~ppa1 ply_boot_client_change_mode@Base 0.8.8-0ubuntu1 ply_boot_client_connect@Base 0.8.0~-13~ppa1 ply_boot_client_disconnect@Base 0.8.0~-13~ppa1 ply_boot_client_flush@Base 0.8.1-3 ply_boot_client_free@Base 0.8.0~-13~ppa1 ply_boot_client_new@Base 0.8.0~-13~ppa1 ply_boot_client_ping_daemon@Base 0.8.0~-13~ppa1 ply_boot_client_system_update@Base 0.8.8-0ubuntu1 ply_boot_client_tell_daemon_about_error@Base 0.8.0~-13~ppa1 ply_boot_client_tell_daemon_system_is_initialized@Base 0.8.0~-13~ppa1 ply_boot_client_tell_daemon_to_change_root@Base 0.8.0~-13~ppa1 ply_boot_client_tell_daemon_to_deactivate@Base 0.8.0~-13~ppa1 ply_boot_client_tell_daemon_to_display_message@Base 0.8.0~-13~ppa1 ply_boot_client_tell_daemon_to_hide_message@Base 0.8.4 ply_boot_client_tell_daemon_to_hide_splash@Base 0.8.0~-13~ppa1 ply_boot_client_tell_daemon_to_progress_pause@Base 0.8.0~-13~ppa1 ply_boot_client_tell_daemon_to_progress_unpause@Base 0.8.0~-13~ppa1 ply_boot_client_tell_daemon_to_quit@Base 0.8.0~-13~ppa1 ply_boot_client_tell_daemon_to_reactivate@Base 0.8.0~-13~ppa1 ply_boot_client_tell_daemon_to_show_splash@Base 0.8.0~-13~ppa1 ply_boot_client_update_daemon@Base 0.8.0~-13~ppa1 libply-splash-core.so.2 libplymouth2 #MINVER# ply_boot_splash_add_pixel_display@Base 0.8.0~-13~ppa1 ply_boot_splash_add_text_display@Base 0.8.0~-13~ppa1 ply_boot_splash_attach_progress@Base 0.8.0~-13~ppa1 ply_boot_splash_attach_to_event_loop@Base 0.8.0~-13~ppa1 ply_boot_splash_become_idle@Base 0.8.0~-13~ppa1 ply_boot_splash_display_message@Base 0.8.0~-13~ppa1 ply_boot_splash_display_normal@Base 0.8.0~-13~ppa1 ply_boot_splash_display_password@Base 0.8.0~-13~ppa1 ply_boot_splash_display_question@Base 0.8.0~-13~ppa1 ply_boot_splash_free@Base 0.8.0~-13~ppa1 ply_boot_splash_hide@Base 0.8.0~-13~ppa1 ply_boot_splash_hide_message@Base 0.8.4 ply_boot_splash_load@Base 0.8.0~-13~ppa1 ply_boot_splash_load_built_in@Base 0.8.4 ply_boot_splash_new@Base 0.8.0~-13~ppa1 ply_boot_splash_remove_pixel_display@Base 0.8.0~-13~ppa1 ply_boot_splash_remove_text_display@Base 0.8.0~-13~ppa1 ply_boot_splash_root_mounted@Base 0.8.0~-13~ppa1 ply_boot_splash_set_keyboard@Base 0.8.0~-13~ppa1 ply_boot_splash_show@Base 0.8.0~-13~ppa1 ply_boot_splash_system_update@Base 0.8.8-0ubuntu1 ply_boot_splash_unload@Base 0.8.0~-13~ppa1 ply_boot_splash_unset_keyboard@Base 0.8.0~-13~ppa1 ply_boot_splash_update_output@Base 0.8.0~-13~ppa1 ply_boot_splash_update_status@Base 0.8.0~-13~ppa1 ply_keyboard_add_backspace_handler@Base 0.8.0~-13~ppa1 ply_keyboard_add_enter_handler@Base 0.8.0~-13~ppa1 ply_keyboard_add_escape_handler@Base 0.8.0~-13~ppa1 ply_keyboard_add_input_handler@Base 0.8.0~-13~ppa1 ply_keyboard_free@Base 0.8.0~-13~ppa1 ply_keyboard_new_for_renderer@Base 0.8.0~-13~ppa1 ply_keyboard_new_for_terminal@Base 0.8.0~-13~ppa1 ply_keyboard_remove_backspace_handler@Base 0.8.0~-13~ppa1 ply_keyboard_remove_enter_handler@Base 0.8.0~-13~ppa1 ply_keyboard_remove_escape_handler@Base 0.8.0~-13~ppa1 ply_keyboard_remove_input_handler@Base 0.8.0~-13~ppa1 ply_keyboard_stop_watching_for_input@Base 0.8.0~-13~ppa1 ply_keyboard_watch_for_input@Base 0.8.0~-13~ppa1 ply_pixel_buffer_fill_with_argb32_data@Base 0.8.0~-13~ppa1 ply_pixel_buffer_fill_with_argb32_data_at_opacity@Base 0.8.0~-13~ppa1 ply_pixel_buffer_fill_with_argb32_data_at_opacity_with_clip@Base 0.8.0~-13~ppa1 ply_pixel_buffer_fill_with_argb32_data_with_clip@Base 0.8.0~-13~ppa1 ply_pixel_buffer_fill_with_buffer@Base 0.8.3 ply_pixel_buffer_fill_with_buffer_at_opacity@Base 0.8.3 ply_pixel_buffer_fill_with_buffer_at_opacity_with_clip@Base 0.8.3 ply_pixel_buffer_fill_with_buffer_with_clip@Base 0.8.3 ply_pixel_buffer_fill_with_color@Base 0.8.0~-13~ppa1 ply_pixel_buffer_fill_with_gradient@Base 0.8.0~-13~ppa1 ply_pixel_buffer_fill_with_hex_color@Base 0.8.0~-13~ppa1 ply_pixel_buffer_fill_with_hex_color_at_opacity@Base 0.8.0~-13~ppa1 ply_pixel_buffer_free@Base 0.8.0~-13~ppa1 ply_pixel_buffer_get_argb32_data@Base 0.8.0~-13~ppa1 ply_pixel_buffer_get_height@Base 0.8.3 ply_pixel_buffer_get_size@Base 0.8.0~-13~ppa1 ply_pixel_buffer_get_updated_areas@Base 0.8.0~-13~ppa1 ply_pixel_buffer_get_width@Base 0.8.3 ply_pixel_buffer_new@Base 0.8.0~-13~ppa1 ply_pixel_buffer_pop_clip_area@Base 0.8.0~-13~ppa1 ply_pixel_buffer_push_clip_area@Base 0.8.0~-13~ppa1 ply_pixel_buffer_resize@Base 0.8.0~-13~ppa1 ply_pixel_buffer_rotate@Base 0.8.0~-13~ppa1 ply_pixel_display_draw_area@Base 0.8.0~-13~ppa1 ply_pixel_display_free@Base 0.8.0~-13~ppa1 ply_pixel_display_get_bits_per_pixel@Base 0.8.2-1 ply_pixel_display_get_height@Base 0.8.0~-13~ppa1 ply_pixel_display_get_width@Base 0.8.0~-13~ppa1 ply_pixel_display_new@Base 0.8.0~-13~ppa1 ply_pixel_display_pause_updates@Base 0.8.0~-13~ppa1 ply_pixel_display_set_draw_handler@Base 0.8.0~-13~ppa1 ply_pixel_display_unpause_updates@Base 0.8.0~-13~ppa1 ply_renderer_activate@Base 0.8.0~-13~ppa1 ply_renderer_close@Base 0.8.0~-13~ppa1 ply_renderer_close_input_source@Base 0.8.0~-13~ppa1 ply_renderer_deactivate@Base 0.8.0~-13~ppa1 ply_renderer_flush_head@Base 0.8.0~-13~ppa1 ply_renderer_free@Base 0.8.0~-13~ppa1 ply_renderer_get_bits_per_pixel_for_head@Base 0.8.2-1 ply_renderer_get_buffer_for_head@Base 0.8.0~-13~ppa1 ply_renderer_get_heads@Base 0.8.0~-13~ppa1 ply_renderer_get_input_source@Base 0.8.0~-13~ppa1 ply_renderer_new@Base 0.8.0~-13~ppa1 ply_renderer_open@Base 0.8.0~-13~ppa1 ply_renderer_open_input_source@Base 0.8.0~-13~ppa1 ply_renderer_set_handler_for_input_source@Base 0.8.0~-13~ppa1 ply_terminal_activate_vt@Base 0.8.0~-13~ppa1 ply_terminal_close@Base 0.8.0~-13~ppa1 ply_terminal_deactivate_vt@Base 0.8.0~-18 ply_terminal_free@Base 0.8.0~-13~ppa1 ply_terminal_get_color_hex_value@Base 0.8.0~-13~ppa1 ply_terminal_get_fd@Base 0.8.0~-13~ppa1 ply_terminal_get_number_of_columns@Base 0.8.0~-13~ppa1 ply_terminal_get_number_of_rows@Base 0.8.0~-13~ppa1 ply_terminal_get_vt_number@Base 0.8.0~-13~ppa1 ply_terminal_handle_vt_handoff@Base 0.8.2-2ubuntu29 ply_terminal_ignore_mode_changes@Base 0.8.0~-13~ppa1 ply_terminal_is_active@Base 0.8.0~-13~ppa1 ply_terminal_is_open@Base 0.8.0~-13~ppa1 ply_terminal_is_vt@Base 0.8.0~-13~ppa1 ply_terminal_new@Base 0.8.0~-13~ppa1 ply_terminal_open@Base 0.8.0~-13~ppa1 ply_terminal_reset_colors@Base 0.8.0~-13~ppa1 ply_terminal_set_buffered_input@Base 0.8.0~-13~ppa1 ply_terminal_set_color_hex_value@Base 0.8.0~-13~ppa1 ply_terminal_set_mode@Base 0.8.0~-13~ppa1 ply_terminal_set_unbuffered_input@Base 0.8.0~-13~ppa1 ply_terminal_stop_watching_for_active_vt_change@Base 0.8.0~-18 ply_terminal_stop_watching_for_input@Base 0.8.4 ply_terminal_stop_watching_for_vt_changes@Base 0.8.0~-13~ppa1 ply_terminal_supports_color@Base 0.8.0~-13~ppa1 ply_terminal_watch_for_active_vt_change@Base 0.8.0~-18 ply_terminal_watch_for_input@Base 0.8.4 ply_terminal_watch_for_vt_changes@Base 0.8.0~-13~ppa1 ply_terminal_write@Base 0.8.0~-13~ppa1 ply_text_display_attach_to_event_loop@Base 0.8.0~-13~ppa1 ply_text_display_clear_line@Base 0.8.0~-13~ppa1 ply_text_display_clear_screen@Base 0.8.0~-13~ppa1 ply_text_display_draw_area@Base 0.8.0~-13~ppa1 ply_text_display_free@Base 0.8.0~-13~ppa1 ply_text_display_get_background_color@Base 0.8.0~-13~ppa1 ply_text_display_get_foreground_color@Base 0.8.0~-13~ppa1 ply_text_display_get_number_of_columns@Base 0.8.0~-13~ppa1 ply_text_display_get_number_of_rows@Base 0.8.0~-13~ppa1 ply_text_display_get_terminal@Base 0.8.0~-13~ppa1 ply_text_display_hide_cursor@Base 0.8.0~-13~ppa1 ply_text_display_new@Base 0.8.0~-13~ppa1 ply_text_display_pause_updates@Base 0.8.0~-13~ppa1 ply_text_display_remove_character@Base 0.8.0~-13~ppa1 ply_text_display_set_background_color@Base 0.8.0~-13~ppa1 ply_text_display_set_cursor_position@Base 0.8.0~-13~ppa1 ply_text_display_set_draw_handler@Base 0.8.0~-13~ppa1 ply_text_display_set_foreground_color@Base 0.8.0~-13~ppa1 ply_text_display_show_cursor@Base 0.8.0~-13~ppa1 ply_text_display_supports_color@Base 0.8.0~-13~ppa1 ply_text_display_unpause_updates@Base 0.8.0~-13~ppa1 ply_text_display_write@Base 0.8.0~-13~ppa1 ply_text_progress_bar_draw@Base 0.8.0~-13~ppa1 ply_text_progress_bar_free@Base 0.8.0~-13~ppa1 ply_text_progress_bar_get_number_of_columns@Base 0.8.0~-13~ppa1 ply_text_progress_bar_get_number_of_rows@Base 0.8.0~-13~ppa1 ply_text_progress_bar_get_percent_done@Base 0.8.0~-13~ppa1 ply_text_progress_bar_hide@Base 0.8.0~-13~ppa1 ply_text_progress_bar_new@Base 0.8.0~-13~ppa1 ply_text_progress_bar_set_percent_done@Base 0.8.0~-13~ppa1 ply_text_progress_bar_show@Base 0.8.0~-13~ppa1 libply-splash-graphics.so.2 libplymouth2 #MINVER# ply_animation_draw_area@Base 0.8.0~-13~ppa1 ply_animation_free@Base 0.8.0~-13~ppa1 ply_animation_get_height@Base 0.8.0~-13~ppa1 ply_animation_get_width@Base 0.8.0~-13~ppa1 ply_animation_is_stopped@Base 0.8.0~-13~ppa1 ply_animation_load@Base 0.8.0~-13~ppa1 ply_animation_new@Base 0.8.0~-13~ppa1 ply_animation_start@Base 0.8.0~-13~ppa1 ply_animation_stop@Base 0.8.0~-13~ppa1 ply_entry_add_bullet@Base 0.8.0~-13~ppa1 ply_entry_draw_area@Base 0.8.0~-13~ppa1 ply_entry_free@Base 0.8.0~-13~ppa1 ply_entry_get_bullet_count@Base 0.8.0~-13~ppa1 ply_entry_get_height@Base 0.8.0~-13~ppa1 ply_entry_get_width@Base 0.8.0~-13~ppa1 ply_entry_hide@Base 0.8.0~-13~ppa1 ply_entry_is_hidden@Base 0.8.0~-13~ppa1 ply_entry_load@Base 0.8.0~-13~ppa1 ply_entry_new@Base 0.8.0~-13~ppa1 ply_entry_remove_all_bullets@Base 0.8.0~-13~ppa1 ply_entry_remove_bullet@Base 0.8.0~-13~ppa1 ply_entry_set_bullet_count@Base 0.8.0~-13~ppa1 ply_entry_set_text@Base 0.8.0~-13~ppa1 ply_entry_set_text_color@Base 0.8.3 ply_entry_show@Base 0.8.0~-13~ppa1 ply_image_convert_to_pixel_buffer@Base 0.8.0~-13~ppa1 ply_image_free@Base 0.8.0~-13~ppa1 ply_image_get_buffer@Base 0.8.3 ply_image_get_data@Base 0.8.0~-13~ppa1 ply_image_get_height@Base 0.8.0~-13~ppa1 ply_image_get_width@Base 0.8.0~-13~ppa1 ply_image_load@Base 0.8.0~-13~ppa1 ply_image_new@Base 0.8.0~-13~ppa1 ply_image_resize@Base 0.8.0~-13~ppa1 ply_image_rotate@Base 0.8.0~-13~ppa1 ply_label_draw@Base 0.8.0~-13~ppa1 ply_label_draw_area@Base 0.8.0~-13~ppa1 ply_label_free@Base 0.8.0~-13~ppa1 ply_label_get_height@Base 0.8.0~-13~ppa1 ply_label_get_width@Base 0.8.0~-13~ppa1 ply_label_hide@Base 0.8.0~-13~ppa1 ply_label_is_hidden@Base 0.8.0~-13~ppa1 ply_label_new@Base 0.8.0~-13~ppa1 ply_label_set_alignment@Base 0.8.8-0ubuntu1 ply_label_set_color@Base 0.8.0~-13~ppa1 ply_label_set_font@Base 0.8.4 ply_label_set_text@Base 0.8.0~-13~ppa1 ply_label_set_width@Base 0.8.8-0ubuntu1 ply_label_show@Base 0.8.0~-13~ppa1 ply_progress_animation_draw@Base 0.8.0~-13~ppa1 ply_progress_animation_draw_area@Base 0.8.0~-13~ppa1 ply_progress_animation_free@Base 0.8.0~-13~ppa1 ply_progress_animation_get_height@Base 0.8.0~-13~ppa1 ply_progress_animation_get_percent_done@Base 0.8.0~-13~ppa1 ply_progress_animation_get_width@Base 0.8.0~-13~ppa1 ply_progress_animation_hide@Base 0.8.0~-13~ppa1 ply_progress_animation_is_hidden@Base 0.8.0~-13~ppa1 ply_progress_animation_load@Base 0.8.0~-13~ppa1 ply_progress_animation_new@Base 0.8.0~-13~ppa1 ply_progress_animation_set_percent_done@Base 0.8.0~-13~ppa1 ply_progress_animation_set_transition@Base 0.8.0~-13~ppa1 ply_progress_animation_show@Base 0.8.0~-13~ppa1 ply_progress_bar_draw@Base 0.8.0~-13~ppa1 ply_progress_bar_draw_area@Base 0.8.0~-13~ppa1 ply_progress_bar_free@Base 0.8.0~-13~ppa1 ply_progress_bar_get_height@Base 0.8.0~-13~ppa1 ply_progress_bar_get_percent_done@Base 0.8.0~-13~ppa1 ply_progress_bar_get_width@Base 0.8.0~-13~ppa1 ply_progress_bar_hide@Base 0.8.0~-13~ppa1 ply_progress_bar_is_hidden@Base 0.8.0~-13~ppa1 ply_progress_bar_new@Base 0.8.0~-13~ppa1 ply_progress_bar_set_percent_done@Base 0.8.0~-13~ppa1 ply_progress_bar_show@Base 0.8.0~-13~ppa1 ply_throbber_draw_area@Base 0.8.0~-13~ppa1 ply_throbber_free@Base 0.8.0~-13~ppa1 ply_throbber_get_height@Base 0.8.0~-13~ppa1 ply_throbber_get_width@Base 0.8.0~-13~ppa1 ply_throbber_is_stopped@Base 0.8.0~-13~ppa1 ply_throbber_load@Base 0.8.0~-13~ppa1 ply_throbber_new@Base 0.8.0~-13~ppa1 ply_throbber_start@Base 0.8.0~-13~ppa1 ply_throbber_stop@Base 0.8.0~-13~ppa1 themes/ubuntu-logo/password_field.png0000664000000000000000000000206612310333016015222 0ustar PNG  IHDR .2]L$tEXtSoftwareAdobe ImageReadyqe<IDATxOhUl6K󇤡I5 EzPP^x=@x#()˔\";n@09Pp`z===]Qn,l0L$*zdzb GhF_BӒi˹Ԇ$08grƱK>@eY}}^iO4%$&1!3תhSvUXR|ϣp+Oչzw]upd#h]ｻO;QTƣ,o4t~|歓׿"56Jrib[̽s'}dRT%Yng4r` 50F,l(2XoKAX.`QTt=iȝht^XƒC~{Ȅ">Ĝ`i}}P.lx:0 wt#6_/ ˏvj^n4QM+&YF`.IK_y.]:dOnȦ\( HOU=GVk'6>g9⻾u^ijQtvO|#tYQ3%c" %, Sܦ0hɴ~} PD($j*!sIzz6JP`#sB1|?sHH?   X6NeE]oQg}arp´bKGDH pHYs  tIME!D^E HIDATXر A:.@R `>B;%cu;v?Sv);C٢o_IENDB`themes/ubuntu-logo/progress_dot_off.png0000664000000000000000000000064512310333016015562 0ustar PNG  IHDRtEXtSoftwareAdobe ImageReadyqe<GIDATxڔQ0 -o8d&DPpFPlPT pv ''Yep7FzP19(*S*F0>k:b7x'Fm06[BsSVUN qǏivl>ھDֶ7R۸x5xA".J OPvCZؤeYtKòq/5c1?1#$$NQzϠܨL\p7(PDUzl@rJoz EDϊzω_oԯ)U'IENDB`themes/ubuntu-logo/progress_dot_off16.png0000664000000000000000000000026012310333016015722 0ustar PNG  IHDR[9sRGB0PLTE+?1 J$>X6NeE]oQg}arp´bKGDH!IDATc`-g~Vqpo CIENDB`themes/ubuntu-logo/progress_dot_on.png0000664000000000000000000000061312310333016015417 0ustar PNG  IHDRtEXtSoftwareAdobe ImageReadyqe<-IDATxڔU 0M|xSZ(b-MYFNd:vMx/A&c&,Z}g·M/2Qč"yv@lO>H:ۣP(LDQg.Ƴ- :.ɃDAM] 9()^Z،HڻU8bcC:O`m"}~bpDqQ֣W(!(~ 'R$UF6K.o ԣݗkţ$2z 0s&FIENDB`themes/ubuntu-logo/progress_dot_on16.png0000664000000000000000000000025612310333016015571 0ustar PNG  IHDR[9sRGB0PLTE+?1 J$>X6NeE]oQg}arp´bKGDHIDATc`rBU\lBNpBAۋIENDB`themes/ubuntu-logo/ubuntu_logo.png0000664000000000000000000001505312310333016014557 0ustar PNG  IHDR:=nZbKGD pHYs  tIME&RgIDATx]{dEyܻpy+.DP6K| $%PJ)FKURѪ!A ҄Xy14G)&Mb +F"@ŠZ̙9tw7_{N {9=~u7ֵum][ֵum][ֵum][ֵum][bX9*[FYض\&4*mzF1<H-XiSXԨH2FwCL ߊڠ[Fn)0OBm`rHfϋqmR)rB/]\z T\ߝБJ1URpP\ (6( BwfnnlB 8脐EͲİ*hD2 (}܌~V{ !ΑRmmaaSH + C"dIHmOxSpyh=Pi >}+\D*wE_ !F?˶Eed!9 ̼Z$14߱ lQ0 Y1,X,ޤ UL0?ө&X ͫT*}L,u:s`e>WM #C6k2A%% YE%aU*(.BLaJeAk}Kl$ 9dBଵ2{<)a&d//R\`0^y5Izŏ#Z_9d;qL1Q/"Ds$RJdy2*&F9!֗S $0zB,A" C#\m,0xUHcRB@)u~a/Pv5ICr`~0?J]7@d4 )4┋c{ɸcH 1q)>)d<\ Ld?)jH CP\%H.S2f*@0#IƂV*]B>*d:Tϻd?}'Tv]?AȖߍY3*ʙN羒kr<)ۡAg 3o)&ᗁL3ɰVQ8,yKzoI(XRɊ(lhةm_3J=u\Rj;v`<w _UØj_ y 6M@fO:K8~V;WQYcV~ȕcּ2V AXke?zmhpy{,)厼-qI'j,)̺^ڥVzf˼ @ktsx>(N}9R9R3aYI|n&7RLMM=R!D?+HdI<$J a8ޛeY 7ojjvnZ֏) |76^y=y;/*0fQ$cPk}C0e^IX@~3Ex׻Pl6KLqrvn"E2.=RW"뿧jvAY2F_t:i4/}B4Lr*yjjp7,//:G? ueR^$ɞQ8 Ï ֗fYU3:Q y>j^Nc"@sDgit=8參_ AdI^99<PZ+X.REAʭdҚ9t瘊\RywA n۶m-..1&F^DD#B*Jr;+39|,s)WoW? 3eoڪ~f,{!gd˜E,D$!k7xE-T~-ȭt(ϐё@Q򢙙?Fm6ntr|<\cɃR<#dt:Zk* 9($leGA +@`{LFf(|JZj = Kn@bJnewiz1\~/a S(CI]JGPhƘdGcBORc<,qWm nZ{_'i~taaVh#y%d>t(ٶ馃1̈́Y)+ֺO)uZb90Vl.ÞPzM7 1R 1ayl#Y.c-\.KŊ>fiӥOQ.R6KZCnq[W>fc 40x)fQkWhcdPQJմm48q244Ô1I%\>#9m5j@6l㿙 ǡG~,hc=kcx۬x߬O*2Þ_6m91q i>ǭڧ榣l!c5l.N9u8XoxXFzHǑІ1(̡ h$SXe qPVxmI{t>K8ZZ!ec6R"njk"lU.Yu7!f֋{.\mQe} *t>X!%+S0XJ(('KKcK`Yg5tb7* >rQ ?jB8ick;a4 1rτ!]OK0x . /H*6QS6c#&1b.)˪HfFYk ɲ>12-Fl:)l>/@ !c4E#˺ZE02ZVkQGQ3㟐*qZ;oe"ֲ^Z<p+.B>:rܧW䄀l`c5T*!+WuăuZtX{( 7z[/Ͳ'{a^̼ ̓qI)se]"Q3_F|5skZkOvyNČk}]yB/9AÛ4MQ:2:, T6_xSŚ5BHqR#H+Wy,1hQMCrWN/:Wc"x 7hm.Jk}7 O뗍0Ɯhl:iӹZ(̼CQ;Y5 ;)$}zG)y~?Rզy4ͰB)f.a%DÓS W:Zt?K hKeQR#ёC" C99L$T$m۶=7˲;֏dY6Rr (zv^m9n0 _aiMݾ+9jKܥm67dYv1,Z(+fR!f=fDQ|  ^ &x"Ln{xvE0|~$wq|n K)_ӂjz}EwdY,Z+a}y6ui 2$oeem۶\Jy1;|/ʗç0XcEѮq;aB{[=}h&Ǒ] ݳ{xx*HvUI)/D_ 00 ^TsĘNZv#b3Ec#sp$EaiKKKc=ɠiGq hoZXXx^^EמKKKZt̽Kx#ܹȩ#|Ϻt:AsLtMak7 8{voAf'@OkY}va}Z{׈u8?%lK[XX^A]dChg-Z{{ fXqn_o3\Ѥ<lmQlպnsu(f~&cβ축;WHZ텾_*y!o=l}Rk7MӽNg//[wNFq@ 'ic`p mZc4 RWp֚;9bXiYw0ai{x{EA#;%HKR #ތt=;1 Jc0S G=I34(w)XvR ~([PZpslSJǗХ>^lEKFq!Vεā*a @}x#;f)c\ ÿ綿fe8kdzX*fqB/1)#G)R# H}ty{gS2uJ'nYC"1W3qΓ ]ϒOV6ܤ;HO&&ȓaqNT ?"5r.Cz@ PKWeyJeݲsz3ʖt!'˰ܢD&8pgvs'`2al8 S1GvHV XAkO41<)@YFz!0D}sx*}*Dİp-)3v}~YzvvIENDB`themes/ubuntu-logo/ubuntu_logo16.png0000664000000000000000000000457412310333016014734 0ustar PNG  IHDR:@i0PLTE,4 &;.F :N-DW6NcE\rVjonｫ-bKGDH pHYs  tIME-rHIDATXXMk$_տ@]=d1'`ld1 CtȮEĺ ",҆eb9lkɲowf`B bzxުj4o߷8uߜi9(ˏin!|)]ɹ ܆3ӄ'tp1!@jRb /00%6RLEN֞)D33*2hn*h^ 'Yyz/un˩ ]/;&9=ٺxiK/0}{SIgBK%!ZfR2q {vqJaswC=7#3TV-}ad$`ʝAhZC-g͠vJ( %˖+%Fz^eXC"CKi8M:о4G9IMǓh 0X8BՔez{DgZz"`{w16c( (ZnnQ3>d6-2=NUFٓ?_aL{47pf$Ens&((M9#6 =?f~fo^c ](΀-fW _A65u7n &8Fst{s 5֣[Fke{=ݚ=.Y [fhTҺ2XeմG,{ VmaeϿJ'arR`^k~j寇h!0LkGhe;݀v֡)͎ m*҅IB ikC4{՘xPFU/N4% @KRɃbr0*&ZbD+Ў?\C䒴\G =6|~q{y-ɣh; OKe4FؒF(ЈIȊ=;(hxnA(ޱv?/޲G="&dߌAci$q+N`!I`rB2 4db4"Ո[/[{p:9Fؒ(CnEjN(Jnїyf ((iJLhƼRրC۔[REb=p2`q oړ ny@7"C7d݄RE#mks{~#Ov-71嚋L; [LEaY D% ɒ3vt8m d(U | bDs\`I&ozX2QQBA&?sܸ\*$} hEp5G4kE,W B;g-~ۈhьU$uhs^iI2VTRe5 %On ZgC(&wLF%)h'Bh/¥rqmМY7MB0[[|E D/YRP([(xˎq %7iDV[2!:{g#Ǩ+O0"S-@\\zoxG;堎Wߨڜ mڧJyAh@:q : . }R𜵠.zSCJ gڼ H'?Ch>>7Əˌ3@f<+OcC55ӕz3o68^ΛW_yO=:tiXy@:㌻x*c?SJ@kQ]njd ZIW2>^< 囐q٣# «T6]!&=+9}hVP)&Vh1n4>|B*"&S'A >ӹhΥ* <53(D+ΑD.-˭W4 {<[Aѭ/2Nķk=WIENDB`