~ubuntu-branches/ubuntu/lucid/plymouth/lucid-updates
» Revision
1297
: debian/patches/debian-changes
« back to all changes in this revision
Viewing changes to debian/patches/debian-changes
- browse files at revision 1297
- compare with another revision
- download diff
- download tarball
- view history from revision 1297
- Committer: Bazaar Package Importer
- Author(s): Colin Watson
- Date: 2010-04-16 14:23:45 UTC
- mfrom: (1292.1.32 lucid)
- Revision ID: james.westby@ubuntu.com-20100416142345-1tg3kfw41t28rcli
Tags: 0.8.2-2
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.
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.
added
removed
debian/patches/debian-changes
3
3
but it might have accumulated changes from several uploads. Please
4
4
check the changelog to (hopefully) learn more on those changes.
5
5
6
--- plymouth-0.8.2.orig/Makefile.in
7
+++ plymouth-0.8.2/Makefile.in
8
@@ -172,6 +172,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
9
PACKAGE_NAME = @PACKAGE_NAME@
10
PACKAGE_STRING = @PACKAGE_STRING@
11
PACKAGE_TARNAME = @PACKAGE_TARNAME@
12
+PACKAGE_URL = @PACKAGE_URL@
13
PACKAGE_VERSION = @PACKAGE_VERSION@
14
PANGO_CFLAGS = @PANGO_CFLAGS@
15
PANGO_LIBS = @PANGO_LIBS@
16
--- plymouth-0.8.2.orig/config.h.in
17
+++ plymouth-0.8.2/config.h.in
18
@@ -55,6 +55,9 @@
19
/* Define to the one symbol short name of this package. */
20
#undef PACKAGE_TARNAME
21
22
+/* Define to the home page for this package. */
23
+#undef PACKAGE_URL
24
+
25
/* Define to the version of this package. */
26
#undef PACKAGE_VERSION
27
28
--- plymouth-0.8.2.orig/configure.ac
29
+++ plymouth-0.8.2/configure.ac
30
@@ -160,6 +160,9 @@ AC_DEFINE_UNQUOTED(BOOT_TTY, "$BOOT_TTY"
31
AC_ARG_WITH(shutdown-tty, AS_HELP_STRING([--with-shutdown-tty=<tty>],[Default TTY to use in shutdown mode (by default tty63)]),SHUTDOWN_TTY=${withval},SHUTDOWN_TTY=/dev/tty63)
32
AC_DEFINE_UNQUOTED(SHUTDOWN_TTY, "$SHUTDOWN_TTY", [TTY to use in shutdown mode])
33
34
+AC_CHECK_HEADERS([sys/io.h])
35
+AM_CONDITIONAL([BUILD_VGA16FB], [test "x$ac_cv_header_sys_io_h" = xyes])
36
+
37
# Turn on the additional warnings last, so -Werror doesn't affect other tests.
38
39
AC_DEFUN([PLYMOUTH_CC_TRY_FLAG], [
40
@@ -264,9 +267,11 @@ AC_CONFIG_FILES([Makefile
41
src/plugins/renderers/frame-buffer/Makefile
42
src/plugins/renderers/drm/Makefile
43
src/plugins/renderers/x11/Makefile
44
+ src/plugins/renderers/vga16fb/Makefile
45
src/plugins/splash/Makefile
46
src/plugins/splash/throbgress/Makefile
47
src/plugins/splash/fade-throbber/Makefile
48
+ src/plugins/splash/ubuntu-text/Makefile
49
src/plugins/splash/text/Makefile
50
src/plugins/splash/details/Makefile
51
src/plugins/splash/space-flares/Makefile
52
@@ -289,6 +294,8 @@ AC_CONFIG_FILES([Makefile
53
themes/solar/Makefile
54
themes/glow/Makefile
55
themes/script/Makefile
56
+ themes/ubuntu-logo/Makefile
57
+ themes/ubuntu-text/Makefile
58
images/Makefile
59
scripts/plymouth-generate-initrd
60
scripts/plymouth-populate-initrd
61
--- plymouth-0.8.2.orig/aclocal.m4
62
+++ plymouth-0.8.2/aclocal.m4
63
@@ -13,8 +13,8 @@
64
65
m4_ifndef([AC_AUTOCONF_VERSION],
66
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
67
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
68
-[m4_warning([this file was generated for autoconf 2.63.
69
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
70
+[m4_warning([this file was generated for autoconf 2.65.
71
You have another version of autoconf. It may work, but is not guaranteed to.
72
If you have problems, you may need to regenerate the build system entirely.
73
To do so, use the procedure documented by the package, typically `autoreconf'.])])
74
@@ -2460,7 +2460,7 @@ linux*oldld* | linux*aout* | linux*coff*
75
;;
76
77
# This must be Linux ELF.
78
-linux* | k*bsd*-gnu)
79
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
80
version_type=linux
81
need_lib_prefix=no
82
need_version=no
83
@@ -2485,13 +2485,10 @@ linux* | k*bsd*-gnu)
84
# before this can be enabled.
85
hardcode_into_libs=yes
86
87
- # Add ABI-specific directories to the system library path.
88
- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
89
-
90
# Append ld.so.conf contents to the search path
91
if test -f /etc/ld.so.conf; then
92
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;/^$/d' | tr '\n' ' '`
93
- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
94
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
95
fi
96
97
# We used to test for /lib/ld.so.1 and disable shared libraries on
98
@@ -2503,6 +2500,18 @@ linux* | k*bsd*-gnu)
99
dynamic_linker='GNU/Linux ld.so'
100
;;
101
102
+netbsdelf*-gnu)
103
+ version_type=linux
104
+ need_lib_prefix=no
105
+ need_version=no
106
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
107
+ soname_spec='${libname}${release}${shared_ext}$major'
108
+ shlibpath_var=LD_LIBRARY_PATH
109
+ shlibpath_overrides_runpath=no
110
+ hardcode_into_libs=yes
111
+ dynamic_linker='NetBSD ld.elf_so'
112
+ ;;
113
+
114
netbsd*)
115
version_type=sunos
116
need_lib_prefix=no
117
@@ -3090,11 +3099,11 @@ irix5* | irix6* | nonstopux*)
118
;;
119
120
# This must be Linux ELF.
121
-linux* | k*bsd*-gnu)
122
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
123
lt_cv_deplibs_check_method=pass_all
124
;;
125
126
-netbsd*)
127
+netbsd* | netbsdelf*-gnu)
128
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
129
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
130
else
131
@@ -3711,7 +3720,7 @@ m4_if([$1], [CXX], [
132
;;
133
esac
134
;;
135
- linux* | k*bsd*-gnu)
136
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
137
case $cc_basename in
138
KCC*)
139
# KAI C++ Compiler
140
@@ -3775,7 +3784,7 @@ m4_if([$1], [CXX], [
141
;;
142
esac
143
;;
144
- netbsd*)
145
+ netbsd* | netbsdelf*-gnu)
146
;;
147
*qnx* | *nto*)
148
# QNX uses GNU C++, but need to define -shared option too, otherwise
149
@@ -3995,7 +4004,7 @@ m4_if([$1], [CXX], [
150
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
151
;;
152
153
- linux* | k*bsd*-gnu)
154
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
155
case $cc_basename in
156
# old Intel for x86_64 which still supported -KPIC.
157
ecc*)
158
@@ -4200,6 +4209,9 @@ m4_if([$1], [CXX], [
159
cygwin* | mingw* | cegcc*)
160
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
161
;;
162
+ linux* | k*bsd*-gnu)
163
+ _LT_TAGVAR(link_all_deplibs, $1)=no
164
+ ;;
165
*)
166
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
167
;;
168
@@ -4264,6 +4276,9 @@ dnl Note also adjust exclude_expsyms for
169
openbsd*)
170
with_gnu_ld=no
171
;;
172
+ linux* | k*bsd*-gnu)
173
+ _LT_TAGVAR(link_all_deplibs, $1)=no
174
+ ;;
175
esac
176
177
_LT_TAGVAR(ld_shlibs, $1)=yes
178
@@ -4285,6 +4300,7 @@ dnl Note also adjust exclude_expsyms for
179
fi
180
supports_anon_versioning=no
181
case `$LD -v 2>&1` in
182
+ *GNU\ gold*) supports_anon_versioning=yes ;;
183
*\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
184
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
185
*\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
186
@@ -4376,7 +4392,7 @@ _LT_EOF
187
_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
188
;;
189
190
- gnu* | linux* | tpf* | k*bsd*-gnu)
191
+ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
192
tmp_diet=no
193
if test "$host_os" = linux-dietlibc; then
194
case $cc_basename in
195
@@ -4446,7 +4462,7 @@ _LT_EOF
196
fi
197
;;
198
199
- netbsd*)
200
+ netbsd* | netbsdelf*-gnu)
201
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
202
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
203
wlarc=
204
@@ -4621,6 +4637,7 @@ _LT_EOF
205
if test "$aix_use_runtimelinking" = yes; then
206
shared_flag="$shared_flag "'${wl}-G'
207
fi
208
+ _LT_TAGVAR(link_all_deplibs, $1)=no
209
else
210
# not using gcc
211
if test "$host_cpu" = ia64; then
212
@@ -4859,7 +4876,7 @@ _LT_EOF
213
_LT_TAGVAR(link_all_deplibs, $1)=yes
214
;;
215
216
- netbsd*)
217
+ netbsd* | netbsdelf*-gnu)
218
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
219
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
220
else
221
@@ -5855,7 +5872,7 @@ if test "$_lt_caught_CXX_error" != yes;
222
_LT_TAGVAR(inherit_rpath, $1)=yes
223
;;
224
225
- linux* | k*bsd*-gnu)
226
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
227
case $cc_basename in
228
KCC*)
229
# Kuck and Associates, Inc. (KAI) C++ Compiler
230
@@ -7862,15 +7879,15 @@ m4_define([lt_dict_filter],
231
232
# Generated from ltversion.in.
233
234
-# serial 3012 ltversion.m4
235
+# serial 3017 ltversion.m4
236
# This file is part of GNU Libtool
237
238
-m4_define([LT_PACKAGE_VERSION], [2.2.6])
239
-m4_define([LT_PACKAGE_REVISION], [1.3012])
240
+m4_define([LT_PACKAGE_VERSION], [2.2.6b])
241
+m4_define([LT_PACKAGE_REVISION], [1.3017])
242
243
AC_DEFUN([LTVERSION_VERSION],
244
-[macro_version='2.2.6'
245
-macro_revision='1.3012'
246
+[macro_version='2.2.6b'
247
+macro_revision='1.3017'
248
_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
249
_LT_DECL(, macro_revision, 0)
250
])
251
@@ -8036,14 +8053,16 @@ fi])
252
# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
253
# ---------------------------------------------
254
m4_define([_PKG_CONFIG],
255
-[if test -n "$$1"; then
256
- pkg_cv_[]$1="$$1"
257
- elif test -n "$PKG_CONFIG"; then
258
- PKG_CHECK_EXISTS([$3],
259
- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
260
- [pkg_failed=yes])
261
- else
262
- pkg_failed=untried
263
+[if test -n "$PKG_CONFIG"; then
264
+ if test -n "$$1"; then
265
+ pkg_cv_[]$1="$$1"
266
+ else
267
+ PKG_CHECK_EXISTS([$3],
268
+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
269
+ [pkg_failed=yes])
270
+ fi
271
+else
272
+ pkg_failed=untried
273
fi[]dnl
274
])# _PKG_CONFIG
275
276
@@ -8087,9 +8106,9 @@ See the pkg-config man page for more det
277
if test $pkg_failed = yes; then
278
_PKG_SHORT_ERRORS_SUPPORTED
279
if test $_pkg_short_errors_supported = yes; then
280
- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
281
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
282
else
283
- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
284
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
285
fi
286
# Put the nasty error message in config.log where it belongs
287
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
288
--- plymouth-0.8.2.orig/INSTALL
289
+++ plymouth-0.8.2/INSTALL
290
@@ -1,91 +1,365 @@
291
-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.
292
+Installation Instructions
293
+*************************
294
295
-Unfortunately, there isn't great documentation for distributors. In the mean time, this email exchange might be useful:
296
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
297
+2006, 2007, 2008, 2009 Free Software Foundation, Inc.
298
299
-Hi,
300
+ Copying and distribution of this file, with or without modification,
301
+are permitted in any medium without royalty provided the copyright
302
+notice and this notice are preserved. This file is offered as-is,
303
+without warranty of any kind.
304
+
305
+Basic Installation
306
+==================
307
+
308
+ Briefly, the shell commands `./configure; make; make install' should
309
+configure, build, and install this package. The following
310
+more-detailed instructions are generic; see the `README' file for
311
+instructions specific to this package. Some packages provide this
312
+`INSTALL' file but do not implement all of the features documented
313
+below. The lack of an optional feature in a given package is not
314
+necessarily a bug. More recommendations for GNU packages can be found
315
+in *note Makefile Conventions: (standards)Makefile Conventions.
316
+
317
+ The `configure' shell script attempts to guess correct values for
318
+various system-dependent variables used during compilation. It uses
319
+those values to create a `Makefile' in each directory of the package.
320
+It may also create one or more `.h' files containing system-dependent
321
+definitions. Finally, it creates a shell script `config.status' that
322
+you can run in the future to recreate the current configuration, and a
323
+file `config.log' containing compiler output (useful mainly for
324
+debugging `configure').
325
+
326
+ It can also use an optional file (typically called `config.cache'
327
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
328
+the results of its tests to speed up reconfiguring. Caching is
329
+disabled by default to prevent problems with accidental use of stale
330
+cache files.
331
+
332
+ If you need to do unusual things to compile the package, please try
333
+to figure out how `configure' could check whether to do them, and mail
334
+diffs or instructions to the address given in the `README' so they can
335
+be considered for the next release. If you are using the cache, and at
336
+some point `config.cache' contains results you don't want to keep, you
337
+may remove or edit it.
338
+
339
+ The file `configure.ac' (or `configure.in') is used to create
340
+`configure' by a program called `autoconf'. You need `configure.ac' if
341
+you want to change it or regenerate `configure' using a newer version
342
+of `autoconf'.
343
+
344
+ The simplest way to compile this package is:
345
+
346
+ 1. `cd' to the directory containing the package's source code and type
347
+ `./configure' to configure the package for your system.
348
+
349
+ Running `configure' might take a while. While running, it prints
350
+ some messages telling which features it is checking for.
351
+
352
+ 2. Type `make' to compile the package.
353
+
354
+ 3. Optionally, type `make check' to run any self-tests that come with
355
+ the package, generally using the just-built uninstalled binaries.
356
+
357
+ 4. Type `make install' to install the programs and any data files and
358
+ documentation. When installing into a prefix owned by root, it is
359
+ recommended that the package be configured and built as a regular
360
+ user, and only the `make install' phase executed with root
361
+ privileges.
362
+
363
+ 5. Optionally, type `make installcheck' to repeat any self-tests, but
364
+ this time using the binaries in their final installed location.
365
+ This target does not install anything. Running this target as a
366
+ regular user, particularly if the prior `make install' required
367
+ root privileges, verifies that the installation completed
368
+ correctly.
369
+
370
+ 6. You can remove the program binaries and object files from the
371
+ source code directory by typing `make clean'. To also remove the
372
+ files that `configure' created (so you can compile the package for
373
+ a different kind of computer), type `make distclean'. There is
374
+ also a `make maintainer-clean' target, but that is intended mainly
375
+ for the package's developers. If you use it, you may have to get
376
+ all sorts of other programs in order to regenerate files that came
377
+ with the distribution.
378
+
379
+ 7. Often, you can also type `make uninstall' to remove the installed
380
+ files again. In practice, not all packages have tested that
381
+ uninstallation works correctly, even though it is required by the
382
+ GNU Coding Standards.
383
+
384
+ 8. Some packages, particularly those that use Automake, provide `make
385
+ distcheck', which can by used by developers to test that all other
386
+ targets like `make install' and `make uninstall' work correctly.
387
+ This target is generally not run by end users.
388
+
389
+Compilers and Options
390
+=====================
391
+
392
+ Some systems require unusual options for compilation or linking that
393
+the `configure' script does not know about. Run `./configure --help'
394
+for details on some of the pertinent environment variables.
395
+
396
+ You can give `configure' initial values for configuration parameters
397
+by setting variables in the command line or in the environment. Here
398
+is an example:
399
+
400
+ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
401
+
402
+ *Note Defining Variables::, for more details.
403
+
404
+Compiling For Multiple Architectures
405
+====================================
406
+
407
+ You can compile the package for more than one kind of computer at the
408
+same time, by placing the object files for each architecture in their
409
+own directory. To do this, you can use GNU `make'. `cd' to the
410
+directory where you want the object files and executables to go and run
411
+the `configure' script. `configure' automatically checks for the
412
+source code in the directory that `configure' is in and in `..'. This
413
+is known as a "VPATH" build.
414
+
415
+ With a non-GNU `make', it is safer to compile the package for one
416
+architecture at a time in the source code directory. After you have
417
+installed the package for one architecture, use `make distclean' before
418
+reconfiguring for another architecture.
419
+
420
+ On MacOS X 10.5 and later systems, you can create libraries and
421
+executables that work on multiple system types--known as "fat" or
422
+"universal" binaries--by specifying multiple `-arch' options to the
423
+compiler but only a single `-arch' option to the preprocessor. Like
424
+this:
425
+
426
+ ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
427
+ CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
428
+ CPP="gcc -E" CXXCPP="g++ -E"
429
+
430
+ This is not guaranteed to produce working output in all cases, you
431
+may have to build one architecture at a time and combine the results
432
+using the `lipo' tool if you have problems.
433
+
434
+Installation Names
435
+==================
436
+
437
+ By default, `make install' installs the package's commands under
438
+`/usr/local/bin', include files under `/usr/local/include', etc. You
439
+can specify an installation prefix other than `/usr/local' by giving
440
+`configure' the option `--prefix=PREFIX', where PREFIX must be an
441
+absolute file name.
442
+
443
+ You can specify separate installation prefixes for
444
+architecture-specific files and architecture-independent files. If you
445
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
446
+PREFIX as the prefix for installing programs and libraries.
447
+Documentation and other data files still use the regular prefix.
448
+
449
+ In addition, if you use an unusual directory layout you can give
450
+options like `--bindir=DIR' to specify different values for particular
451
+kinds of files. Run `configure --help' for a list of the directories
452
+you can set and what kinds of files go in them. In general, the
453
+default for these options is expressed in terms of `${prefix}', so that
454
+specifying just `--prefix' will affect all of the other directory
455
+specifications that were not explicitly provided.
456
+
457
+ The most portable way to affect installation locations is to pass the
458
+correct locations to `configure'; however, many packages provide one or
459
+both of the following shortcuts of passing variable assignments to the
460
+`make install' command line to change installation locations without
461
+having to reconfigure or recompile.
462
+
463
+ The first method involves providing an override variable for each
464
+affected directory. For example, `make install
465
+prefix=/alternate/directory' will choose an alternate location for all
466
+directory configuration variables that were expressed in terms of
467
+`${prefix}'. Any directories that were specified during `configure',
468
+but not in terms of `${prefix}', must each be overridden at install
469
+time for the entire installation to be relocated. The approach of
470
+makefile variable overrides for each directory variable is required by
471
+the GNU Coding Standards, and ideally causes no recompilation.
472
+However, some platforms have known limitations with the semantics of
473
+shared libraries that end up requiring recompilation when using this
474
+method, particularly noticeable in packages that use GNU Libtool.
475
+
476
+ The second method involves providing the `DESTDIR' variable. For
477
+example, `make install DESTDIR=/alternate/directory' will prepend
478
+`/alternate/directory' before all installation names. The approach of
479
+`DESTDIR' overrides is not required by the GNU Coding Standards, and
480
+does not work on platforms that have drive letters. On the other hand,
481
+it does better at avoiding recompilation issues, and works well even
482
+when some directory options were not specified in terms of `${prefix}'
483
+at `configure' time.
484
+
485
+Optional Features
486
+=================
487
+
488
+ If the package supports it, you can cause programs to be installed
489
+with an extra prefix or suffix on their names by giving `configure' the
490
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
491
+
492
+ Some packages pay attention to `--enable-FEATURE' options to
493
+`configure', where FEATURE indicates an optional part of the package.
494
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
495
+is something like `gnu-as' or `x' (for the X Window System). The
496
+`README' should mention any `--enable-' and `--with-' options that the
497
+package recognizes.
498
+
499
+ For packages that use the X Window System, `configure' can usually
500
+find the X include and library files automatically, but if it doesn't,
501
+you can use the `configure' options `--x-includes=DIR' and
502
+`--x-libraries=DIR' to specify their locations.
503
+
504
+ Some packages offer the ability to configure how verbose the
505
+execution of `make' will be. For these packages, running `./configure
506
+--enable-silent-rules' sets the default to minimal output, which can be
507
+overridden with `make V=1'; while running `./configure
508
+--disable-silent-rules' sets the default to verbose, which can be
509
+overridden with `make V=0'.
510
+
511
+Particular systems
512
+==================
513
+
514
+ On HP-UX, the default C compiler is not ANSI C compatible. If GNU
515
+CC is not installed, it is recommended to use the following options in
516
+order to use an ANSI C compiler:
517
+
518
+ ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
519
+
520
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
521
+
522
+ On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
523
+parse its `<wchar.h>' header file. The option `-nodtk' can be used as
524
+a workaround. If GNU CC is not installed, it is therefore recommended
525
+to try
526
+
527
+ ./configure CC="cc"
528
+
529
+and if that doesn't work, try
530
+
531
+ ./configure CC="cc -nodtk"
532
+
533
+ On Solaris, don't put `/usr/ucb' early in your `PATH'. This
534
+directory contains several dysfunctional programs; working variants of
535
+these programs are available in `/usr/bin'. So, if you need `/usr/ucb'
536
+in your `PATH', put it _after_ `/usr/bin'.
537
+
538
+ On Haiku, software installed for all users goes in `/boot/common',
539
+not `/usr/local'. It is recommended to use the following options:
540
+
541
+ ./configure --prefix=/boot/common
542
+
543
+Specifying the System Type
544
+==========================
545
+
546
+ There may be some features `configure' cannot figure out
547
+automatically, but needs to determine by the type of machine the package
548
+will run on. Usually, assuming the package is built to be run on the
549
+_same_ architectures, `configure' can figure that out, but if it prints
550
+a message saying it cannot guess the machine type, give it the
551
+`--build=TYPE' option. TYPE can either be a short name for the system
552
+type, such as `sun4', or a canonical name which has the form:
553
+
554
+ CPU-COMPANY-SYSTEM
555
+
556
+where SYSTEM can have one of these forms:
557
+
558
+ OS
559
+ KERNEL-OS
560
+
561
+ See the file `config.sub' for the possible values of each field. If
562
+`config.sub' isn't included in this package, then this package doesn't
563
+need to know the machine type.
564
+
565
+ If you are _building_ compiler tools for cross-compiling, you should
566
+use the option `--target=TYPE' to select the type of system they will
567
+produce code for.
568
+
569
+ If you want to _use_ a cross compiler, that generates code for a
570
+platform different from the build platform, you should specify the
571
+"host" platform (i.e., that on which the generated programs will
572
+eventually be run) with `--host=TYPE'.
573
+
574
+Sharing Defaults
575
+================
576
+
577
+ If you want to set default values for `configure' scripts to share,
578
+you can create a site shell script called `config.site' that gives
579
+default values for variables like `CC', `cache_file', and `prefix'.
580
+`configure' looks for `PREFIX/share/config.site' if it exists, then
581
+`PREFIX/etc/config.site' if it exists. Or, you can set the
582
+`CONFIG_SITE' environment variable to the location of the site script.
583
+A warning: not all `configure' scripts look for a site script.
584
+
585
+Defining Variables
586
+==================
587
+
588
+ Variables not defined in a site shell script can be set in the
589
+environment passed to `configure'. However, some packages may run
590
+configure again during the build, and the customized values of these
591
+variables may be lost. In order to avoid this problem, you should set
592
+them in the `configure' command line, using `VAR=value'. For example:
593
+
594
+ ./configure CC=/usr/local2/bin/gcc
595
+
596
+causes the specified `gcc' to be used as the C compiler (unless it is
597
+overridden in the site shell script).
598
+
599
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
600
+an Autoconf bug. Until the bug is fixed you can use this workaround:
601
+
602
+ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
603
+
604
+`configure' Invocation
605
+======================
606
+
607
+ `configure' recognizes the following options to control how it
608
+operates.
609
+
610
+`--help'
611
+`-h'
612
+ Print a summary of all of the options to `configure', and exit.
613
+
614
+`--help=short'
615
+`--help=recursive'
616
+ Print a summary of the options unique to this package's
617
+ `configure', and exit. The `short' variant lists options used
618
+ only in the top level, while the `recursive' variant lists options
619
+ also present in any nested packages.
620
+
621
+`--version'
622
+`-V'
623
+ Print the version of Autoconf used to generate the `configure'
624
+ script, and exit.
625
+
626
+`--cache-file=FILE'
627
+ Enable the cache: use and save the results of the tests in FILE,
628
+ traditionally `config.cache'. FILE defaults to `/dev/null' to
629
+ disable caching.
630
+
631
+`--config-cache'
632
+`-C'
633
+ Alias for `--cache-file=config.cache'.
634
+
635
+`--quiet'
636
+`--silent'
637
+`-q'
638
+ Do not print messages saying which checks are being made. To
639
+ suppress all normal output, redirect it to `/dev/null' (any error
640
+ messages will still be shown).
641
+
642
+`--srcdir=DIR'
643
+ Look for the package's source code in directory DIR. Usually
644
+ `configure' can determine that directory automatically.
645
+
646
+`--prefix=DIR'
647
+ Use DIR as the installation prefix. *note Installation Names::
648
+ for more details, including other options available for fine-tuning
649
+ the installation locations.
650
+
651
+`--no-create'
652
+`-n'
653
+ Run the configure checks, but stop before creating any output
654
+ files.
655
656
-> I recently found a video showing Fedora booting with plymouth and I
657
-> liked it. So I wanted to use plymouth with my favorite distri (gentoo).
658
-> I know I'm enduser and the info text on freedesktop.org says plymouth
659
-> is not meant to be installed by end users but I want to give it a try.
660
-> I have KMS running and am using my own initramfs anyway (encrypted root
661
-> disk) so how hard can it be? Can anybody please give me some straight
662
-> forward hints on how to use plymouth? (The INSTALL file is empty and
663
-> the README file is boring)
664
+`configure' also accepts some other, not widely useful, options. Run
665
+`configure --help' for more details.
666
667
-So the basic idea is you need to:
668
-
669
-1) build plymouth into the system. On fedora we use these conffigure flags:
670
-
671
-.%configure --enable-tracing --disable-tests --without-boot-entry \
672
- --without-default-plugin \
673
- --with-logo=%{_datadir}/pixmaps/system-logo-white.png \
674
- --with-background-start-color-stop=0x0073B3 \
675
- --with-background-end-color-stop=0x00457E \
676
- --with-background-color=0x3391cd \
677
- --enable-gdm-transition \
678
- --with-system-root-install \
679
- --with-rhgb-compat-link
680
-
681
-%configure is a macro that expands to:
682
-
683
-./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
684
-
685
-(and some other stuff)
686
-
687
-%{_datadir} is just /usr/share
688
-
689
-You probably won't need --with-rhgb-compat-link since that's only
690
-there for compatibility with Fedora's old infrastructure.
691
-
692
---with-system-root-install makes plymouthd and plymouth install
693
-themselves into / instead of /usr. This is important so that the
694
-plymouth client can work in cases where the root fs is mounted, but
695
-/usr isn't yet.
696
-
697
-Somehow you need to hook into your distros mkinitrd mechanism. I
698
-mean you need to copy the plymouth binaries, plugins, and data files
699
-into the initrd everytime you rebuild your initrd. See
700
-plymouth-populate-initrd for how we do it on fedora (mkinitrd calls
701
-plymouth-populate-initrd). I would like to upstream hooks for other
702
-distros mkinitrd systems, so the out of the box experience is easier.
703
-
704
-Inside the initrd, you need to start plymouthd early. The earlier the
705
-better, but not before /sys, /proc/, and /dev/pts are mounted, and
706
-not before /dev/tty[01] and /dev/fb0 are created.
707
-
708
-At some point during the initrd you need to load the kms driver.
709
-After it's loaded the graphics mode should get set up and /dev/fb0
710
-will be functional. That's when you call plymouth --show-splash to
711
-show the splash screen.
712
-
713
-To decrypt your root, run
714
-
715
-lymouth ask-for-password --command="/sbin/cryptsetup luksOpen -T ..."
716
-
717
-where the --command is whatever makes sense for you.
718
-
719
-Right after you mount the root file system (but before you switch to it), run
720
-
721
-plymouth --newroot=/wherevertherootismounted
722
-
723
-This tells plymouth it can load some files off the real filesystem
724
-(like fonts, and stuff we don't want to stick in the initrd).
725
-
726
-while boot you need to run plymouth --update=some-milestone-id
727
-
728
-periodically to update the progress bar.
729
-
730
-When / is mounted read-write you need to run
731
-
732
-plymouth --sysinit
733
-
734
-Finally, when plymouth is done, you need to run plymouth --quit
735
-
736
-I have to run to catch a bus but i think that's the basics.
737
-
738
-> I'm even willing to give something back and convert your hints
739
-> into an easy step by step howto.
740
-That'd be great!
741
-
742
---Ray
743
6
--- plymouth-0.8.2.orig/configure
744
7
+++ plymouth-0.8.2/configure
745
8
@@ -1,20 +1,24 @@
10960
10223
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
10961
10224
fi
10962
10225
10226
--- plymouth-0.8.2.orig/configure.ac
10227
+++ plymouth-0.8.2/configure.ac
10228
@@ -160,6 +160,9 @@ AC_DEFINE_UNQUOTED(BOOT_TTY, "$BOOT_TTY"
10229
AC_ARG_WITH(shutdown-tty, AS_HELP_STRING([--with-shutdown-tty=<tty>],[Default TTY to use in shutdown mode (by default tty63)]),SHUTDOWN_TTY=${withval},SHUTDOWN_TTY=/dev/tty63)
10230
AC_DEFINE_UNQUOTED(SHUTDOWN_TTY, "$SHUTDOWN_TTY", [TTY to use in shutdown mode])
10231
10232
+AC_CHECK_HEADERS([sys/io.h])
10233
+AM_CONDITIONAL([BUILD_VGA16FB], [test "x$ac_cv_header_sys_io_h" = xyes])
10234
+
10235
# Turn on the additional warnings last, so -Werror doesn't affect other tests.
10236
10237
AC_DEFUN([PLYMOUTH_CC_TRY_FLAG], [
10238
@@ -264,9 +267,11 @@ AC_CONFIG_FILES([Makefile
10239
src/plugins/renderers/frame-buffer/Makefile
10240
src/plugins/renderers/drm/Makefile
10241
src/plugins/renderers/x11/Makefile
10242
+ src/plugins/renderers/vga16fb/Makefile
10243
src/plugins/splash/Makefile
10244
src/plugins/splash/throbgress/Makefile
10245
src/plugins/splash/fade-throbber/Makefile
10246
+ src/plugins/splash/ubuntu-text/Makefile
10247
src/plugins/splash/text/Makefile
10248
src/plugins/splash/details/Makefile
10249
src/plugins/splash/space-flares/Makefile
10250
@@ -289,6 +294,8 @@ AC_CONFIG_FILES([Makefile
10251
themes/solar/Makefile
10252
themes/glow/Makefile
10253
themes/script/Makefile
10254
+ themes/ubuntu-logo/Makefile
10255
+ themes/ubuntu-text/Makefile
10256
images/Makefile
10257
scripts/plymouth-generate-initrd
10258
scripts/plymouth-populate-initrd
10259
--- plymouth-0.8.2.orig/config.h.in
10260
+++ plymouth-0.8.2/config.h.in
10261
@@ -55,6 +55,9 @@
10262
/* Define to the one symbol short name of this package. */
10263
#undef PACKAGE_TARNAME
10264
10265
+/* Define to the home page for this package. */
10266
+#undef PACKAGE_URL
10267
+
10268
/* Define to the version of this package. */
10269
#undef PACKAGE_VERSION
10270
10271
--- plymouth-0.8.2.orig/INSTALL
10272
+++ plymouth-0.8.2/INSTALL
10273
@@ -1,91 +1,365 @@
10274
-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.
10275
+Installation Instructions
10276
+*************************
10277
10278
-Unfortunately, there isn't great documentation for distributors. In the mean time, this email exchange might be useful:
10279
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
10280
+2006, 2007, 2008, 2009 Free Software Foundation, Inc.
10281
10282
-Hi,
10283
+ Copying and distribution of this file, with or without modification,
10284
+are permitted in any medium without royalty provided the copyright
10285
+notice and this notice are preserved. This file is offered as-is,
10286
+without warranty of any kind.
10287
+
10288
+Basic Installation
10289
+==================
10290
+
10291
+ Briefly, the shell commands `./configure; make; make install' should
10292
+configure, build, and install this package. The following
10293
+more-detailed instructions are generic; see the `README' file for
10294
+instructions specific to this package. Some packages provide this
10295
+`INSTALL' file but do not implement all of the features documented
10296
+below. The lack of an optional feature in a given package is not
10297
+necessarily a bug. More recommendations for GNU packages can be found
10298
+in *note Makefile Conventions: (standards)Makefile Conventions.
10299
+
10300
+ The `configure' shell script attempts to guess correct values for
10301
+various system-dependent variables used during compilation. It uses
10302
+those values to create a `Makefile' in each directory of the package.
10303
+It may also create one or more `.h' files containing system-dependent
10304
+definitions. Finally, it creates a shell script `config.status' that
10305
+you can run in the future to recreate the current configuration, and a
10306
+file `config.log' containing compiler output (useful mainly for
10307
+debugging `configure').
10308
+
10309
+ It can also use an optional file (typically called `config.cache'
10310
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
10311
+the results of its tests to speed up reconfiguring. Caching is
10312
+disabled by default to prevent problems with accidental use of stale
10313
+cache files.
10314
+
10315
+ If you need to do unusual things to compile the package, please try
10316
+to figure out how `configure' could check whether to do them, and mail
10317
+diffs or instructions to the address given in the `README' so they can
10318
+be considered for the next release. If you are using the cache, and at
10319
+some point `config.cache' contains results you don't want to keep, you
10320
+may remove or edit it.
10321
+
10322
+ The file `configure.ac' (or `configure.in') is used to create
10323
+`configure' by a program called `autoconf'. You need `configure.ac' if
10324
+you want to change it or regenerate `configure' using a newer version
10325
+of `autoconf'.
10326
+
10327
+ The simplest way to compile this package is:
10328
+
10329
+ 1. `cd' to the directory containing the package's source code and type
10330
+ `./configure' to configure the package for your system.
10331
+
10332
+ Running `configure' might take a while. While running, it prints
10333
+ some messages telling which features it is checking for.
10334
+
10335
+ 2. Type `make' to compile the package.
10336
+
10337
+ 3. Optionally, type `make check' to run any self-tests that come with
10338
+ the package, generally using the just-built uninstalled binaries.
10339
+
10340
+ 4. Type `make install' to install the programs and any data files and
10341
+ documentation. When installing into a prefix owned by root, it is
10342
+ recommended that the package be configured and built as a regular
10343
+ user, and only the `make install' phase executed with root
10344
+ privileges.
10345
+
10346
+ 5. Optionally, type `make installcheck' to repeat any self-tests, but
10347
+ this time using the binaries in their final installed location.
10348
+ This target does not install anything. Running this target as a
10349
+ regular user, particularly if the prior `make install' required
10350
+ root privileges, verifies that the installation completed
10351
+ correctly.
10352
+
10353
+ 6. You can remove the program binaries and object files from the
10354
+ source code directory by typing `make clean'. To also remove the
10355
+ files that `configure' created (so you can compile the package for
10356
+ a different kind of computer), type `make distclean'. There is
10357
+ also a `make maintainer-clean' target, but that is intended mainly
10358
+ for the package's developers. If you use it, you may have to get
10359
+ all sorts of other programs in order to regenerate files that came
10360
+ with the distribution.
10361
+
10362
+ 7. Often, you can also type `make uninstall' to remove the installed
10363
+ files again. In practice, not all packages have tested that
10364
+ uninstallation works correctly, even though it is required by the
10365
+ GNU Coding Standards.
10366
+
10367
+ 8. Some packages, particularly those that use Automake, provide `make
10368
+ distcheck', which can by used by developers to test that all other
10369
+ targets like `make install' and `make uninstall' work correctly.
10370
+ This target is generally not run by end users.
10371
+
10372
+Compilers and Options
10373
+=====================
10374
+
10375
+ Some systems require unusual options for compilation or linking that
10376
+the `configure' script does not know about. Run `./configure --help'
10377
+for details on some of the pertinent environment variables.
10378
+
10379
+ You can give `configure' initial values for configuration parameters
10380
+by setting variables in the command line or in the environment. Here
10381
+is an example:
10382
+
10383
+ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
10384
+
10385
+ *Note Defining Variables::, for more details.
10386
+
10387
+Compiling For Multiple Architectures
10388
+====================================
10389
+
10390
+ You can compile the package for more than one kind of computer at the
10391
+same time, by placing the object files for each architecture in their
10392
+own directory. To do this, you can use GNU `make'. `cd' to the
10393
+directory where you want the object files and executables to go and run
10394
+the `configure' script. `configure' automatically checks for the
10395
+source code in the directory that `configure' is in and in `..'. This
10396
+is known as a "VPATH" build.
10397
+
10398
+ With a non-GNU `make', it is safer to compile the package for one
10399
+architecture at a time in the source code directory. After you have
10400
+installed the package for one architecture, use `make distclean' before
10401
+reconfiguring for another architecture.
10402
+
10403
+ On MacOS X 10.5 and later systems, you can create libraries and
10404
+executables that work on multiple system types--known as "fat" or
10405
+"universal" binaries--by specifying multiple `-arch' options to the
10406
+compiler but only a single `-arch' option to the preprocessor. Like
10407
+this:
10408
+
10409
+ ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
10410
+ CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
10411
+ CPP="gcc -E" CXXCPP="g++ -E"
10412
+
10413
+ This is not guaranteed to produce working output in all cases, you
10414
+may have to build one architecture at a time and combine the results
10415
+using the `lipo' tool if you have problems.
10416
+
10417
+Installation Names
10418
+==================
10419
+
10420
+ By default, `make install' installs the package's commands under
10421
+`/usr/local/bin', include files under `/usr/local/include', etc. You
10422
+can specify an installation prefix other than `/usr/local' by giving
10423
+`configure' the option `--prefix=PREFIX', where PREFIX must be an
10424
+absolute file name.
10425
+
10426
+ You can specify separate installation prefixes for
10427
+architecture-specific files and architecture-independent files. If you
10428
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
10429
+PREFIX as the prefix for installing programs and libraries.
10430
+Documentation and other data files still use the regular prefix.
10431
+
10432
+ In addition, if you use an unusual directory layout you can give
10433
+options like `--bindir=DIR' to specify different values for particular
10434
+kinds of files. Run `configure --help' for a list of the directories
10435
+you can set and what kinds of files go in them. In general, the
10436
+default for these options is expressed in terms of `${prefix}', so that
10437
+specifying just `--prefix' will affect all of the other directory
10438
+specifications that were not explicitly provided.
10439
+
10440
+ The most portable way to affect installation locations is to pass the
10441
+correct locations to `configure'; however, many packages provide one or
10442
+both of the following shortcuts of passing variable assignments to the
10443
+`make install' command line to change installation locations without
10444
+having to reconfigure or recompile.
10445
+
10446
+ The first method involves providing an override variable for each
10447
+affected directory. For example, `make install
10448
+prefix=/alternate/directory' will choose an alternate location for all
10449
+directory configuration variables that were expressed in terms of
10450
+`${prefix}'. Any directories that were specified during `configure',
10451
+but not in terms of `${prefix}', must each be overridden at install
10452
+time for the entire installation to be relocated. The approach of
10453
+makefile variable overrides for each directory variable is required by
10454
+the GNU Coding Standards, and ideally causes no recompilation.
10455
+However, some platforms have known limitations with the semantics of
10456
+shared libraries that end up requiring recompilation when using this
10457
+method, particularly noticeable in packages that use GNU Libtool.
10458
+
10459
+ The second method involves providing the `DESTDIR' variable. For
10460
+example, `make install DESTDIR=/alternate/directory' will prepend
10461
+`/alternate/directory' before all installation names. The approach of
10462
+`DESTDIR' overrides is not required by the GNU Coding Standards, and
10463
+does not work on platforms that have drive letters. On the other hand,
10464
+it does better at avoiding recompilation issues, and works well even
10465
+when some directory options were not specified in terms of `${prefix}'
10466
+at `configure' time.
10467
+
10468
+Optional Features
10469
+=================
10470
+
10471
+ If the package supports it, you can cause programs to be installed
10472
+with an extra prefix or suffix on their names by giving `configure' the
10473
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
10474
+
10475
+ Some packages pay attention to `--enable-FEATURE' options to
10476
+`configure', where FEATURE indicates an optional part of the package.
10477
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
10478
+is something like `gnu-as' or `x' (for the X Window System). The
10479
+`README' should mention any `--enable-' and `--with-' options that the
10480
+package recognizes.
10481
+
10482
+ For packages that use the X Window System, `configure' can usually
10483
+find the X include and library files automatically, but if it doesn't,
10484
+you can use the `configure' options `--x-includes=DIR' and
10485
+`--x-libraries=DIR' to specify their locations.
10486
+
10487
+ Some packages offer the ability to configure how verbose the
10488
+execution of `make' will be. For these packages, running `./configure
10489
+--enable-silent-rules' sets the default to minimal output, which can be
10490
+overridden with `make V=1'; while running `./configure
10491
+--disable-silent-rules' sets the default to verbose, which can be
10492
+overridden with `make V=0'.
10493
+
10494
+Particular systems
10495
+==================
10496
+
10497
+ On HP-UX, the default C compiler is not ANSI C compatible. If GNU
10498
+CC is not installed, it is recommended to use the following options in
10499
+order to use an ANSI C compiler:
10500
+
10501
+ ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
10502
+
10503
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
10504
+
10505
+ On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
10506
+parse its `<wchar.h>' header file. The option `-nodtk' can be used as
10507
+a workaround. If GNU CC is not installed, it is therefore recommended
10508
+to try
10509
+
10510
+ ./configure CC="cc"
10511
+
10512
+and if that doesn't work, try
10513
+
10514
+ ./configure CC="cc -nodtk"
10515
+
10516
+ On Solaris, don't put `/usr/ucb' early in your `PATH'. This
10517
+directory contains several dysfunctional programs; working variants of
10518
+these programs are available in `/usr/bin'. So, if you need `/usr/ucb'
10519
+in your `PATH', put it _after_ `/usr/bin'.
10520
+
10521
+ On Haiku, software installed for all users goes in `/boot/common',
10522
+not `/usr/local'. It is recommended to use the following options:
10523
+
10524
+ ./configure --prefix=/boot/common
10525
+
10526
+Specifying the System Type
10527
+==========================
10528
+
10529
+ There may be some features `configure' cannot figure out
10530
+automatically, but needs to determine by the type of machine the package
10531
+will run on. Usually, assuming the package is built to be run on the
10532
+_same_ architectures, `configure' can figure that out, but if it prints
10533
+a message saying it cannot guess the machine type, give it the
10534
+`--build=TYPE' option. TYPE can either be a short name for the system
10535
+type, such as `sun4', or a canonical name which has the form:
10536
+
10537
+ CPU-COMPANY-SYSTEM
10538
+
10539
+where SYSTEM can have one of these forms:
10540
+
10541
+ OS
10542
+ KERNEL-OS
10543
+
10544
+ See the file `config.sub' for the possible values of each field. If
10545
+`config.sub' isn't included in this package, then this package doesn't
10546
+need to know the machine type.
10547
+
10548
+ If you are _building_ compiler tools for cross-compiling, you should
10549
+use the option `--target=TYPE' to select the type of system they will
10550
+produce code for.
10551
+
10552
+ If you want to _use_ a cross compiler, that generates code for a
10553
+platform different from the build platform, you should specify the
10554
+"host" platform (i.e., that on which the generated programs will
10555
+eventually be run) with `--host=TYPE'.
10556
+
10557
+Sharing Defaults
10558
+================
10559
+
10560
+ If you want to set default values for `configure' scripts to share,
10561
+you can create a site shell script called `config.site' that gives
10562
+default values for variables like `CC', `cache_file', and `prefix'.
10563
+`configure' looks for `PREFIX/share/config.site' if it exists, then
10564
+`PREFIX/etc/config.site' if it exists. Or, you can set the
10565
+`CONFIG_SITE' environment variable to the location of the site script.
10566
+A warning: not all `configure' scripts look for a site script.
10567
+
10568
+Defining Variables
10569
+==================
10570
+
10571
+ Variables not defined in a site shell script can be set in the
10572
+environment passed to `configure'. However, some packages may run
10573
+configure again during the build, and the customized values of these
10574
+variables may be lost. In order to avoid this problem, you should set
10575
+them in the `configure' command line, using `VAR=value'. For example:
10576
+
10577
+ ./configure CC=/usr/local2/bin/gcc
10578
+
10579
+causes the specified `gcc' to be used as the C compiler (unless it is
10580
+overridden in the site shell script).
10581
+
10582
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
10583
+an Autoconf bug. Until the bug is fixed you can use this workaround:
10584
+
10585
+ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
10586
+
10587
+`configure' Invocation
10588
+======================
10589
+
10590
+ `configure' recognizes the following options to control how it
10591
+operates.
10592
+
10593
+`--help'
10594
+`-h'
10595
+ Print a summary of all of the options to `configure', and exit.
10596
+
10597
+`--help=short'
10598
+`--help=recursive'
10599
+ Print a summary of the options unique to this package's
10600
+ `configure', and exit. The `short' variant lists options used
10601
+ only in the top level, while the `recursive' variant lists options
10602
+ also present in any nested packages.
10603
+
10604
+`--version'
10605
+`-V'
10606
+ Print the version of Autoconf used to generate the `configure'
10607
+ script, and exit.
10608
+
10609
+`--cache-file=FILE'
10610
+ Enable the cache: use and save the results of the tests in FILE,
10611
+ traditionally `config.cache'. FILE defaults to `/dev/null' to
10612
+ disable caching.
10613
+
10614
+`--config-cache'
10615
+`-C'
10616
+ Alias for `--cache-file=config.cache'.
10617
+
10618
+`--quiet'
10619
+`--silent'
10620
+`-q'
10621
+ Do not print messages saying which checks are being made. To
10622
+ suppress all normal output, redirect it to `/dev/null' (any error
10623
+ messages will still be shown).
10624
+
10625
+`--srcdir=DIR'
10626
+ Look for the package's source code in directory DIR. Usually
10627
+ `configure' can determine that directory automatically.
10628
+
10629
+`--prefix=DIR'
10630
+ Use DIR as the installation prefix. *note Installation Names::
10631
+ for more details, including other options available for fine-tuning
10632
+ the installation locations.
10633
+
10634
+`--no-create'
10635
+`-n'
10636
+ Run the configure checks, but stop before creating any output
10637
+ files.
10638
10639
-> I recently found a video showing Fedora booting with plymouth and I
10640
-> liked it. So I wanted to use plymouth with my favorite distri (gentoo).
10641
-> I know I'm enduser and the info text on freedesktop.org says plymouth
10642
-> is not meant to be installed by end users but I want to give it a try.
10643
-> I have KMS running and am using my own initramfs anyway (encrypted root
10644
-> disk) so how hard can it be? Can anybody please give me some straight
10645
-> forward hints on how to use plymouth? (The INSTALL file is empty and
10646
-> the README file is boring)
10647
+`configure' also accepts some other, not widely useful, options. Run
10648
+`configure --help' for more details.
10649
10650
-So the basic idea is you need to:
10651
-
10652
-1) build plymouth into the system. On fedora we use these conffigure flags:
10653
-
10654
-.%configure --enable-tracing --disable-tests --without-boot-entry \
10655
- --without-default-plugin \
10656
- --with-logo=%{_datadir}/pixmaps/system-logo-white.png \
10657
- --with-background-start-color-stop=0x0073B3 \
10658
- --with-background-end-color-stop=0x00457E \
10659
- --with-background-color=0x3391cd \
10660
- --enable-gdm-transition \
10661
- --with-system-root-install \
10662
- --with-rhgb-compat-link
10663
-
10664
-%configure is a macro that expands to:
10665
-
10666
-./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
10667
-
10668
-(and some other stuff)
10669
-
10670
-%{_datadir} is just /usr/share
10671
-
10672
-You probably won't need --with-rhgb-compat-link since that's only
10673
-there for compatibility with Fedora's old infrastructure.
10674
-
10675
---with-system-root-install makes plymouthd and plymouth install
10676
-themselves into / instead of /usr. This is important so that the
10677
-plymouth client can work in cases where the root fs is mounted, but
10678
-/usr isn't yet.
10679
-
10680
-Somehow you need to hook into your distros mkinitrd mechanism. I
10681
-mean you need to copy the plymouth binaries, plugins, and data files
10682
-into the initrd everytime you rebuild your initrd. See
10683
-plymouth-populate-initrd for how we do it on fedora (mkinitrd calls
10684
-plymouth-populate-initrd). I would like to upstream hooks for other
10685
-distros mkinitrd systems, so the out of the box experience is easier.
10686
-
10687
-Inside the initrd, you need to start plymouthd early. The earlier the
10688
-better, but not before /sys, /proc/, and /dev/pts are mounted, and
10689
-not before /dev/tty[01] and /dev/fb0 are created.
10690
-
10691
-At some point during the initrd you need to load the kms driver.
10692
-After it's loaded the graphics mode should get set up and /dev/fb0
10693
-will be functional. That's when you call plymouth --show-splash to
10694
-show the splash screen.
10695
-
10696
-To decrypt your root, run
10697
-
10698
-lymouth ask-for-password --command="/sbin/cryptsetup luksOpen -T ..."
10699
-
10700
-where the --command is whatever makes sense for you.
10701
-
10702
-Right after you mount the root file system (but before you switch to it), run
10703
-
10704
-plymouth --newroot=/wherevertherootismounted
10705
-
10706
-This tells plymouth it can load some files off the real filesystem
10707
-(like fonts, and stuff we don't want to stick in the initrd).
10708
-
10709
-while boot you need to run plymouth --update=some-milestone-id
10710
-
10711
-periodically to update the progress bar.
10712
-
10713
-When / is mounted read-write you need to run
10714
-
10715
-plymouth --sysinit
10716
-
10717
-Finally, when plymouth is done, you need to run plymouth --quit
10718
-
10719
-I have to run to catch a bus but i think that's the basics.
10720
-
10721
-> I'm even willing to give something back and convert your hints
10722
-> into an easy step by step howto.
10723
-That'd be great!
10724
-
10725
---Ray
10726
--- plymouth-0.8.2.orig/Makefile.in
10727
+++ plymouth-0.8.2/Makefile.in
10728
@@ -172,6 +172,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
10729
PACKAGE_NAME = @PACKAGE_NAME@
10730
PACKAGE_STRING = @PACKAGE_STRING@
10731
PACKAGE_TARNAME = @PACKAGE_TARNAME@
10732
+PACKAGE_URL = @PACKAGE_URL@
10733
PACKAGE_VERSION = @PACKAGE_VERSION@
10734
PANGO_CFLAGS = @PANGO_CFLAGS@
10735
PANGO_LIBS = @PANGO_LIBS@
10736
--- plymouth-0.8.2.orig/aclocal.m4
10737
+++ plymouth-0.8.2/aclocal.m4
10738
@@ -13,8 +13,8 @@
10739
10740
m4_ifndef([AC_AUTOCONF_VERSION],
10741
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
10742
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
10743
-[m4_warning([this file was generated for autoconf 2.63.
10744
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
10745
+[m4_warning([this file was generated for autoconf 2.65.
10746
You have another version of autoconf. It may work, but is not guaranteed to.
10747
If you have problems, you may need to regenerate the build system entirely.
10748
To do so, use the procedure documented by the package, typically `autoreconf'.])])
10749
@@ -2460,7 +2460,7 @@ linux*oldld* | linux*aout* | linux*coff*
10750
;;
10751
10752
# This must be Linux ELF.
10753
-linux* | k*bsd*-gnu)
10754
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
10755
version_type=linux
10756
need_lib_prefix=no
10757
need_version=no
10758
@@ -2485,13 +2485,10 @@ linux* | k*bsd*-gnu)
10759
# before this can be enabled.
10760
hardcode_into_libs=yes
10761
10762
- # Add ABI-specific directories to the system library path.
10763
- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
10764
-
10765
# Append ld.so.conf contents to the search path
10766
if test -f /etc/ld.so.conf; then
10767
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;/^$/d' | tr '\n' ' '`
10768
- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
10769
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
10770
fi
10771
10772
# We used to test for /lib/ld.so.1 and disable shared libraries on
10773
@@ -2503,6 +2500,18 @@ linux* | k*bsd*-gnu)
10774
dynamic_linker='GNU/Linux ld.so'
10775
;;
10776
10777
+netbsdelf*-gnu)
10778
+ version_type=linux
10779
+ need_lib_prefix=no
10780
+ need_version=no
10781
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
10782
+ soname_spec='${libname}${release}${shared_ext}$major'
10783
+ shlibpath_var=LD_LIBRARY_PATH
10784
+ shlibpath_overrides_runpath=no
10785
+ hardcode_into_libs=yes
10786
+ dynamic_linker='NetBSD ld.elf_so'
10787
+ ;;
10788
+
10789
netbsd*)
10790
version_type=sunos
10791
need_lib_prefix=no
10792
@@ -3090,11 +3099,11 @@ irix5* | irix6* | nonstopux*)
10793
;;
10794
10795
# This must be Linux ELF.
10796
-linux* | k*bsd*-gnu)
10797
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
10798
lt_cv_deplibs_check_method=pass_all
10799
;;
10800
10801
-netbsd*)
10802
+netbsd* | netbsdelf*-gnu)
10803
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
10804
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
10805
else
10806
@@ -3711,7 +3720,7 @@ m4_if([$1], [CXX], [
10807
;;
10808
esac
10809
;;
10810
- linux* | k*bsd*-gnu)
10811
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
10812
case $cc_basename in
10813
KCC*)
10814
# KAI C++ Compiler
10815
@@ -3775,7 +3784,7 @@ m4_if([$1], [CXX], [
10816
;;
10817
esac
10818
;;
10819
- netbsd*)
10820
+ netbsd* | netbsdelf*-gnu)
10821
;;
10822
*qnx* | *nto*)
10823
# QNX uses GNU C++, but need to define -shared option too, otherwise
10824
@@ -3995,7 +4004,7 @@ m4_if([$1], [CXX], [
10825
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
10826
;;
10827
10828
- linux* | k*bsd*-gnu)
10829
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
10830
case $cc_basename in
10831
# old Intel for x86_64 which still supported -KPIC.
10832
ecc*)
10833
@@ -4200,6 +4209,9 @@ m4_if([$1], [CXX], [
10834
cygwin* | mingw* | cegcc*)
10835
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
10836
;;
10837
+ linux* | k*bsd*-gnu)
10838
+ _LT_TAGVAR(link_all_deplibs, $1)=no
10839
+ ;;
10840
*)
10841
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
10842
;;
10843
@@ -4264,6 +4276,9 @@ dnl Note also adjust exclude_expsyms for
10844
openbsd*)
10845
with_gnu_ld=no
10846
;;
10847
+ linux* | k*bsd*-gnu)
10848
+ _LT_TAGVAR(link_all_deplibs, $1)=no
10849
+ ;;
10850
esac
10851
10852
_LT_TAGVAR(ld_shlibs, $1)=yes
10853
@@ -4285,6 +4300,7 @@ dnl Note also adjust exclude_expsyms for
10854
fi
10855
supports_anon_versioning=no
10856
case `$LD -v 2>&1` in
10857
+ *GNU\ gold*) supports_anon_versioning=yes ;;
10858
*\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
10859
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
10860
*\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
10861
@@ -4376,7 +4392,7 @@ _LT_EOF
10862
_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
10863
;;
10864
10865
- gnu* | linux* | tpf* | k*bsd*-gnu)
10866
+ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
10867
tmp_diet=no
10868
if test "$host_os" = linux-dietlibc; then
10869
case $cc_basename in
10870
@@ -4446,7 +4462,7 @@ _LT_EOF
10871
fi
10872
;;
10873
10874
- netbsd*)
10875
+ netbsd* | netbsdelf*-gnu)
10876
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
10877
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
10878
wlarc=
10879
@@ -4621,6 +4637,7 @@ _LT_EOF
10880
if test "$aix_use_runtimelinking" = yes; then
10881
shared_flag="$shared_flag "'${wl}-G'
10882
fi
10883
+ _LT_TAGVAR(link_all_deplibs, $1)=no
10884
else
10885
# not using gcc
10886
if test "$host_cpu" = ia64; then
10887
@@ -4859,7 +4876,7 @@ _LT_EOF
10888
_LT_TAGVAR(link_all_deplibs, $1)=yes
10889
;;
10890
10891
- netbsd*)
10892
+ netbsd* | netbsdelf*-gnu)
10893
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
10894
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
10895
else
10896
@@ -5855,7 +5872,7 @@ if test "$_lt_caught_CXX_error" != yes;
10897
_LT_TAGVAR(inherit_rpath, $1)=yes
10898
;;
10899
10900
- linux* | k*bsd*-gnu)
10901
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
10902
case $cc_basename in
10903
KCC*)
10904
# Kuck and Associates, Inc. (KAI) C++ Compiler
10905
@@ -7862,15 +7879,15 @@ m4_define([lt_dict_filter],
10906
10907
# Generated from ltversion.in.
10908
10909
-# serial 3012 ltversion.m4
10910
+# serial 3017 ltversion.m4
10911
# This file is part of GNU Libtool
10912
10913
-m4_define([LT_PACKAGE_VERSION], [2.2.6])
10914
-m4_define([LT_PACKAGE_REVISION], [1.3012])
10915
+m4_define([LT_PACKAGE_VERSION], [2.2.6b])
10916
+m4_define([LT_PACKAGE_REVISION], [1.3017])
10917
10918
AC_DEFUN([LTVERSION_VERSION],
10919
-[macro_version='2.2.6'
10920
-macro_revision='1.3012'
10921
+[macro_version='2.2.6b'
10922
+macro_revision='1.3017'
10923
_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
10924
_LT_DECL(, macro_revision, 0)
10925
])
10926
@@ -8036,14 +8053,16 @@ fi])
10927
# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
10928
# ---------------------------------------------
10929
m4_define([_PKG_CONFIG],
10930
-[if test -n "$$1"; then
10931
- pkg_cv_[]$1="$$1"
10932
- elif test -n "$PKG_CONFIG"; then
10933
- PKG_CHECK_EXISTS([$3],
10934
- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
10935
- [pkg_failed=yes])
10936
- else
10937
- pkg_failed=untried
10938
+[if test -n "$PKG_CONFIG"; then
10939
+ if test -n "$$1"; then
10940
+ pkg_cv_[]$1="$$1"
10941
+ else
10942
+ PKG_CHECK_EXISTS([$3],
10943
+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
10944
+ [pkg_failed=yes])
10945
+ fi
10946
+else
10947
+ pkg_failed=untried
10948
fi[]dnl
10949
])# _PKG_CONFIG
10950
10951
@@ -8087,9 +8106,9 @@ See the pkg-config man page for more det
10952
if test $pkg_failed = yes; then
10953
_PKG_SHORT_ERRORS_SUPPORTED
10954
if test $_pkg_short_errors_supported = yes; then
10955
- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
10956
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
10957
else
10958
- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
10959
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
10960
fi
10961
# Put the nasty error message in config.log where it belongs
10962
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
10963
--- plymouth-0.8.2.orig/docs/Makefile.in
10964
+++ plymouth-0.8.2/docs/Makefile.in
10965
@@ -140,6 +140,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
10966
PACKAGE_NAME = @PACKAGE_NAME@
10967
PACKAGE_STRING = @PACKAGE_STRING@
10968
PACKAGE_TARNAME = @PACKAGE_TARNAME@
10969
+PACKAGE_URL = @PACKAGE_URL@
10970
PACKAGE_VERSION = @PACKAGE_VERSION@
10971
PANGO_CFLAGS = @PANGO_CFLAGS@
10972
PANGO_LIBS = @PANGO_LIBS@
10973
--- plymouth-0.8.2.orig/themes/Makefile.am
10974
+++ plymouth-0.8.2/themes/Makefile.am
10975
@@ -1,2 +1,2 @@
10976
-SUBDIRS = spinfinity fade-in text details solar glow script
10977
+SUBDIRS = spinfinity fade-in text details solar glow script ubuntu-logo ubuntu-text
10978
MAINTAINERCLEANFILES = Makefile.in
10963
10979
--- plymouth-0.8.2.orig/themes/Makefile.in
10964
10980
+++ plymouth-0.8.2/themes/Makefile.in
10965
10981
@@ -154,6 +154,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
10979
10995
MAINTAINERCLEANFILES = Makefile.in
10980
10996
all: all-recursive
10981
10997
10982
--- plymouth-0.8.2.orig/themes/Makefile.am
10983
+++ plymouth-0.8.2/themes/Makefile.am
10984
@@ -1,2 +1,2 @@
10985
-SUBDIRS = spinfinity fade-in text details solar glow script
10986
+SUBDIRS = spinfinity fade-in text details solar glow script ubuntu-logo ubuntu-text
10987
MAINTAINERCLEANFILES = Makefile.in
10988
--- plymouth-0.8.2.orig/themes/details/Makefile.in
10989
+++ plymouth-0.8.2/themes/details/Makefile.in
10990
@@ -139,6 +139,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
10991
PACKAGE_NAME = @PACKAGE_NAME@
10992
PACKAGE_STRING = @PACKAGE_STRING@
10993
PACKAGE_TARNAME = @PACKAGE_TARNAME@
10994
+PACKAGE_URL = @PACKAGE_URL@
10995
PACKAGE_VERSION = @PACKAGE_VERSION@
10996
PANGO_CFLAGS = @PANGO_CFLAGS@
10997
PANGO_LIBS = @PANGO_LIBS@
10998
--- plymouth-0.8.2.orig/themes/fade-in/Makefile.in
10999
+++ plymouth-0.8.2/themes/fade-in/Makefile.in
11000
@@ -139,6 +139,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
11001
PACKAGE_NAME = @PACKAGE_NAME@
11002
PACKAGE_STRING = @PACKAGE_STRING@
11003
PACKAGE_TARNAME = @PACKAGE_TARNAME@
11004
+PACKAGE_URL = @PACKAGE_URL@
11005
PACKAGE_VERSION = @PACKAGE_VERSION@
11006
PANGO_CFLAGS = @PANGO_CFLAGS@
11007
PANGO_LIBS = @PANGO_LIBS@
11008
10998
--- plymouth-0.8.2.orig/themes/script/Makefile.in
11009
10999
+++ plymouth-0.8.2/themes/script/Makefile.in
11010
11000
@@ -139,6 +139,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
11015
11005
PACKAGE_VERSION = @PACKAGE_VERSION@
11016
11006
PANGO_CFLAGS = @PANGO_CFLAGS@
11017
11007
PANGO_LIBS = @PANGO_LIBS@
11018
--- plymouth-0.8.2.orig/themes/spinfinity/Makefile.in
11019
+++ plymouth-0.8.2/themes/spinfinity/Makefile.in
11020
@@ -139,6 +139,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
11021
PACKAGE_NAME = @PACKAGE_NAME@
11022
PACKAGE_STRING = @PACKAGE_STRING@
11023
PACKAGE_TARNAME = @PACKAGE_TARNAME@
11024
+PACKAGE_URL = @PACKAGE_URL@
11025
PACKAGE_VERSION = @PACKAGE_VERSION@
11026
PANGO_CFLAGS = @PANGO_CFLAGS@
11027
PANGO_LIBS = @PANGO_LIBS@
11028
--- /dev/null
11029
+++ plymouth-0.8.2/themes/ubuntu-text/Makefile.in
11030
@@ -0,0 +1,437 @@
11031
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
11032
+# @configure_input@
11033
+
11034
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
11035
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
11036
+# Inc.
11037
+# This Makefile.in is free software; the Free Software Foundation
11038
+# gives unlimited permission to copy and/or distribute it,
11039
+# with or without modifications, as long as this notice is preserved.
11040
+
11041
+# This program is distributed in the hope that it will be useful,
11042
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
11043
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
11044
+# PARTICULAR PURPOSE.
11045
+
11046
+@SET_MAKE@
11047
+
11048
+VPATH = @srcdir@
11049
+pkgdatadir = $(datadir)/@PACKAGE@
11050
+pkgincludedir = $(includedir)/@PACKAGE@
11051
+pkglibdir = $(libdir)/@PACKAGE@
11052
+pkglibexecdir = $(libexecdir)/@PACKAGE@
11053
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
11054
+install_sh_DATA = $(install_sh) -c -m 644
11055
+install_sh_PROGRAM = $(install_sh) -c
11056
+install_sh_SCRIPT = $(install_sh) -c
11057
+INSTALL_HEADER = $(INSTALL_DATA)
11058
+transform = $(program_transform_name)
11059
+NORMAL_INSTALL = :
11060
+PRE_INSTALL = :
11061
+POST_INSTALL = :
11062
+NORMAL_UNINSTALL = :
11063
+PRE_UNINSTALL = :
11064
+POST_UNINSTALL = :
11065
+build_triplet = @build@
11066
+host_triplet = @host@
11067
+subdir = themes/ubuntu-text
11068
+DIST_COMMON = $(dist_theme_DATA) $(srcdir)/Makefile.am \
11069
+ $(srcdir)/Makefile.in
11070
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
11071
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
11072
+ $(top_srcdir)/configure.ac
11073
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
11074
+ $(ACLOCAL_M4)
11075
+mkinstalldirs = $(install_sh) -d
11076
+CONFIG_HEADER = $(top_builddir)/config.h
11077
+CONFIG_CLEAN_FILES =
11078
+CONFIG_CLEAN_VPATH_FILES =
11079
+AM_V_GEN = $(am__v_GEN_$(V))
11080
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
11081
+am__v_GEN_0 = @echo " GEN " $@;
11082
+AM_V_at = $(am__v_at_$(V))
11083
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
11084
+am__v_at_0 = @
11085
+SOURCES =
11086
+DIST_SOURCES =
11087
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
11088
+am__vpath_adj = case $$p in \
11089
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
11090
+ *) f=$$p;; \
11091
+ esac;
11092
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
11093
+am__install_max = 40
11094
+am__nobase_strip_setup = \
11095
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
11096
+am__nobase_strip = \
11097
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
11098
+am__nobase_list = $(am__nobase_strip_setup); \
11099
+ for p in $$list; do echo "$$p $$p"; done | \
11100
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
11101
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
11102
+ if (++n[$$2] == $(am__install_max)) \
11103
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
11104
+ END { for (dir in files) print dir, files[dir] }'
11105
+am__base_list = \
11106
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
11107
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
11108
+am__installdirs = "$(DESTDIR)$(themedir)"
11109
+DATA = $(dist_theme_DATA)
11110
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
11111
+ACLOCAL = @ACLOCAL@
11112
+AMTAR = @AMTAR@
11113
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
11114
+AR = @AR@
11115
+AUTOCONF = @AUTOCONF@
11116
+AUTOHEADER = @AUTOHEADER@
11117
+AUTOMAKE = @AUTOMAKE@
11118
+AWK = @AWK@
11119
+CC = @CC@
11120
+CCDEPMODE = @CCDEPMODE@
11121
+CFLAGS = @CFLAGS@
11122
+CPP = @CPP@
11123
+CPPFLAGS = @CPPFLAGS@
11124
+CYGPATH_W = @CYGPATH_W@
11125
+DEFS = @DEFS@
11126
+DEPDIR = @DEPDIR@
11127
+DRM_CFLAGS = @DRM_CFLAGS@
11128
+DRM_LIBS = @DRM_LIBS@
11129
+DSYMUTIL = @DSYMUTIL@
11130
+DUMPBIN = @DUMPBIN@
11131
+ECHO_C = @ECHO_C@
11132
+ECHO_N = @ECHO_N@
11133
+ECHO_T = @ECHO_T@
11134
+EGREP = @EGREP@
11135
+EXEEXT = @EXEEXT@
11136
+FGREP = @FGREP@
11137
+GREP = @GREP@
11138
+GTK_CFLAGS = @GTK_CFLAGS@
11139
+GTK_LIBS = @GTK_LIBS@
11140
+IMAGE_CFLAGS = @IMAGE_CFLAGS@
11141
+IMAGE_LIBS = @IMAGE_LIBS@
11142
+INSTALL = @INSTALL@
11143
+INSTALL_DATA = @INSTALL_DATA@
11144
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
11145
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
11146
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
11147
+LD = @LD@
11148
+LDFLAGS = @LDFLAGS@
11149
+LIBOBJS = @LIBOBJS@
11150
+LIBS = @LIBS@
11151
+LIBTOOL = @LIBTOOL@
11152
+LIPO = @LIPO@
11153
+LN_S = @LN_S@
11154
+LTLIBOBJS = @LTLIBOBJS@
11155
+LT_AGE = @LT_AGE@
11156
+LT_CURRENT = @LT_CURRENT@
11157
+LT_REVISION = @LT_REVISION@
11158
+MAINT = @MAINT@
11159
+MAKEINFO = @MAKEINFO@
11160
+MKDIR_P = @MKDIR_P@
11161
+NM = @NM@
11162
+NMEDIT = @NMEDIT@
11163
+OBJDUMP = @OBJDUMP@
11164
+OBJEXT = @OBJEXT@
11165
+OTOOL = @OTOOL@
11166
+OTOOL64 = @OTOOL64@
11167
+PACKAGE = @PACKAGE@
11168
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
11169
+PACKAGE_NAME = @PACKAGE_NAME@
11170
+PACKAGE_STRING = @PACKAGE_STRING@
11171
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
11172
+PACKAGE_URL = @PACKAGE_URL@
11173
+PACKAGE_VERSION = @PACKAGE_VERSION@
11174
+PANGO_CFLAGS = @PANGO_CFLAGS@
11175
+PANGO_LIBS = @PANGO_LIBS@
11176
+PATH_SEPARATOR = @PATH_SEPARATOR@
11177
+PKG_CONFIG = @PKG_CONFIG@
11178
+PLYMOUTH_CFLAGS = @PLYMOUTH_CFLAGS@
11179
+PLYMOUTH_CONF_DIR = @PLYMOUTH_CONF_DIR@
11180
+PLYMOUTH_DATADIR = @PLYMOUTH_DATADIR@
11181
+PLYMOUTH_LIBDIR = @PLYMOUTH_LIBDIR@
11182
+PLYMOUTH_LIBEXECDIR = @PLYMOUTH_LIBEXECDIR@
11183
+PLYMOUTH_LIBS = @PLYMOUTH_LIBS@
11184
+PLYMOUTH_PLUGIN_PATH = @PLYMOUTH_PLUGIN_PATH@
11185
+PLYMOUTH_POLICY_DIR = @PLYMOUTH_POLICY_DIR@
11186
+PLYMOUTH_THEME_PATH = @PLYMOUTH_THEME_PATH@
11187
+RANLIB = @RANLIB@
11188
+RELEASE_FILE = @RELEASE_FILE@
11189
+SED = @SED@
11190
+SET_MAKE = @SET_MAKE@
11191
+SHELL = @SHELL@
11192
+STRIP = @STRIP@
11193
+VERSION = @VERSION@
11194
+abs_builddir = @abs_builddir@
11195
+abs_srcdir = @abs_srcdir@
11196
+abs_top_builddir = @abs_top_builddir@
11197
+abs_top_srcdir = @abs_top_srcdir@
11198
+ac_ct_CC = @ac_ct_CC@
11199
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
11200
+am__include = @am__include@
11201
+am__leading_dot = @am__leading_dot@
11202
+am__quote = @am__quote@
11203
+am__tar = @am__tar@
11204
+am__untar = @am__untar@
11205
+background_color = @background_color@
11206
+background_end_color = @background_end_color@
11207
+background_start_color = @background_start_color@
11208
+bindir = @bindir@
11209
+build = @build@
11210
+build_alias = @build_alias@
11211
+build_cpu = @build_cpu@
11212
+build_os = @build_os@
11213
+build_vendor = @build_vendor@
11214
+builddir = @builddir@
11215
+datadir = @datadir@
11216
+datarootdir = @datarootdir@
11217
+docdir = @docdir@
11218
+dvidir = @dvidir@
11219
+exec_prefix = @exec_prefix@
11220
+host = @host@
11221
+host_alias = @host_alias@
11222
+host_cpu = @host_cpu@
11223
+host_os = @host_os@
11224
+host_vendor = @host_vendor@
11225
+htmldir = @htmldir@
11226
+includedir = @includedir@
11227
+infodir = @infodir@
11228
+install_sh = @install_sh@
11229
+libdir = @libdir@
11230
+libexecdir = @libexecdir@
11231
+localedir = @localedir@
11232
+localstatedir = @localstatedir@
11233
+logofile = @logofile@
11234
+lt_ECHO = @lt_ECHO@
11235
+mandir = @mandir@
11236
+mkdir_p = @mkdir_p@
11237
+oldincludedir = @oldincludedir@
11238
+pdfdir = @pdfdir@
11239
+plymouthclientdir = @plymouthclientdir@
11240
+plymouthdaemondir = @plymouthdaemondir@
11241
+prefix = @prefix@
11242
+program_transform_name = @program_transform_name@
11243
+psdir = @psdir@
11244
+sbindir = @sbindir@
11245
+sharedstatedir = @sharedstatedir@
11246
+srcdir = @srcdir@
11247
+sysconfdir = @sysconfdir@
11248
+target_alias = @target_alias@
11249
+top_build_prefix = @top_build_prefix@
11250
+top_builddir = @top_builddir@
11251
+top_srcdir = @top_srcdir@
11252
+themedir = $(datadir)/plymouth/themes/ubuntu-text
11253
+dist_theme_DATA = ubuntu-text.plymouth
11254
+MAINTAINERCLEANFILES = Makefile.in
11255
+all: all-am
11256
+
11257
+.SUFFIXES:
11258
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
11259
+ @for dep in $?; do \
11260
+ case '$(am__configure_deps)' in \
11261
+ *$$dep*) \
11262
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
11263
+ && { if test -f $@; then exit 0; else break; fi; }; \
11264
+ exit 1;; \
11265
+ esac; \
11266
+ done; \
11267
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu themes/ubuntu-text/Makefile'; \
11268
+ $(am__cd) $(top_srcdir) && \
11269
+ $(AUTOMAKE) --gnu themes/ubuntu-text/Makefile
11270
+.PRECIOUS: Makefile
11271
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
11272
+ @case '$?' in \
11273
+ *config.status*) \
11274
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
11275
+ *) \
11276
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
11277
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
11278
+ esac;
11279
+
11280
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
11281
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
11282
+
11283
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
11284
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
11285
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
11286
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
11287
+$(am__aclocal_m4_deps):
11288
+
11289
+mostlyclean-libtool:
11290
+ -rm -f *.lo
11291
+
11292
+clean-libtool:
11293
+ -rm -rf .libs _libs
11294
+install-dist_themeDATA: $(dist_theme_DATA)
11295
+ @$(NORMAL_INSTALL)
11296
+ test -z "$(themedir)" || $(MKDIR_P) "$(DESTDIR)$(themedir)"
11297
+ @list='$(dist_theme_DATA)'; test -n "$(themedir)" || list=; \
11298
+ for p in $$list; do \
11299
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
11300
+ echo "$$d$$p"; \
11301
+ done | $(am__base_list) | \
11302
+ while read files; do \
11303
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(themedir)'"; \
11304
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(themedir)" || exit $$?; \
11305
+ done
11306
+
11307
+uninstall-dist_themeDATA:
11308
+ @$(NORMAL_UNINSTALL)
11309
+ @list='$(dist_theme_DATA)'; test -n "$(themedir)" || list=; \
11310
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
11311
+ test -n "$$files" || exit 0; \
11312
+ echo " ( cd '$(DESTDIR)$(themedir)' && rm -f" $$files ")"; \
11313
+ cd "$(DESTDIR)$(themedir)" && rm -f $$files
11314
+tags: TAGS
11315
+TAGS:
11316
+
11317
+ctags: CTAGS
11318
+CTAGS:
11319
+
11320
+
11321
+distdir: $(DISTFILES)
11322
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
11323
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
11324
+ list='$(DISTFILES)'; \
11325
+ dist_files=`for file in $$list; do echo $$file; done | \
11326
+ sed -e "s|^$$srcdirstrip/||;t" \
11327
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
11328
+ case $$dist_files in \
11329
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
11330
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
11331
+ sort -u` ;; \
11332
+ esac; \
11333
+ for file in $$dist_files; do \
11334
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
11335
+ if test -d $$d/$$file; then \
11336
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
11337
+ if test -d "$(distdir)/$$file"; then \
11338
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
11339
+ fi; \
11340
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
11341
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
11342
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
11343
+ fi; \
11344
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
11345
+ else \
11346
+ test -f "$(distdir)/$$file" \
11347
+ || cp -p $$d/$$file "$(distdir)/$$file" \
11348
+ || exit 1; \
11349
+ fi; \
11350
+ done
11351
+check-am: all-am
11352
+check: check-am
11353
+all-am: Makefile $(DATA)
11354
+installdirs:
11355
+ for dir in "$(DESTDIR)$(themedir)"; do \
11356
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
11357
+ done
11358
+install: install-am
11359
+install-exec: install-exec-am
11360
+install-data: install-data-am
11361
+uninstall: uninstall-am
11362
+
11363
+install-am: all-am
11364
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
11365
+
11366
+installcheck: installcheck-am
11367
+install-strip:
11368
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
11369
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
11370
+ `test -z '$(STRIP)' || \
11371
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
11372
+mostlyclean-generic:
11373
+
11374
+clean-generic:
11375
+
11376
+distclean-generic:
11377
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
11378
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
11379
+
11380
+maintainer-clean-generic:
11381
+ @echo "This command is intended for maintainers to use"
11382
+ @echo "it deletes files that may require special tools to rebuild."
11383
+ -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
11384
+clean: clean-am
11385
+
11386
+clean-am: clean-generic clean-libtool mostlyclean-am
11387
+
11388
+distclean: distclean-am
11389
+ -rm -f Makefile
11390
+distclean-am: clean-am distclean-generic
11391
+
11392
+dvi: dvi-am
11393
+
11394
+dvi-am:
11395
+
11396
+html: html-am
11397
+
11398
+html-am:
11399
+
11400
+info: info-am
11401
+
11402
+info-am:
11403
+
11404
+install-data-am: install-dist_themeDATA
11405
+
11406
+install-dvi: install-dvi-am
11407
+
11408
+install-dvi-am:
11409
+
11410
+install-exec-am:
11411
+
11412
+install-html: install-html-am
11413
+
11414
+install-html-am:
11415
+
11416
+install-info: install-info-am
11417
+
11418
+install-info-am:
11419
+
11420
+install-man:
11421
+
11422
+install-pdf: install-pdf-am
11423
+
11424
+install-pdf-am:
11425
+
11426
+install-ps: install-ps-am
11427
+
11428
+install-ps-am:
11429
+
11430
+installcheck-am:
11431
+
11432
+maintainer-clean: maintainer-clean-am
11433
+ -rm -f Makefile
11434
+maintainer-clean-am: distclean-am maintainer-clean-generic
11435
+
11436
+mostlyclean: mostlyclean-am
11437
+
11438
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
11439
+
11440
+pdf: pdf-am
11441
+
11442
+pdf-am:
11443
+
11444
+ps: ps-am
11445
+
11446
+ps-am:
11447
+
11448
+uninstall-am: uninstall-dist_themeDATA
11449
+
11450
+.MAKE: install-am install-strip
11451
+
11452
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
11453
+ distclean distclean-generic distclean-libtool distdir dvi \
11454
+ dvi-am html html-am info info-am install install-am \
11455
+ install-data install-data-am install-dist_themeDATA \
11456
+ install-dvi install-dvi-am install-exec install-exec-am \
11457
+ install-html install-html-am install-info install-info-am \
11458
+ install-man install-pdf install-pdf-am install-ps \
11459
+ install-ps-am install-strip installcheck installcheck-am \
11460
+ installdirs maintainer-clean maintainer-clean-generic \
11461
+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
11462
+ ps ps-am uninstall uninstall-am uninstall-dist_themeDATA
11463
+
11464
+
11465
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
11466
+# Otherwise a system limit (for SysV at least) may be exceeded.
11467
+.NOEXPORT:
11468
--- /dev/null
11469
+++ plymouth-0.8.2/themes/ubuntu-text/Makefile.am
11470
@@ -0,0 +1,4 @@
11471
+themedir = $(datadir)/plymouth/themes/ubuntu-text
11472
+dist_theme_DATA = ubuntu-text.plymouth
11473
+
11474
+MAINTAINERCLEANFILES = Makefile.in
11475
--- /dev/null
11476
+++ plymouth-0.8.2/themes/ubuntu-text/ubuntu-text.plymouth
11477
@@ -0,0 +1,4 @@
11478
+[Plymouth Theme]
11479
+Name=Ubuntu Text
11480
+Description=Text mode theme based on ubuntu-logo theme
11481
+ModuleName=ubuntu-text
11482
--- plymouth-0.8.2.orig/themes/solar/Makefile.in
11483
+++ plymouth-0.8.2/themes/solar/Makefile.in
11484
@@ -139,6 +139,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
11485
PACKAGE_NAME = @PACKAGE_NAME@
11486
PACKAGE_STRING = @PACKAGE_STRING@
11487
PACKAGE_TARNAME = @PACKAGE_TARNAME@
11488
+PACKAGE_URL = @PACKAGE_URL@
11489
PACKAGE_VERSION = @PACKAGE_VERSION@
11490
PANGO_CFLAGS = @PANGO_CFLAGS@
11491
PANGO_LIBS = @PANGO_LIBS@
11492
--- plymouth-0.8.2.orig/themes/glow/Makefile.in
11493
+++ plymouth-0.8.2/themes/glow/Makefile.in
11494
@@ -139,6 +139,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
11495
PACKAGE_NAME = @PACKAGE_NAME@
11496
PACKAGE_STRING = @PACKAGE_STRING@
11497
PACKAGE_TARNAME = @PACKAGE_TARNAME@
11498
+PACKAGE_URL = @PACKAGE_URL@
11499
PACKAGE_VERSION = @PACKAGE_VERSION@
11500
PANGO_CFLAGS = @PANGO_CFLAGS@
11501
PANGO_LIBS = @PANGO_LIBS@
11502
--- plymouth-0.8.2.orig/themes/text/Makefile.in
11503
+++ plymouth-0.8.2/themes/text/Makefile.in
11504
@@ -139,6 +139,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
11505
PACKAGE_NAME = @PACKAGE_NAME@
11506
PACKAGE_STRING = @PACKAGE_STRING@
11507
PACKAGE_TARNAME = @PACKAGE_TARNAME@
11508
+PACKAGE_URL = @PACKAGE_URL@
11509
PACKAGE_VERSION = @PACKAGE_VERSION@
11510
PANGO_CFLAGS = @PANGO_CFLAGS@
11511
PANGO_LIBS = @PANGO_LIBS@
11512
--- /dev/null
11513
+++ plymouth-0.8.2/themes/ubuntu-logo/Makefile.in
11514
@@ -0,0 +1,475 @@
11515
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
11516
+# @configure_input@
11517
+
11518
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
11519
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
11520
+# Inc.
11521
+# This Makefile.in is free software; the Free Software Foundation
11522
+# gives unlimited permission to copy and/or distribute it,
11523
+# with or without modifications, as long as this notice is preserved.
11524
+
11525
+# This program is distributed in the hope that it will be useful,
11526
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
11527
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
11528
+# PARTICULAR PURPOSE.
11529
+
11530
+@SET_MAKE@
11531
+
11532
+VPATH = @srcdir@
11533
+pkgdatadir = $(datadir)/@PACKAGE@
11534
+pkgincludedir = $(includedir)/@PACKAGE@
11535
+pkglibdir = $(libdir)/@PACKAGE@
11536
+pkglibexecdir = $(libexecdir)/@PACKAGE@
11537
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
11538
+install_sh_DATA = $(install_sh) -c -m 644
11539
+install_sh_PROGRAM = $(install_sh) -c
11540
+install_sh_SCRIPT = $(install_sh) -c
11541
+INSTALL_HEADER = $(INSTALL_DATA)
11542
+transform = $(program_transform_name)
11543
+NORMAL_INSTALL = :
11544
+PRE_INSTALL = :
11545
+POST_INSTALL = :
11546
+NORMAL_UNINSTALL = :
11547
+PRE_UNINSTALL = :
11548
+POST_UNINSTALL = :
11549
+build_triplet = @build@
11550
+host_triplet = @host@
11551
+subdir = themes/ubuntu-logo
11552
+DIST_COMMON = $(dist_theme_DATA) $(srcdir)/Makefile.am \
11553
+ $(srcdir)/Makefile.in
11554
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
11555
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
11556
+ $(top_srcdir)/configure.ac
11557
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
11558
+ $(ACLOCAL_M4)
11559
+mkinstalldirs = $(install_sh) -d
11560
+CONFIG_HEADER = $(top_builddir)/config.h
11561
+CONFIG_CLEAN_FILES =
11562
+CONFIG_CLEAN_VPATH_FILES =
11563
+AM_V_GEN = $(am__v_GEN_$(V))
11564
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
11565
+am__v_GEN_0 = @echo " GEN " $@;
11566
+AM_V_at = $(am__v_at_$(V))
11567
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
11568
+am__v_at_0 = @
11569
+SOURCES =
11570
+DIST_SOURCES =
11571
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
11572
+am__vpath_adj = case $$p in \
11573
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
11574
+ *) f=$$p;; \
11575
+ esac;
11576
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
11577
+am__install_max = 40
11578
+am__nobase_strip_setup = \
11579
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
11580
+am__nobase_strip = \
11581
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
11582
+am__nobase_list = $(am__nobase_strip_setup); \
11583
+ for p in $$list; do echo "$$p $$p"; done | \
11584
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
11585
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
11586
+ if (++n[$$2] == $(am__install_max)) \
11587
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
11588
+ END { for (dir in files) print dir, files[dir] }'
11589
+am__base_list = \
11590
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
11591
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
11592
+am__installdirs = "$(DESTDIR)$(themedir)" "$(DESTDIR)$(themedir)"
11593
+DATA = $(dist_theme_DATA) $(nodist_theme_DATA)
11594
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
11595
+ACLOCAL = @ACLOCAL@
11596
+AMTAR = @AMTAR@
11597
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
11598
+AR = @AR@
11599
+AUTOCONF = @AUTOCONF@
11600
+AUTOHEADER = @AUTOHEADER@
11601
+AUTOMAKE = @AUTOMAKE@
11602
+AWK = @AWK@
11603
+CC = @CC@
11604
+CCDEPMODE = @CCDEPMODE@
11605
+CFLAGS = @CFLAGS@
11606
+CPP = @CPP@
11607
+CPPFLAGS = @CPPFLAGS@
11608
+CYGPATH_W = @CYGPATH_W@
11609
+DEFS = @DEFS@
11610
+DEPDIR = @DEPDIR@
11611
+DRM_CFLAGS = @DRM_CFLAGS@
11612
+DRM_LIBS = @DRM_LIBS@
11613
+DSYMUTIL = @DSYMUTIL@
11614
+DUMPBIN = @DUMPBIN@
11615
+ECHO_C = @ECHO_C@
11616
+ECHO_N = @ECHO_N@
11617
+ECHO_T = @ECHO_T@
11618
+EGREP = @EGREP@
11619
+EXEEXT = @EXEEXT@
11620
+FGREP = @FGREP@
11621
+GREP = @GREP@
11622
+GTK_CFLAGS = @GTK_CFLAGS@
11623
+GTK_LIBS = @GTK_LIBS@
11624
+IMAGE_CFLAGS = @IMAGE_CFLAGS@
11625
+IMAGE_LIBS = @IMAGE_LIBS@
11626
+INSTALL = @INSTALL@
11627
+INSTALL_DATA = @INSTALL_DATA@
11628
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
11629
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
11630
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
11631
+LD = @LD@
11632
+LDFLAGS = @LDFLAGS@
11633
+LIBOBJS = @LIBOBJS@
11634
+LIBS = @LIBS@
11635
+LIBTOOL = @LIBTOOL@
11636
+LIPO = @LIPO@
11637
+LN_S = @LN_S@
11638
+LTLIBOBJS = @LTLIBOBJS@
11639
+LT_AGE = @LT_AGE@
11640
+LT_CURRENT = @LT_CURRENT@
11641
+LT_REVISION = @LT_REVISION@
11642
+MAINT = @MAINT@
11643
+MAKEINFO = @MAKEINFO@
11644
+MKDIR_P = @MKDIR_P@
11645
+NM = @NM@
11646
+NMEDIT = @NMEDIT@
11647
+OBJDUMP = @OBJDUMP@
11648
+OBJEXT = @OBJEXT@
11649
+OTOOL = @OTOOL@
11650
+OTOOL64 = @OTOOL64@
11651
+PACKAGE = @PACKAGE@
11652
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
11653
+PACKAGE_NAME = @PACKAGE_NAME@
11654
+PACKAGE_STRING = @PACKAGE_STRING@
11655
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
11656
+PACKAGE_URL = @PACKAGE_URL@
11657
+PACKAGE_VERSION = @PACKAGE_VERSION@
11658
+PANGO_CFLAGS = @PANGO_CFLAGS@
11659
+PANGO_LIBS = @PANGO_LIBS@
11660
+PATH_SEPARATOR = @PATH_SEPARATOR@
11661
+PKG_CONFIG = @PKG_CONFIG@
11662
+PLYMOUTH_CFLAGS = @PLYMOUTH_CFLAGS@
11663
+PLYMOUTH_CONF_DIR = @PLYMOUTH_CONF_DIR@
11664
+PLYMOUTH_DATADIR = @PLYMOUTH_DATADIR@
11665
+PLYMOUTH_LIBDIR = @PLYMOUTH_LIBDIR@
11666
+PLYMOUTH_LIBEXECDIR = @PLYMOUTH_LIBEXECDIR@
11667
+PLYMOUTH_LIBS = @PLYMOUTH_LIBS@
11668
+PLYMOUTH_PLUGIN_PATH = @PLYMOUTH_PLUGIN_PATH@
11669
+PLYMOUTH_POLICY_DIR = @PLYMOUTH_POLICY_DIR@
11670
+PLYMOUTH_THEME_PATH = @PLYMOUTH_THEME_PATH@
11671
+RANLIB = @RANLIB@
11672
+RELEASE_FILE = @RELEASE_FILE@
11673
+SED = @SED@
11674
+SET_MAKE = @SET_MAKE@
11675
+SHELL = @SHELL@
11676
+STRIP = @STRIP@
11677
+VERSION = @VERSION@
11678
+abs_builddir = @abs_builddir@
11679
+abs_srcdir = @abs_srcdir@
11680
+abs_top_builddir = @abs_top_builddir@
11681
+abs_top_srcdir = @abs_top_srcdir@
11682
+ac_ct_CC = @ac_ct_CC@
11683
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
11684
+am__include = @am__include@
11685
+am__leading_dot = @am__leading_dot@
11686
+am__quote = @am__quote@
11687
+am__tar = @am__tar@
11688
+am__untar = @am__untar@
11689
+background_color = @background_color@
11690
+background_end_color = @background_end_color@
11691
+background_start_color = @background_start_color@
11692
+bindir = @bindir@
11693
+build = @build@
11694
+build_alias = @build_alias@
11695
+build_cpu = @build_cpu@
11696
+build_os = @build_os@
11697
+build_vendor = @build_vendor@
11698
+builddir = @builddir@
11699
+datadir = @datadir@
11700
+datarootdir = @datarootdir@
11701
+docdir = @docdir@
11702
+dvidir = @dvidir@
11703
+exec_prefix = @exec_prefix@
11704
+host = @host@
11705
+host_alias = @host_alias@
11706
+host_cpu = @host_cpu@
11707
+host_os = @host_os@
11708
+host_vendor = @host_vendor@
11709
+htmldir = @htmldir@
11710
+includedir = @includedir@
11711
+infodir = @infodir@
11712
+install_sh = @install_sh@
11713
+libdir = @libdir@
11714
+libexecdir = @libexecdir@
11715
+localedir = @localedir@
11716
+localstatedir = @localstatedir@
11717
+logofile = @logofile@
11718
+lt_ECHO = @lt_ECHO@
11719
+mandir = @mandir@
11720
+mkdir_p = @mkdir_p@
11721
+oldincludedir = @oldincludedir@
11722
+pdfdir = @pdfdir@
11723
+plymouthclientdir = @plymouthclientdir@
11724
+plymouthdaemondir = @plymouthdaemondir@
11725
+prefix = @prefix@
11726
+program_transform_name = @program_transform_name@
11727
+psdir = @psdir@
11728
+sbindir = @sbindir@
11729
+sharedstatedir = @sharedstatedir@
11730
+srcdir = @srcdir@
11731
+sysconfdir = @sysconfdir@
11732
+target_alias = @target_alias@
11733
+top_build_prefix = @top_build_prefix@
11734
+top_builddir = @top_builddir@
11735
+top_srcdir = @top_srcdir@
11736
+themedir = $(datadir)/plymouth/themes/ubuntu-logo
11737
+nodist_theme_DATA = ubuntu-logo.plymouth
11738
+dist_theme_DATA = ubuntu-logo.script \
11739
+ ubuntu_logo.png \
11740
+ ubuntu_logo16.png \
11741
+ password_field.png \
11742
+ password_field16.png \
11743
+ progress_dot_off.png \
11744
+ progress_dot_off16.png \
11745
+ progress_dot_on.png \
11746
+ progress_dot_on16.png
11747
+
11748
+MAINTAINERCLEANFILES = Makefile.in ubuntu-logo.plymouth
11749
+CLEANFILES = ubuntu-logo.plymouth
11750
+EXTRA_DIST = ubuntu-logo.plymouth.in
11751
+all: all-am
11752
+
11753
+.SUFFIXES:
11754
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
11755
+ @for dep in $?; do \
11756
+ case '$(am__configure_deps)' in \
11757
+ *$$dep*) \
11758
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
11759
+ && { if test -f $@; then exit 0; else break; fi; }; \
11760
+ exit 1;; \
11761
+ esac; \
11762
+ done; \
11763
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu themes/ubuntu-logo/Makefile'; \
11764
+ $(am__cd) $(top_srcdir) && \
11765
+ $(AUTOMAKE) --gnu themes/ubuntu-logo/Makefile
11766
+.PRECIOUS: Makefile
11767
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
11768
+ @case '$?' in \
11769
+ *config.status*) \
11770
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
11771
+ *) \
11772
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
11773
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
11774
+ esac;
11775
+
11776
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
11777
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
11778
+
11779
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
11780
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
11781
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
11782
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
11783
+$(am__aclocal_m4_deps):
11784
+
11785
+mostlyclean-libtool:
11786
+ -rm -f *.lo
11787
+
11788
+clean-libtool:
11789
+ -rm -rf .libs _libs
11790
+install-dist_themeDATA: $(dist_theme_DATA)
11791
+ @$(NORMAL_INSTALL)
11792
+ test -z "$(themedir)" || $(MKDIR_P) "$(DESTDIR)$(themedir)"
11793
+ @list='$(dist_theme_DATA)'; test -n "$(themedir)" || list=; \
11794
+ for p in $$list; do \
11795
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
11796
+ echo "$$d$$p"; \
11797
+ done | $(am__base_list) | \
11798
+ while read files; do \
11799
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(themedir)'"; \
11800
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(themedir)" || exit $$?; \
11801
+ done
11802
+
11803
+uninstall-dist_themeDATA:
11804
+ @$(NORMAL_UNINSTALL)
11805
+ @list='$(dist_theme_DATA)'; test -n "$(themedir)" || list=; \
11806
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
11807
+ test -n "$$files" || exit 0; \
11808
+ echo " ( cd '$(DESTDIR)$(themedir)' && rm -f" $$files ")"; \
11809
+ cd "$(DESTDIR)$(themedir)" && rm -f $$files
11810
+install-nodist_themeDATA: $(nodist_theme_DATA)
11811
+ @$(NORMAL_INSTALL)
11812
+ test -z "$(themedir)" || $(MKDIR_P) "$(DESTDIR)$(themedir)"
11813
+ @list='$(nodist_theme_DATA)'; test -n "$(themedir)" || list=; \
11814
+ for p in $$list; do \
11815
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
11816
+ echo "$$d$$p"; \
11817
+ done | $(am__base_list) | \
11818
+ while read files; do \
11819
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(themedir)'"; \
11820
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(themedir)" || exit $$?; \
11821
+ done
11822
+
11823
+uninstall-nodist_themeDATA:
11824
+ @$(NORMAL_UNINSTALL)
11825
+ @list='$(nodist_theme_DATA)'; test -n "$(themedir)" || list=; \
11826
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
11827
+ test -n "$$files" || exit 0; \
11828
+ echo " ( cd '$(DESTDIR)$(themedir)' && rm -f" $$files ")"; \
11829
+ cd "$(DESTDIR)$(themedir)" && rm -f $$files
11830
+tags: TAGS
11831
+TAGS:
11832
+
11833
+ctags: CTAGS
11834
+CTAGS:
11835
+
11836
+
11837
+distdir: $(DISTFILES)
11838
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
11839
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
11840
+ list='$(DISTFILES)'; \
11841
+ dist_files=`for file in $$list; do echo $$file; done | \
11842
+ sed -e "s|^$$srcdirstrip/||;t" \
11843
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
11844
+ case $$dist_files in \
11845
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
11846
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
11847
+ sort -u` ;; \
11848
+ esac; \
11849
+ for file in $$dist_files; do \
11850
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
11851
+ if test -d $$d/$$file; then \
11852
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
11853
+ if test -d "$(distdir)/$$file"; then \
11854
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
11855
+ fi; \
11856
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
11857
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
11858
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
11859
+ fi; \
11860
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
11861
+ else \
11862
+ test -f "$(distdir)/$$file" \
11863
+ || cp -p $$d/$$file "$(distdir)/$$file" \
11864
+ || exit 1; \
11865
+ fi; \
11866
+ done
11867
+check-am: all-am
11868
+check: check-am
11869
+all-am: Makefile $(DATA)
11870
+installdirs:
11871
+ for dir in "$(DESTDIR)$(themedir)" "$(DESTDIR)$(themedir)"; do \
11872
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
11873
+ done
11874
+install: install-am
11875
+install-exec: install-exec-am
11876
+install-data: install-data-am
11877
+uninstall: uninstall-am
11878
+
11879
+install-am: all-am
11880
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
11881
+
11882
+installcheck: installcheck-am
11883
+install-strip:
11884
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
11885
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
11886
+ `test -z '$(STRIP)' || \
11887
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
11888
+mostlyclean-generic:
11889
+
11890
+clean-generic:
11891
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
11892
+
11893
+distclean-generic:
11894
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
11895
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
11896
+
11897
+maintainer-clean-generic:
11898
+ @echo "This command is intended for maintainers to use"
11899
+ @echo "it deletes files that may require special tools to rebuild."
11900
+ -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
11901
+clean: clean-am
11902
+
11903
+clean-am: clean-generic clean-libtool mostlyclean-am
11904
+
11905
+distclean: distclean-am
11906
+ -rm -f Makefile
11907
+distclean-am: clean-am distclean-generic
11908
+
11909
+dvi: dvi-am
11910
+
11911
+dvi-am:
11912
+
11913
+html: html-am
11914
+
11915
+html-am:
11916
+
11917
+info: info-am
11918
+
11919
+info-am:
11920
+
11921
+install-data-am: install-dist_themeDATA install-nodist_themeDATA
11922
+
11923
+install-dvi: install-dvi-am
11924
+
11925
+install-dvi-am:
11926
+
11927
+install-exec-am:
11928
+
11929
+install-html: install-html-am
11930
+
11931
+install-html-am:
11932
+
11933
+install-info: install-info-am
11934
+
11935
+install-info-am:
11936
+
11937
+install-man:
11938
+
11939
+install-pdf: install-pdf-am
11940
+
11941
+install-pdf-am:
11942
+
11943
+install-ps: install-ps-am
11944
+
11945
+install-ps-am:
11946
+
11947
+installcheck-am:
11948
+
11949
+maintainer-clean: maintainer-clean-am
11950
+ -rm -f Makefile
11951
+maintainer-clean-am: distclean-am maintainer-clean-generic
11952
+
11953
+mostlyclean: mostlyclean-am
11954
+
11955
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
11956
+
11957
+pdf: pdf-am
11958
+
11959
+pdf-am:
11960
+
11961
+ps: ps-am
11962
+
11963
+ps-am:
11964
+
11965
+uninstall-am: uninstall-dist_themeDATA uninstall-nodist_themeDATA
11966
+
11967
+.MAKE: install-am install-strip
11968
+
11969
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
11970
+ distclean distclean-generic distclean-libtool distdir dvi \
11971
+ dvi-am html html-am info info-am install install-am \
11972
+ install-data install-data-am install-dist_themeDATA \
11973
+ install-dvi install-dvi-am install-exec install-exec-am \
11974
+ install-html install-html-am install-info install-info-am \
11975
+ install-man install-nodist_themeDATA install-pdf \
11976
+ install-pdf-am install-ps install-ps-am install-strip \
11977
+ installcheck installcheck-am installdirs maintainer-clean \
11978
+ maintainer-clean-generic mostlyclean mostlyclean-generic \
11979
+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
11980
+ uninstall-dist_themeDATA uninstall-nodist_themeDATA
11981
+
11982
+
11983
+ubuntu-logo.plymouth: $(srcdir)/ubuntu-logo.plymouth.in
11984
+ sed -e 's,[@]PLYMOUTH_THEME_PATH[@],$(PLYMOUTH_THEME_PATH),g' \
11985
+ $(srcdir)/ubuntu-logo.plymouth.in > ubuntu-logo.plymouth
11986
+
11987
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
11988
+# Otherwise a system limit (for SysV at least) may be exceeded.
11989
+.NOEXPORT:
11990
11008
--- /dev/null
11991
11009
+++ plymouth-0.8.2/themes/ubuntu-logo/Makefile.am
11992
11010
@@ -0,0 +1,22 @@
13084
12102
+}
13085
12103
+
13086
12104
+Plymouth.SetQuitFunction(quit_callback);
13087
--- plymouth-0.8.2.orig/docs/Makefile.in
13088
+++ plymouth-0.8.2/docs/Makefile.in
13089
@@ -140,6 +140,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
13090
PACKAGE_NAME = @PACKAGE_NAME@
13091
PACKAGE_STRING = @PACKAGE_STRING@
13092
PACKAGE_TARNAME = @PACKAGE_TARNAME@
13093
+PACKAGE_URL = @PACKAGE_URL@
13094
PACKAGE_VERSION = @PACKAGE_VERSION@
13095
PANGO_CFLAGS = @PANGO_CFLAGS@
13096
PANGO_LIBS = @PANGO_LIBS@
13097
--- plymouth-0.8.2.orig/src/Makefile.in
13098
+++ plymouth-0.8.2/src/Makefile.in
13099
@@ -220,6 +220,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
12105
--- /dev/null
12106
+++ plymouth-0.8.2/themes/ubuntu-logo/Makefile.in
12107
@@ -0,0 +1,475 @@
12108
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
12109
+# @configure_input@
12110
+
12111
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
12112
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
12113
+# Inc.
12114
+# This Makefile.in is free software; the Free Software Foundation
12115
+# gives unlimited permission to copy and/or distribute it,
12116
+# with or without modifications, as long as this notice is preserved.
12117
+
12118
+# This program is distributed in the hope that it will be useful,
12119
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
12120
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
12121
+# PARTICULAR PURPOSE.
12122
+
12123
+@SET_MAKE@
12124
+
12125
+VPATH = @srcdir@
12126
+pkgdatadir = $(datadir)/@PACKAGE@
12127
+pkgincludedir = $(includedir)/@PACKAGE@
12128
+pkglibdir = $(libdir)/@PACKAGE@
12129
+pkglibexecdir = $(libexecdir)/@PACKAGE@
12130
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
12131
+install_sh_DATA = $(install_sh) -c -m 644
12132
+install_sh_PROGRAM = $(install_sh) -c
12133
+install_sh_SCRIPT = $(install_sh) -c
12134
+INSTALL_HEADER = $(INSTALL_DATA)
12135
+transform = $(program_transform_name)
12136
+NORMAL_INSTALL = :
12137
+PRE_INSTALL = :
12138
+POST_INSTALL = :
12139
+NORMAL_UNINSTALL = :
12140
+PRE_UNINSTALL = :
12141
+POST_UNINSTALL = :
12142
+build_triplet = @build@
12143
+host_triplet = @host@
12144
+subdir = themes/ubuntu-logo
12145
+DIST_COMMON = $(dist_theme_DATA) $(srcdir)/Makefile.am \
12146
+ $(srcdir)/Makefile.in
12147
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
12148
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
12149
+ $(top_srcdir)/configure.ac
12150
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
12151
+ $(ACLOCAL_M4)
12152
+mkinstalldirs = $(install_sh) -d
12153
+CONFIG_HEADER = $(top_builddir)/config.h
12154
+CONFIG_CLEAN_FILES =
12155
+CONFIG_CLEAN_VPATH_FILES =
12156
+AM_V_GEN = $(am__v_GEN_$(V))
12157
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
12158
+am__v_GEN_0 = @echo " GEN " $@;
12159
+AM_V_at = $(am__v_at_$(V))
12160
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
12161
+am__v_at_0 = @
12162
+SOURCES =
12163
+DIST_SOURCES =
12164
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
12165
+am__vpath_adj = case $$p in \
12166
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
12167
+ *) f=$$p;; \
12168
+ esac;
12169
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
12170
+am__install_max = 40
12171
+am__nobase_strip_setup = \
12172
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
12173
+am__nobase_strip = \
12174
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
12175
+am__nobase_list = $(am__nobase_strip_setup); \
12176
+ for p in $$list; do echo "$$p $$p"; done | \
12177
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
12178
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
12179
+ if (++n[$$2] == $(am__install_max)) \
12180
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
12181
+ END { for (dir in files) print dir, files[dir] }'
12182
+am__base_list = \
12183
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
12184
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
12185
+am__installdirs = "$(DESTDIR)$(themedir)" "$(DESTDIR)$(themedir)"
12186
+DATA = $(dist_theme_DATA) $(nodist_theme_DATA)
12187
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
12188
+ACLOCAL = @ACLOCAL@
12189
+AMTAR = @AMTAR@
12190
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
12191
+AR = @AR@
12192
+AUTOCONF = @AUTOCONF@
12193
+AUTOHEADER = @AUTOHEADER@
12194
+AUTOMAKE = @AUTOMAKE@
12195
+AWK = @AWK@
12196
+CC = @CC@
12197
+CCDEPMODE = @CCDEPMODE@
12198
+CFLAGS = @CFLAGS@
12199
+CPP = @CPP@
12200
+CPPFLAGS = @CPPFLAGS@
12201
+CYGPATH_W = @CYGPATH_W@
12202
+DEFS = @DEFS@
12203
+DEPDIR = @DEPDIR@
12204
+DRM_CFLAGS = @DRM_CFLAGS@
12205
+DRM_LIBS = @DRM_LIBS@
12206
+DSYMUTIL = @DSYMUTIL@
12207
+DUMPBIN = @DUMPBIN@
12208
+ECHO_C = @ECHO_C@
12209
+ECHO_N = @ECHO_N@
12210
+ECHO_T = @ECHO_T@
12211
+EGREP = @EGREP@
12212
+EXEEXT = @EXEEXT@
12213
+FGREP = @FGREP@
12214
+GREP = @GREP@
12215
+GTK_CFLAGS = @GTK_CFLAGS@
12216
+GTK_LIBS = @GTK_LIBS@
12217
+IMAGE_CFLAGS = @IMAGE_CFLAGS@
12218
+IMAGE_LIBS = @IMAGE_LIBS@
12219
+INSTALL = @INSTALL@
12220
+INSTALL_DATA = @INSTALL_DATA@
12221
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
12222
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
12223
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
12224
+LD = @LD@
12225
+LDFLAGS = @LDFLAGS@
12226
+LIBOBJS = @LIBOBJS@
12227
+LIBS = @LIBS@
12228
+LIBTOOL = @LIBTOOL@
12229
+LIPO = @LIPO@
12230
+LN_S = @LN_S@
12231
+LTLIBOBJS = @LTLIBOBJS@
12232
+LT_AGE = @LT_AGE@
12233
+LT_CURRENT = @LT_CURRENT@
12234
+LT_REVISION = @LT_REVISION@
12235
+MAINT = @MAINT@
12236
+MAKEINFO = @MAKEINFO@
12237
+MKDIR_P = @MKDIR_P@
12238
+NM = @NM@
12239
+NMEDIT = @NMEDIT@
12240
+OBJDUMP = @OBJDUMP@
12241
+OBJEXT = @OBJEXT@
12242
+OTOOL = @OTOOL@
12243
+OTOOL64 = @OTOOL64@
12244
+PACKAGE = @PACKAGE@
12245
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
12246
+PACKAGE_NAME = @PACKAGE_NAME@
12247
+PACKAGE_STRING = @PACKAGE_STRING@
12248
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
12249
+PACKAGE_URL = @PACKAGE_URL@
12250
+PACKAGE_VERSION = @PACKAGE_VERSION@
12251
+PANGO_CFLAGS = @PANGO_CFLAGS@
12252
+PANGO_LIBS = @PANGO_LIBS@
12253
+PATH_SEPARATOR = @PATH_SEPARATOR@
12254
+PKG_CONFIG = @PKG_CONFIG@
12255
+PLYMOUTH_CFLAGS = @PLYMOUTH_CFLAGS@
12256
+PLYMOUTH_CONF_DIR = @PLYMOUTH_CONF_DIR@
12257
+PLYMOUTH_DATADIR = @PLYMOUTH_DATADIR@
12258
+PLYMOUTH_LIBDIR = @PLYMOUTH_LIBDIR@
12259
+PLYMOUTH_LIBEXECDIR = @PLYMOUTH_LIBEXECDIR@
12260
+PLYMOUTH_LIBS = @PLYMOUTH_LIBS@
12261
+PLYMOUTH_PLUGIN_PATH = @PLYMOUTH_PLUGIN_PATH@
12262
+PLYMOUTH_POLICY_DIR = @PLYMOUTH_POLICY_DIR@
12263
+PLYMOUTH_THEME_PATH = @PLYMOUTH_THEME_PATH@
12264
+RANLIB = @RANLIB@
12265
+RELEASE_FILE = @RELEASE_FILE@
12266
+SED = @SED@
12267
+SET_MAKE = @SET_MAKE@
12268
+SHELL = @SHELL@
12269
+STRIP = @STRIP@
12270
+VERSION = @VERSION@
12271
+abs_builddir = @abs_builddir@
12272
+abs_srcdir = @abs_srcdir@
12273
+abs_top_builddir = @abs_top_builddir@
12274
+abs_top_srcdir = @abs_top_srcdir@
12275
+ac_ct_CC = @ac_ct_CC@
12276
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
12277
+am__include = @am__include@
12278
+am__leading_dot = @am__leading_dot@
12279
+am__quote = @am__quote@
12280
+am__tar = @am__tar@
12281
+am__untar = @am__untar@
12282
+background_color = @background_color@
12283
+background_end_color = @background_end_color@
12284
+background_start_color = @background_start_color@
12285
+bindir = @bindir@
12286
+build = @build@
12287
+build_alias = @build_alias@
12288
+build_cpu = @build_cpu@
12289
+build_os = @build_os@
12290
+build_vendor = @build_vendor@
12291
+builddir = @builddir@
12292
+datadir = @datadir@
12293
+datarootdir = @datarootdir@
12294
+docdir = @docdir@
12295
+dvidir = @dvidir@
12296
+exec_prefix = @exec_prefix@
12297
+host = @host@
12298
+host_alias = @host_alias@
12299
+host_cpu = @host_cpu@
12300
+host_os = @host_os@
12301
+host_vendor = @host_vendor@
12302
+htmldir = @htmldir@
12303
+includedir = @includedir@
12304
+infodir = @infodir@
12305
+install_sh = @install_sh@
12306
+libdir = @libdir@
12307
+libexecdir = @libexecdir@
12308
+localedir = @localedir@
12309
+localstatedir = @localstatedir@
12310
+logofile = @logofile@
12311
+lt_ECHO = @lt_ECHO@
12312
+mandir = @mandir@
12313
+mkdir_p = @mkdir_p@
12314
+oldincludedir = @oldincludedir@
12315
+pdfdir = @pdfdir@
12316
+plymouthclientdir = @plymouthclientdir@
12317
+plymouthdaemondir = @plymouthdaemondir@
12318
+prefix = @prefix@
12319
+program_transform_name = @program_transform_name@
12320
+psdir = @psdir@
12321
+sbindir = @sbindir@
12322
+sharedstatedir = @sharedstatedir@
12323
+srcdir = @srcdir@
12324
+sysconfdir = @sysconfdir@
12325
+target_alias = @target_alias@
12326
+top_build_prefix = @top_build_prefix@
12327
+top_builddir = @top_builddir@
12328
+top_srcdir = @top_srcdir@
12329
+themedir = $(datadir)/plymouth/themes/ubuntu-logo
12330
+nodist_theme_DATA = ubuntu-logo.plymouth
12331
+dist_theme_DATA = ubuntu-logo.script \
12332
+ ubuntu_logo.png \
12333
+ ubuntu_logo16.png \
12334
+ password_field.png \
12335
+ password_field16.png \
12336
+ progress_dot_off.png \
12337
+ progress_dot_off16.png \
12338
+ progress_dot_on.png \
12339
+ progress_dot_on16.png
12340
+
12341
+MAINTAINERCLEANFILES = Makefile.in ubuntu-logo.plymouth
12342
+CLEANFILES = ubuntu-logo.plymouth
12343
+EXTRA_DIST = ubuntu-logo.plymouth.in
12344
+all: all-am
12345
+
12346
+.SUFFIXES:
12347
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
12348
+ @for dep in $?; do \
12349
+ case '$(am__configure_deps)' in \
12350
+ *$$dep*) \
12351
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
12352
+ && { if test -f $@; then exit 0; else break; fi; }; \
12353
+ exit 1;; \
12354
+ esac; \
12355
+ done; \
12356
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu themes/ubuntu-logo/Makefile'; \
12357
+ $(am__cd) $(top_srcdir) && \
12358
+ $(AUTOMAKE) --gnu themes/ubuntu-logo/Makefile
12359
+.PRECIOUS: Makefile
12360
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
12361
+ @case '$?' in \
12362
+ *config.status*) \
12363
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
12364
+ *) \
12365
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
12366
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
12367
+ esac;
12368
+
12369
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
12370
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
12371
+
12372
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
12373
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
12374
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
12375
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
12376
+$(am__aclocal_m4_deps):
12377
+
12378
+mostlyclean-libtool:
12379
+ -rm -f *.lo
12380
+
12381
+clean-libtool:
12382
+ -rm -rf .libs _libs
12383
+install-dist_themeDATA: $(dist_theme_DATA)
12384
+ @$(NORMAL_INSTALL)
12385
+ test -z "$(themedir)" || $(MKDIR_P) "$(DESTDIR)$(themedir)"
12386
+ @list='$(dist_theme_DATA)'; test -n "$(themedir)" || list=; \
12387
+ for p in $$list; do \
12388
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
12389
+ echo "$$d$$p"; \
12390
+ done | $(am__base_list) | \
12391
+ while read files; do \
12392
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(themedir)'"; \
12393
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(themedir)" || exit $$?; \
12394
+ done
12395
+
12396
+uninstall-dist_themeDATA:
12397
+ @$(NORMAL_UNINSTALL)
12398
+ @list='$(dist_theme_DATA)'; test -n "$(themedir)" || list=; \
12399
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
12400
+ test -n "$$files" || exit 0; \
12401
+ echo " ( cd '$(DESTDIR)$(themedir)' && rm -f" $$files ")"; \
12402
+ cd "$(DESTDIR)$(themedir)" && rm -f $$files
12403
+install-nodist_themeDATA: $(nodist_theme_DATA)
12404
+ @$(NORMAL_INSTALL)
12405
+ test -z "$(themedir)" || $(MKDIR_P) "$(DESTDIR)$(themedir)"
12406
+ @list='$(nodist_theme_DATA)'; test -n "$(themedir)" || list=; \
12407
+ for p in $$list; do \
12408
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
12409
+ echo "$$d$$p"; \
12410
+ done | $(am__base_list) | \
12411
+ while read files; do \
12412
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(themedir)'"; \
12413
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(themedir)" || exit $$?; \
12414
+ done
12415
+
12416
+uninstall-nodist_themeDATA:
12417
+ @$(NORMAL_UNINSTALL)
12418
+ @list='$(nodist_theme_DATA)'; test -n "$(themedir)" || list=; \
12419
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
12420
+ test -n "$$files" || exit 0; \
12421
+ echo " ( cd '$(DESTDIR)$(themedir)' && rm -f" $$files ")"; \
12422
+ cd "$(DESTDIR)$(themedir)" && rm -f $$files
12423
+tags: TAGS
12424
+TAGS:
12425
+
12426
+ctags: CTAGS
12427
+CTAGS:
12428
+
12429
+
12430
+distdir: $(DISTFILES)
12431
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
12432
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
12433
+ list='$(DISTFILES)'; \
12434
+ dist_files=`for file in $$list; do echo $$file; done | \
12435
+ sed -e "s|^$$srcdirstrip/||;t" \
12436
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
12437
+ case $$dist_files in \
12438
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
12439
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
12440
+ sort -u` ;; \
12441
+ esac; \
12442
+ for file in $$dist_files; do \
12443
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
12444
+ if test -d $$d/$$file; then \
12445
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
12446
+ if test -d "$(distdir)/$$file"; then \
12447
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
12448
+ fi; \
12449
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
12450
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
12451
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
12452
+ fi; \
12453
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
12454
+ else \
12455
+ test -f "$(distdir)/$$file" \
12456
+ || cp -p $$d/$$file "$(distdir)/$$file" \
12457
+ || exit 1; \
12458
+ fi; \
12459
+ done
12460
+check-am: all-am
12461
+check: check-am
12462
+all-am: Makefile $(DATA)
12463
+installdirs:
12464
+ for dir in "$(DESTDIR)$(themedir)" "$(DESTDIR)$(themedir)"; do \
12465
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
12466
+ done
12467
+install: install-am
12468
+install-exec: install-exec-am
12469
+install-data: install-data-am
12470
+uninstall: uninstall-am
12471
+
12472
+install-am: all-am
12473
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
12474
+
12475
+installcheck: installcheck-am
12476
+install-strip:
12477
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
12478
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
12479
+ `test -z '$(STRIP)' || \
12480
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
12481
+mostlyclean-generic:
12482
+
12483
+clean-generic:
12484
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
12485
+
12486
+distclean-generic:
12487
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
12488
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
12489
+
12490
+maintainer-clean-generic:
12491
+ @echo "This command is intended for maintainers to use"
12492
+ @echo "it deletes files that may require special tools to rebuild."
12493
+ -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
12494
+clean: clean-am
12495
+
12496
+clean-am: clean-generic clean-libtool mostlyclean-am
12497
+
12498
+distclean: distclean-am
12499
+ -rm -f Makefile
12500
+distclean-am: clean-am distclean-generic
12501
+
12502
+dvi: dvi-am
12503
+
12504
+dvi-am:
12505
+
12506
+html: html-am
12507
+
12508
+html-am:
12509
+
12510
+info: info-am
12511
+
12512
+info-am:
12513
+
12514
+install-data-am: install-dist_themeDATA install-nodist_themeDATA
12515
+
12516
+install-dvi: install-dvi-am
12517
+
12518
+install-dvi-am:
12519
+
12520
+install-exec-am:
12521
+
12522
+install-html: install-html-am
12523
+
12524
+install-html-am:
12525
+
12526
+install-info: install-info-am
12527
+
12528
+install-info-am:
12529
+
12530
+install-man:
12531
+
12532
+install-pdf: install-pdf-am
12533
+
12534
+install-pdf-am:
12535
+
12536
+install-ps: install-ps-am
12537
+
12538
+install-ps-am:
12539
+
12540
+installcheck-am:
12541
+
12542
+maintainer-clean: maintainer-clean-am
12543
+ -rm -f Makefile
12544
+maintainer-clean-am: distclean-am maintainer-clean-generic
12545
+
12546
+mostlyclean: mostlyclean-am
12547
+
12548
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
12549
+
12550
+pdf: pdf-am
12551
+
12552
+pdf-am:
12553
+
12554
+ps: ps-am
12555
+
12556
+ps-am:
12557
+
12558
+uninstall-am: uninstall-dist_themeDATA uninstall-nodist_themeDATA
12559
+
12560
+.MAKE: install-am install-strip
12561
+
12562
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
12563
+ distclean distclean-generic distclean-libtool distdir dvi \
12564
+ dvi-am html html-am info info-am install install-am \
12565
+ install-data install-data-am install-dist_themeDATA \
12566
+ install-dvi install-dvi-am install-exec install-exec-am \
12567
+ install-html install-html-am install-info install-info-am \
12568
+ install-man install-nodist_themeDATA install-pdf \
12569
+ install-pdf-am install-ps install-ps-am install-strip \
12570
+ installcheck installcheck-am installdirs maintainer-clean \
12571
+ maintainer-clean-generic mostlyclean mostlyclean-generic \
12572
+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
12573
+ uninstall-dist_themeDATA uninstall-nodist_themeDATA
12574
+
12575
+
12576
+ubuntu-logo.plymouth: $(srcdir)/ubuntu-logo.plymouth.in
12577
+ sed -e 's,[@]PLYMOUTH_THEME_PATH[@],$(PLYMOUTH_THEME_PATH),g' \
12578
+ $(srcdir)/ubuntu-logo.plymouth.in > ubuntu-logo.plymouth
12579
+
12580
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
12581
+# Otherwise a system limit (for SysV at least) may be exceeded.
12582
+.NOEXPORT:
12583
--- plymouth-0.8.2.orig/themes/text/Makefile.in
12584
+++ plymouth-0.8.2/themes/text/Makefile.in
12585
@@ -139,6 +139,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
12586
PACKAGE_NAME = @PACKAGE_NAME@
12587
PACKAGE_STRING = @PACKAGE_STRING@
12588
PACKAGE_TARNAME = @PACKAGE_TARNAME@
12589
+PACKAGE_URL = @PACKAGE_URL@
12590
PACKAGE_VERSION = @PACKAGE_VERSION@
12591
PANGO_CFLAGS = @PANGO_CFLAGS@
12592
PANGO_LIBS = @PANGO_LIBS@
12593
--- plymouth-0.8.2.orig/themes/fade-in/Makefile.in
12594
+++ plymouth-0.8.2/themes/fade-in/Makefile.in
12595
@@ -139,6 +139,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
12596
PACKAGE_NAME = @PACKAGE_NAME@
12597
PACKAGE_STRING = @PACKAGE_STRING@
12598
PACKAGE_TARNAME = @PACKAGE_TARNAME@
12599
+PACKAGE_URL = @PACKAGE_URL@
12600
PACKAGE_VERSION = @PACKAGE_VERSION@
12601
PANGO_CFLAGS = @PANGO_CFLAGS@
12602
PANGO_LIBS = @PANGO_LIBS@
12603
--- /dev/null
12604
+++ plymouth-0.8.2/themes/ubuntu-text/ubuntu-text.plymouth
12605
@@ -0,0 +1,4 @@
12606
+[Plymouth Theme]
12607
+Name=Ubuntu Text
12608
+Description=Text mode theme based on ubuntu-logo theme
12609
+ModuleName=ubuntu-text
12610
--- /dev/null
12611
+++ plymouth-0.8.2/themes/ubuntu-text/Makefile.am
12612
@@ -0,0 +1,4 @@
12613
+themedir = $(datadir)/plymouth/themes/ubuntu-text
12614
+dist_theme_DATA = ubuntu-text.plymouth
12615
+
12616
+MAINTAINERCLEANFILES = Makefile.in
12617
--- /dev/null
12618
+++ plymouth-0.8.2/themes/ubuntu-text/Makefile.in
12619
@@ -0,0 +1,437 @@
12620
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
12621
+# @configure_input@
12622
+
12623
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
12624
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
12625
+# Inc.
12626
+# This Makefile.in is free software; the Free Software Foundation
12627
+# gives unlimited permission to copy and/or distribute it,
12628
+# with or without modifications, as long as this notice is preserved.
12629
+
12630
+# This program is distributed in the hope that it will be useful,
12631
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
12632
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
12633
+# PARTICULAR PURPOSE.
12634
+
12635
+@SET_MAKE@
12636
+
12637
+VPATH = @srcdir@
12638
+pkgdatadir = $(datadir)/@PACKAGE@
12639
+pkgincludedir = $(includedir)/@PACKAGE@
12640
+pkglibdir = $(libdir)/@PACKAGE@
12641
+pkglibexecdir = $(libexecdir)/@PACKAGE@
12642
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
12643
+install_sh_DATA = $(install_sh) -c -m 644
12644
+install_sh_PROGRAM = $(install_sh) -c
12645
+install_sh_SCRIPT = $(install_sh) -c
12646
+INSTALL_HEADER = $(INSTALL_DATA)
12647
+transform = $(program_transform_name)
12648
+NORMAL_INSTALL = :
12649
+PRE_INSTALL = :
12650
+POST_INSTALL = :
12651
+NORMAL_UNINSTALL = :
12652
+PRE_UNINSTALL = :
12653
+POST_UNINSTALL = :
12654
+build_triplet = @build@
12655
+host_triplet = @host@
12656
+subdir = themes/ubuntu-text
12657
+DIST_COMMON = $(dist_theme_DATA) $(srcdir)/Makefile.am \
12658
+ $(srcdir)/Makefile.in
12659
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
12660
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
12661
+ $(top_srcdir)/configure.ac
12662
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
12663
+ $(ACLOCAL_M4)
12664
+mkinstalldirs = $(install_sh) -d
12665
+CONFIG_HEADER = $(top_builddir)/config.h
12666
+CONFIG_CLEAN_FILES =
12667
+CONFIG_CLEAN_VPATH_FILES =
12668
+AM_V_GEN = $(am__v_GEN_$(V))
12669
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
12670
+am__v_GEN_0 = @echo " GEN " $@;
12671
+AM_V_at = $(am__v_at_$(V))
12672
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
12673
+am__v_at_0 = @
12674
+SOURCES =
12675
+DIST_SOURCES =
12676
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
12677
+am__vpath_adj = case $$p in \
12678
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
12679
+ *) f=$$p;; \
12680
+ esac;
12681
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
12682
+am__install_max = 40
12683
+am__nobase_strip_setup = \
12684
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
12685
+am__nobase_strip = \
12686
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
12687
+am__nobase_list = $(am__nobase_strip_setup); \
12688
+ for p in $$list; do echo "$$p $$p"; done | \
12689
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
12690
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
12691
+ if (++n[$$2] == $(am__install_max)) \
12692
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
12693
+ END { for (dir in files) print dir, files[dir] }'
12694
+am__base_list = \
12695
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
12696
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
12697
+am__installdirs = "$(DESTDIR)$(themedir)"
12698
+DATA = $(dist_theme_DATA)
12699
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
12700
+ACLOCAL = @ACLOCAL@
12701
+AMTAR = @AMTAR@
12702
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
12703
+AR = @AR@
12704
+AUTOCONF = @AUTOCONF@
12705
+AUTOHEADER = @AUTOHEADER@
12706
+AUTOMAKE = @AUTOMAKE@
12707
+AWK = @AWK@
12708
+CC = @CC@
12709
+CCDEPMODE = @CCDEPMODE@
12710
+CFLAGS = @CFLAGS@
12711
+CPP = @CPP@
12712
+CPPFLAGS = @CPPFLAGS@
12713
+CYGPATH_W = @CYGPATH_W@
12714
+DEFS = @DEFS@
12715
+DEPDIR = @DEPDIR@
12716
+DRM_CFLAGS = @DRM_CFLAGS@
12717
+DRM_LIBS = @DRM_LIBS@
12718
+DSYMUTIL = @DSYMUTIL@
12719
+DUMPBIN = @DUMPBIN@
12720
+ECHO_C = @ECHO_C@
12721
+ECHO_N = @ECHO_N@
12722
+ECHO_T = @ECHO_T@
12723
+EGREP = @EGREP@
12724
+EXEEXT = @EXEEXT@
12725
+FGREP = @FGREP@
12726
+GREP = @GREP@
12727
+GTK_CFLAGS = @GTK_CFLAGS@
12728
+GTK_LIBS = @GTK_LIBS@
12729
+IMAGE_CFLAGS = @IMAGE_CFLAGS@
12730
+IMAGE_LIBS = @IMAGE_LIBS@
12731
+INSTALL = @INSTALL@
12732
+INSTALL_DATA = @INSTALL_DATA@
12733
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
12734
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
12735
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
12736
+LD = @LD@
12737
+LDFLAGS = @LDFLAGS@
12738
+LIBOBJS = @LIBOBJS@
12739
+LIBS = @LIBS@
12740
+LIBTOOL = @LIBTOOL@
12741
+LIPO = @LIPO@
12742
+LN_S = @LN_S@
12743
+LTLIBOBJS = @LTLIBOBJS@
12744
+LT_AGE = @LT_AGE@
12745
+LT_CURRENT = @LT_CURRENT@
12746
+LT_REVISION = @LT_REVISION@
12747
+MAINT = @MAINT@
12748
+MAKEINFO = @MAKEINFO@
12749
+MKDIR_P = @MKDIR_P@
12750
+NM = @NM@
12751
+NMEDIT = @NMEDIT@
12752
+OBJDUMP = @OBJDUMP@
12753
+OBJEXT = @OBJEXT@
12754
+OTOOL = @OTOOL@
12755
+OTOOL64 = @OTOOL64@
12756
+PACKAGE = @PACKAGE@
12757
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
12758
+PACKAGE_NAME = @PACKAGE_NAME@
12759
+PACKAGE_STRING = @PACKAGE_STRING@
12760
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
12761
+PACKAGE_URL = @PACKAGE_URL@
12762
+PACKAGE_VERSION = @PACKAGE_VERSION@
12763
+PANGO_CFLAGS = @PANGO_CFLAGS@
12764
+PANGO_LIBS = @PANGO_LIBS@
12765
+PATH_SEPARATOR = @PATH_SEPARATOR@
12766
+PKG_CONFIG = @PKG_CONFIG@
12767
+PLYMOUTH_CFLAGS = @PLYMOUTH_CFLAGS@
12768
+PLYMOUTH_CONF_DIR = @PLYMOUTH_CONF_DIR@
12769
+PLYMOUTH_DATADIR = @PLYMOUTH_DATADIR@
12770
+PLYMOUTH_LIBDIR = @PLYMOUTH_LIBDIR@
12771
+PLYMOUTH_LIBEXECDIR = @PLYMOUTH_LIBEXECDIR@
12772
+PLYMOUTH_LIBS = @PLYMOUTH_LIBS@
12773
+PLYMOUTH_PLUGIN_PATH = @PLYMOUTH_PLUGIN_PATH@
12774
+PLYMOUTH_POLICY_DIR = @PLYMOUTH_POLICY_DIR@
12775
+PLYMOUTH_THEME_PATH = @PLYMOUTH_THEME_PATH@
12776
+RANLIB = @RANLIB@
12777
+RELEASE_FILE = @RELEASE_FILE@
12778
+SED = @SED@
12779
+SET_MAKE = @SET_MAKE@
12780
+SHELL = @SHELL@
12781
+STRIP = @STRIP@
12782
+VERSION = @VERSION@
12783
+abs_builddir = @abs_builddir@
12784
+abs_srcdir = @abs_srcdir@
12785
+abs_top_builddir = @abs_top_builddir@
12786
+abs_top_srcdir = @abs_top_srcdir@
12787
+ac_ct_CC = @ac_ct_CC@
12788
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
12789
+am__include = @am__include@
12790
+am__leading_dot = @am__leading_dot@
12791
+am__quote = @am__quote@
12792
+am__tar = @am__tar@
12793
+am__untar = @am__untar@
12794
+background_color = @background_color@
12795
+background_end_color = @background_end_color@
12796
+background_start_color = @background_start_color@
12797
+bindir = @bindir@
12798
+build = @build@
12799
+build_alias = @build_alias@
12800
+build_cpu = @build_cpu@
12801
+build_os = @build_os@
12802
+build_vendor = @build_vendor@
12803
+builddir = @builddir@
12804
+datadir = @datadir@
12805
+datarootdir = @datarootdir@
12806
+docdir = @docdir@
12807
+dvidir = @dvidir@
12808
+exec_prefix = @exec_prefix@
12809
+host = @host@
12810
+host_alias = @host_alias@
12811
+host_cpu = @host_cpu@
12812
+host_os = @host_os@
12813
+host_vendor = @host_vendor@
12814
+htmldir = @htmldir@
12815
+includedir = @includedir@
12816
+infodir = @infodir@
12817
+install_sh = @install_sh@
12818
+libdir = @libdir@
12819
+libexecdir = @libexecdir@
12820
+localedir = @localedir@
12821
+localstatedir = @localstatedir@
12822
+logofile = @logofile@
12823
+lt_ECHO = @lt_ECHO@
12824
+mandir = @mandir@
12825
+mkdir_p = @mkdir_p@
12826
+oldincludedir = @oldincludedir@
12827
+pdfdir = @pdfdir@
12828
+plymouthclientdir = @plymouthclientdir@
12829
+plymouthdaemondir = @plymouthdaemondir@
12830
+prefix = @prefix@
12831
+program_transform_name = @program_transform_name@
12832
+psdir = @psdir@
12833
+sbindir = @sbindir@
12834
+sharedstatedir = @sharedstatedir@
12835
+srcdir = @srcdir@
12836
+sysconfdir = @sysconfdir@
12837
+target_alias = @target_alias@
12838
+top_build_prefix = @top_build_prefix@
12839
+top_builddir = @top_builddir@
12840
+top_srcdir = @top_srcdir@
12841
+themedir = $(datadir)/plymouth/themes/ubuntu-text
12842
+dist_theme_DATA = ubuntu-text.plymouth
12843
+MAINTAINERCLEANFILES = Makefile.in
12844
+all: all-am
12845
+
12846
+.SUFFIXES:
12847
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
12848
+ @for dep in $?; do \
12849
+ case '$(am__configure_deps)' in \
12850
+ *$$dep*) \
12851
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
12852
+ && { if test -f $@; then exit 0; else break; fi; }; \
12853
+ exit 1;; \
12854
+ esac; \
12855
+ done; \
12856
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu themes/ubuntu-text/Makefile'; \
12857
+ $(am__cd) $(top_srcdir) && \
12858
+ $(AUTOMAKE) --gnu themes/ubuntu-text/Makefile
12859
+.PRECIOUS: Makefile
12860
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
12861
+ @case '$?' in \
12862
+ *config.status*) \
12863
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
12864
+ *) \
12865
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
12866
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
12867
+ esac;
12868
+
12869
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
12870
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
12871
+
12872
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
12873
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
12874
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
12875
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
12876
+$(am__aclocal_m4_deps):
12877
+
12878
+mostlyclean-libtool:
12879
+ -rm -f *.lo
12880
+
12881
+clean-libtool:
12882
+ -rm -rf .libs _libs
12883
+install-dist_themeDATA: $(dist_theme_DATA)
12884
+ @$(NORMAL_INSTALL)
12885
+ test -z "$(themedir)" || $(MKDIR_P) "$(DESTDIR)$(themedir)"
12886
+ @list='$(dist_theme_DATA)'; test -n "$(themedir)" || list=; \
12887
+ for p in $$list; do \
12888
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
12889
+ echo "$$d$$p"; \
12890
+ done | $(am__base_list) | \
12891
+ while read files; do \
12892
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(themedir)'"; \
12893
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(themedir)" || exit $$?; \
12894
+ done
12895
+
12896
+uninstall-dist_themeDATA:
12897
+ @$(NORMAL_UNINSTALL)
12898
+ @list='$(dist_theme_DATA)'; test -n "$(themedir)" || list=; \
12899
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
12900
+ test -n "$$files" || exit 0; \
12901
+ echo " ( cd '$(DESTDIR)$(themedir)' && rm -f" $$files ")"; \
12902
+ cd "$(DESTDIR)$(themedir)" && rm -f $$files
12903
+tags: TAGS
12904
+TAGS:
12905
+
12906
+ctags: CTAGS
12907
+CTAGS:
12908
+
12909
+
12910
+distdir: $(DISTFILES)
12911
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
12912
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
12913
+ list='$(DISTFILES)'; \
12914
+ dist_files=`for file in $$list; do echo $$file; done | \
12915
+ sed -e "s|^$$srcdirstrip/||;t" \
12916
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
12917
+ case $$dist_files in \
12918
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
12919
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
12920
+ sort -u` ;; \
12921
+ esac; \
12922
+ for file in $$dist_files; do \
12923
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
12924
+ if test -d $$d/$$file; then \
12925
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
12926
+ if test -d "$(distdir)/$$file"; then \
12927
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
12928
+ fi; \
12929
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
12930
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
12931
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
12932
+ fi; \
12933
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
12934
+ else \
12935
+ test -f "$(distdir)/$$file" \
12936
+ || cp -p $$d/$$file "$(distdir)/$$file" \
12937
+ || exit 1; \
12938
+ fi; \
12939
+ done
12940
+check-am: all-am
12941
+check: check-am
12942
+all-am: Makefile $(DATA)
12943
+installdirs:
12944
+ for dir in "$(DESTDIR)$(themedir)"; do \
12945
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
12946
+ done
12947
+install: install-am
12948
+install-exec: install-exec-am
12949
+install-data: install-data-am
12950
+uninstall: uninstall-am
12951
+
12952
+install-am: all-am
12953
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
12954
+
12955
+installcheck: installcheck-am
12956
+install-strip:
12957
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
12958
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
12959
+ `test -z '$(STRIP)' || \
12960
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
12961
+mostlyclean-generic:
12962
+
12963
+clean-generic:
12964
+
12965
+distclean-generic:
12966
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
12967
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
12968
+
12969
+maintainer-clean-generic:
12970
+ @echo "This command is intended for maintainers to use"
12971
+ @echo "it deletes files that may require special tools to rebuild."
12972
+ -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
12973
+clean: clean-am
12974
+
12975
+clean-am: clean-generic clean-libtool mostlyclean-am
12976
+
12977
+distclean: distclean-am
12978
+ -rm -f Makefile
12979
+distclean-am: clean-am distclean-generic
12980
+
12981
+dvi: dvi-am
12982
+
12983
+dvi-am:
12984
+
12985
+html: html-am
12986
+
12987
+html-am:
12988
+
12989
+info: info-am
12990
+
12991
+info-am:
12992
+
12993
+install-data-am: install-dist_themeDATA
12994
+
12995
+install-dvi: install-dvi-am
12996
+
12997
+install-dvi-am:
12998
+
12999
+install-exec-am:
13000
+
13001
+install-html: install-html-am
13002
+
13003
+install-html-am:
13004
+
13005
+install-info: install-info-am
13006
+
13007
+install-info-am:
13008
+
13009
+install-man:
13010
+
13011
+install-pdf: install-pdf-am
13012
+
13013
+install-pdf-am:
13014
+
13015
+install-ps: install-ps-am
13016
+
13017
+install-ps-am:
13018
+
13019
+installcheck-am:
13020
+
13021
+maintainer-clean: maintainer-clean-am
13022
+ -rm -f Makefile
13023
+maintainer-clean-am: distclean-am maintainer-clean-generic
13024
+
13025
+mostlyclean: mostlyclean-am
13026
+
13027
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
13028
+
13029
+pdf: pdf-am
13030
+
13031
+pdf-am:
13032
+
13033
+ps: ps-am
13034
+
13035
+ps-am:
13036
+
13037
+uninstall-am: uninstall-dist_themeDATA
13038
+
13039
+.MAKE: install-am install-strip
13040
+
13041
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
13042
+ distclean distclean-generic distclean-libtool distdir dvi \
13043
+ dvi-am html html-am info info-am install install-am \
13044
+ install-data install-data-am install-dist_themeDATA \
13045
+ install-dvi install-dvi-am install-exec install-exec-am \
13046
+ install-html install-html-am install-info install-info-am \
13047
+ install-man install-pdf install-pdf-am install-ps \
13048
+ install-ps-am install-strip installcheck installcheck-am \
13049
+ installdirs maintainer-clean maintainer-clean-generic \
13050
+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
13051
+ ps ps-am uninstall uninstall-am uninstall-dist_themeDATA
13052
+
13053
+
13054
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
13055
+# Otherwise a system limit (for SysV at least) may be exceeded.
13056
+.NOEXPORT:
13057
--- plymouth-0.8.2.orig/themes/details/Makefile.in
13058
+++ plymouth-0.8.2/themes/details/Makefile.in
13059
@@ -139,6 +139,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
13060
PACKAGE_NAME = @PACKAGE_NAME@
13061
PACKAGE_STRING = @PACKAGE_STRING@
13062
PACKAGE_TARNAME = @PACKAGE_TARNAME@
13063
+PACKAGE_URL = @PACKAGE_URL@
13064
PACKAGE_VERSION = @PACKAGE_VERSION@
13065
PANGO_CFLAGS = @PANGO_CFLAGS@
13066
PANGO_LIBS = @PANGO_LIBS@
13067
--- plymouth-0.8.2.orig/themes/solar/Makefile.in
13068
+++ plymouth-0.8.2/themes/solar/Makefile.in
13069
@@ -139,6 +139,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
13070
PACKAGE_NAME = @PACKAGE_NAME@
13071
PACKAGE_STRING = @PACKAGE_STRING@
13072
PACKAGE_TARNAME = @PACKAGE_TARNAME@
13073
+PACKAGE_URL = @PACKAGE_URL@
13074
PACKAGE_VERSION = @PACKAGE_VERSION@
13075
PANGO_CFLAGS = @PANGO_CFLAGS@
13076
PANGO_LIBS = @PANGO_LIBS@
13077
--- plymouth-0.8.2.orig/themes/spinfinity/Makefile.in
13078
+++ plymouth-0.8.2/themes/spinfinity/Makefile.in
13079
@@ -139,6 +139,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
13080
PACKAGE_NAME = @PACKAGE_NAME@
13081
PACKAGE_STRING = @PACKAGE_STRING@
13082
PACKAGE_TARNAME = @PACKAGE_TARNAME@
13083
+PACKAGE_URL = @PACKAGE_URL@
13084
PACKAGE_VERSION = @PACKAGE_VERSION@
13085
PANGO_CFLAGS = @PANGO_CFLAGS@
13086
PANGO_LIBS = @PANGO_LIBS@
13087
--- plymouth-0.8.2.orig/themes/glow/Makefile.in
13088
+++ plymouth-0.8.2/themes/glow/Makefile.in
13089
@@ -139,6 +139,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
13090
PACKAGE_NAME = @PACKAGE_NAME@
13091
PACKAGE_STRING = @PACKAGE_STRING@
13092
PACKAGE_TARNAME = @PACKAGE_TARNAME@
13093
+PACKAGE_URL = @PACKAGE_URL@
13094
PACKAGE_VERSION = @PACKAGE_VERSION@
13095
PANGO_CFLAGS = @PANGO_CFLAGS@
13096
PANGO_LIBS = @PANGO_LIBS@
13097
--- plymouth-0.8.2.orig/scripts/Makefile.in
13098
+++ plymouth-0.8.2/scripts/Makefile.in
13099
@@ -144,6 +144,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
13100
PACKAGE_NAME = @PACKAGE_NAME@
13101
PACKAGE_STRING = @PACKAGE_STRING@
13102
PACKAGE_TARNAME = @PACKAGE_TARNAME@
13103
+PACKAGE_URL = @PACKAGE_URL@
13104
PACKAGE_VERSION = @PACKAGE_VERSION@
13105
PANGO_CFLAGS = @PANGO_CFLAGS@
13106
PANGO_LIBS = @PANGO_LIBS@
13107
--- plymouth-0.8.2.orig/images/Makefile.in
13108
+++ plymouth-0.8.2/images/Makefile.in
13109
@@ -138,6 +138,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
13100
13110
PACKAGE_NAME = @PACKAGE_NAME@
13101
13111
PACKAGE_STRING = @PACKAGE_STRING@
13102
13112
PACKAGE_TARNAME = @PACKAGE_TARNAME@
13161
13171
}
13162
13172
13163
13173
state.boot_server = start_boot_server (&state);
13164
--- plymouth-0.8.2.orig/src/viewer/Makefile.in
13165
+++ plymouth-0.8.2/src/viewer/Makefile.in
13166
@@ -215,6 +215,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
13167
PACKAGE_NAME = @PACKAGE_NAME@
13168
PACKAGE_STRING = @PACKAGE_STRING@
13169
PACKAGE_TARNAME = @PACKAGE_TARNAME@
13170
+PACKAGE_URL = @PACKAGE_URL@
13171
PACKAGE_VERSION = @PACKAGE_VERSION@
13172
PANGO_CFLAGS = @PANGO_CFLAGS@
13173
PANGO_LIBS = @PANGO_LIBS@
13174
--- plymouth-0.8.2.orig/src/libply-splash-graphics/Makefile.in
13175
+++ plymouth-0.8.2/src/libply-splash-graphics/Makefile.in
13176
@@ -186,6 +186,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
13174
--- plymouth-0.8.2.orig/src/Makefile.in
13175
+++ plymouth-0.8.2/src/Makefile.in
13176
@@ -220,6 +220,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
13177
PACKAGE_NAME = @PACKAGE_NAME@
13178
PACKAGE_STRING = @PACKAGE_STRING@
13179
PACKAGE_TARNAME = @PACKAGE_TARNAME@
13180
+PACKAGE_URL = @PACKAGE_URL@
13181
PACKAGE_VERSION = @PACKAGE_VERSION@
13182
PANGO_CFLAGS = @PANGO_CFLAGS@
13183
PANGO_LIBS = @PANGO_LIBS@
13184
--- plymouth-0.8.2.orig/src/libply/Makefile.in
13185
+++ plymouth-0.8.2/src/libply/Makefile.in
13186
@@ -219,6 +219,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
13187
PACKAGE_NAME = @PACKAGE_NAME@
13188
PACKAGE_STRING = @PACKAGE_STRING@
13189
PACKAGE_TARNAME = @PACKAGE_TARNAME@
13190
+PACKAGE_URL = @PACKAGE_URL@
13191
PACKAGE_VERSION = @PACKAGE_VERSION@
13192
PANGO_CFLAGS = @PANGO_CFLAGS@
13193
PANGO_LIBS = @PANGO_LIBS@
13194
--- plymouth-0.8.2.orig/src/libply/tests/Makefile.in
13195
+++ plymouth-0.8.2/src/libply/tests/Makefile.in
13196
@@ -342,6 +342,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
13197
PACKAGE_NAME = @PACKAGE_NAME@
13198
PACKAGE_STRING = @PACKAGE_STRING@
13199
PACKAGE_TARNAME = @PACKAGE_TARNAME@
13200
+PACKAGE_URL = @PACKAGE_URL@
13201
PACKAGE_VERSION = @PACKAGE_VERSION@
13202
PANGO_CFLAGS = @PANGO_CFLAGS@
13203
PANGO_LIBS = @PANGO_LIBS@
13204
--- plymouth-0.8.2.orig/src/client/ply-boot-client.h
13205
+++ plymouth-0.8.2/src/client/ply-boot-client.h
13206
@@ -129,6 +129,7 @@ void ply_boot_client_ask_daemon_has_acti
13207
ply_boot_client_response_handler_t handler,
13208
ply_boot_client_response_handler_t failed_handler,
13209
void *user_data);
13210
+void ply_boot_client_flush (ply_boot_client_t *client);
13211
void ply_boot_client_disconnect (ply_boot_client_t *client);
13212
void ply_boot_client_attach_to_event_loop (ply_boot_client_t *client,
13213
ply_event_loop_t *loop);
13214
--- plymouth-0.8.2.orig/src/client/ply-boot-client.c
13215
+++ plymouth-0.8.2/src/client/ply-boot-client.c
13216
@@ -743,6 +743,19 @@ ply_boot_client_tell_daemon_about_error
13217
}
13218
13219
void
13220
+ply_boot_client_flush (ply_boot_client_t *client)
13221
+{
13222
+ assert (client != NULL);
13223
+
13224
+ while (ply_list_get_length (client->requests_to_send) > 0)
13225
+ {
13226
+ if (ply_list_get_length (client->requests_waiting_for_replies) > 0)
13227
+ ply_boot_client_process_incoming_replies (client);
13228
+ ply_boot_client_process_pending_requests (client);
13229
+ }
13230
+}
13231
+
13232
+void
13233
ply_boot_client_disconnect (ply_boot_client_t *client)
13234
{
13235
assert (client != NULL);
13236
--- plymouth-0.8.2.orig/src/client/Makefile.in
13237
+++ plymouth-0.8.2/src/client/Makefile.in
13238
@@ -228,6 +228,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
13239
PACKAGE_NAME = @PACKAGE_NAME@
13240
PACKAGE_STRING = @PACKAGE_STRING@
13241
PACKAGE_TARNAME = @PACKAGE_TARNAME@
13242
+PACKAGE_URL = @PACKAGE_URL@
13243
PACKAGE_VERSION = @PACKAGE_VERSION@
13244
PANGO_CFLAGS = @PANGO_CFLAGS@
13245
PANGO_LIBS = @PANGO_LIBS@
13246
--- plymouth-0.8.2.orig/src/client/tests/Makefile.in
13247
+++ plymouth-0.8.2/src/client/tests/Makefile.in
13248
@@ -121,6 +121,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
13177
13249
PACKAGE_NAME = @PACKAGE_NAME@
13178
13250
PACKAGE_STRING = @PACKAGE_STRING@
13179
13251
PACKAGE_TARNAME = @PACKAGE_TARNAME@
13191
13263
PACKAGE_VERSION = @PACKAGE_VERSION@
13192
13264
PANGO_CFLAGS = @PANGO_CFLAGS@
13193
13265
PANGO_LIBS = @PANGO_LIBS@
13194
--- plymouth-0.8.2.orig/src/plugins/splash/Makefile.in
13195
+++ plymouth-0.8.2/src/plugins/splash/Makefile.in
13196
@@ -154,6 +154,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
13197
PACKAGE_NAME = @PACKAGE_NAME@
13198
PACKAGE_STRING = @PACKAGE_STRING@
13199
PACKAGE_TARNAME = @PACKAGE_TARNAME@
13200
+PACKAGE_URL = @PACKAGE_URL@
13201
PACKAGE_VERSION = @PACKAGE_VERSION@
13202
PANGO_CFLAGS = @PANGO_CFLAGS@
13203
PANGO_LIBS = @PANGO_LIBS@
13204
@@ -233,7 +234,7 @@ target_alias = @target_alias@
13205
top_build_prefix = @top_build_prefix@
13206
top_builddir = @top_builddir@
13207
top_srcdir = @top_srcdir@
13208
-SUBDIRS = throbgress fade-throbber text details space-flares two-step script
13209
+SUBDIRS = throbgress fade-throbber text details space-flares two-step script ubuntu-text
13210
MAINTAINERCLEANFILES = Makefile.in
13211
all: all-recursive
13212
13213
--- plymouth-0.8.2.orig/src/plugins/splash/Makefile.am
13214
+++ plymouth-0.8.2/src/plugins/splash/Makefile.am
13215
@@ -1,2 +1,2 @@
13216
-SUBDIRS = throbgress fade-throbber text details space-flares two-step script
13217
+SUBDIRS = throbgress fade-throbber text details space-flares two-step script ubuntu-text
13218
MAINTAINERCLEANFILES = Makefile.in
13219
--- plymouth-0.8.2.orig/src/plugins/splash/details/Makefile.in
13220
+++ plymouth-0.8.2/src/plugins/splash/details/Makefile.in
13221
@@ -172,6 +172,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
13222
PACKAGE_NAME = @PACKAGE_NAME@
13223
PACKAGE_STRING = @PACKAGE_STRING@
13224
PACKAGE_TARNAME = @PACKAGE_TARNAME@
13225
+PACKAGE_URL = @PACKAGE_URL@
13226
PACKAGE_VERSION = @PACKAGE_VERSION@
13227
PANGO_CFLAGS = @PANGO_CFLAGS@
13228
PANGO_LIBS = @PANGO_LIBS@
13229
--- plymouth-0.8.2.orig/src/plugins/splash/details/plugin.c
13230
+++ plymouth-0.8.2/src/plugins/splash/details/plugin.c
13231
@@ -203,7 +203,10 @@ add_text_display (ply_boot_splash_plugin
13232
13233
terminal = ply_text_display_get_terminal (view->display);
13234
if (ply_terminal_open (terminal))
13235
- ply_terminal_activate_vt (terminal);
13236
+ {
13237
+ ply_terminal_set_mode (terminal, PLY_TERMINAL_MODE_TEXT);
13238
+ ply_terminal_activate_vt (terminal);
13239
+ }
13240
13241
ply_list_append_data (plugin->views, view);
13242
}
13243
--- plymouth-0.8.2.orig/src/plugins/splash/fade-throbber/Makefile.in
13244
+++ plymouth-0.8.2/src/plugins/splash/fade-throbber/Makefile.in
13245
@@ -174,6 +174,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
13246
PACKAGE_NAME = @PACKAGE_NAME@
13247
PACKAGE_STRING = @PACKAGE_STRING@
13248
PACKAGE_TARNAME = @PACKAGE_TARNAME@
13249
+PACKAGE_URL = @PACKAGE_URL@
13250
PACKAGE_VERSION = @PACKAGE_VERSION@
13251
PANGO_CFLAGS = @PANGO_CFLAGS@
13252
PANGO_LIBS = @PANGO_LIBS@
13253
--- plymouth-0.8.2.orig/src/plugins/splash/space-flares/Makefile.in
13254
+++ plymouth-0.8.2/src/plugins/splash/space-flares/Makefile.in
13255
@@ -174,6 +174,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
13256
PACKAGE_NAME = @PACKAGE_NAME@
13257
PACKAGE_STRING = @PACKAGE_STRING@
13258
PACKAGE_TARNAME = @PACKAGE_TARNAME@
13259
+PACKAGE_URL = @PACKAGE_URL@
13260
PACKAGE_VERSION = @PACKAGE_VERSION@
13261
PANGO_CFLAGS = @PANGO_CFLAGS@
13262
PANGO_LIBS = @PANGO_LIBS@
13263
--- plymouth-0.8.2.orig/src/plugins/splash/script/Makefile.in
13264
+++ plymouth-0.8.2/src/plugins/splash/script/Makefile.in
13265
@@ -179,6 +179,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
13266
PACKAGE_NAME = @PACKAGE_NAME@
13267
PACKAGE_STRING = @PACKAGE_STRING@
13268
PACKAGE_TARNAME = @PACKAGE_TARNAME@
13269
+PACKAGE_URL = @PACKAGE_URL@
13270
PACKAGE_VERSION = @PACKAGE_VERSION@
13271
PANGO_CFLAGS = @PANGO_CFLAGS@
13272
PANGO_LIBS = @PANGO_LIBS@
13273
--- plymouth-0.8.2.orig/src/plugins/splash/script/plugin.c
13274
+++ plymouth-0.8.2/src/plugins/splash/script/plugin.c
13275
@@ -418,6 +418,8 @@ static void
13276
become_idle (ply_boot_splash_plugin_t *plugin,
13277
ply_trigger_t *idle_trigger)
13278
{
13279
+ stop_animation (plugin);
13280
+
13281
ply_trigger_pull (idle_trigger, NULL);
13282
}
13283
13284
--- plymouth-0.8.2.orig/src/plugins/splash/script/script-lib-image.c
13285
+++ plymouth-0.8.2/src/plugins/splash/script/script-lib-image.c
13286
@@ -171,7 +171,7 @@ static script_return_t image_text (scrip
13287
13288
alpha_obj = script_obj_hash_peek_element (state->local, "alpha");
13289
13290
- if (alpha_obj)
13291
+ if (alpha_obj && !script_obj_is_null(alpha_obj))
13292
{
13293
alpha = CLAMP(script_obj_as_number (alpha_obj), 0, 1);
13294
script_obj_unref(alpha_obj);
13295
--- plymouth-0.8.2.orig/src/plugins/splash/script/script-lib-sprite.c
13296
+++ plymouth-0.8.2/src/plugins/splash/script/script-lib-sprite.c
13297
@@ -399,6 +399,45 @@ static script_return_t sprite_window_set
13298
return script_return_obj_null ();
13299
}
13300
13301
+static script_return_t sprite_window_get_bits_per_pixel (script_state_t *state,
13302
+ void *user_data)
13303
+{
13304
+ script_lib_sprite_data_t *data = user_data;
13305
+ ply_list_node_t *node;
13306
+ int index;
13307
+ script_obj_t *index_obj;
13308
+ script_lib_display_t *display;
13309
+ unsigned int bits_per_pixel;
13310
+
13311
+ index_obj = script_obj_hash_peek_element (state->local, "window");
13312
+
13313
+ if (index_obj)
13314
+ {
13315
+ index = script_obj_as_number (index_obj);
13316
+ script_obj_unref(index_obj);
13317
+ if (index < 0)
13318
+ return script_return_obj_null ();
13319
+ node = ply_list_get_nth_node (data->displays, index);
13320
+ if (node == NULL)
13321
+ return script_return_obj_null ();
13322
+ display = ply_list_node_get_data (node);
13323
+ bits_per_pixel = ply_pixel_display_get_bits_per_pixel (display->pixel_display);
13324
+ return script_return_obj (script_obj_new_number (bits_per_pixel));
13325
+ }
13326
+
13327
+ bits_per_pixel = 0;
13328
+ for (node = ply_list_get_first_node (data->displays);
13329
+ node;
13330
+ node = ply_list_get_next_node (data->displays, node))
13331
+ {
13332
+ display = ply_list_node_get_data (node);
13333
+ bits_per_pixel = ply_pixel_display_get_bits_per_pixel (display->pixel_display);
13334
+ if (bits_per_pixel)
13335
+ break;
13336
+ }
13337
+ return script_return_obj (script_obj_new_number (bits_per_pixel));
13338
+}
13339
+
13340
static uint32_t extract_rgb_color (script_state_t *state)
13341
{
13342
uint8_t red = CLAMP (255 * script_obj_hash_get_number (state->local, "red"), 0, 255);
13343
@@ -651,6 +690,12 @@ script_lib_sprite_data_t *script_lib_spr
13344
"value",
13345
NULL);
13346
script_add_native_function (window_hash,
13347
+ "GetBitsPerPixel",
13348
+ sprite_window_get_bits_per_pixel,
13349
+ data,
13350
+ "window",
13351
+ NULL);
13352
+ script_add_native_function (window_hash,
13353
"SetBackgroundTopColor",
13354
sprite_window_set_background_top_color,
13355
data,
13356
--- /dev/null
13357
+++ plymouth-0.8.2/src/plugins/splash/ubuntu-text/Makefile.in
13358
@@ -0,0 +1,597 @@
13359
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
13360
+# @configure_input@
13361
+
13362
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
13363
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
13364
+# Inc.
13365
+# This Makefile.in is free software; the Free Software Foundation
13366
+# gives unlimited permission to copy and/or distribute it,
13367
+# with or without modifications, as long as this notice is preserved.
13368
+
13369
+# This program is distributed in the hope that it will be useful,
13370
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
13371
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
13372
+# PARTICULAR PURPOSE.
13373
+
13374
+@SET_MAKE@
13375
+
13376
+VPATH = @srcdir@
13377
+pkgdatadir = $(datadir)/@PACKAGE@
13378
+pkgincludedir = $(includedir)/@PACKAGE@
13379
+pkglibdir = $(libdir)/@PACKAGE@
13380
+pkglibexecdir = $(libexecdir)/@PACKAGE@
13381
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
13382
+install_sh_DATA = $(install_sh) -c -m 644
13383
+install_sh_PROGRAM = $(install_sh) -c
13384
+install_sh_SCRIPT = $(install_sh) -c
13385
+INSTALL_HEADER = $(INSTALL_DATA)
13386
+transform = $(program_transform_name)
13387
+NORMAL_INSTALL = :
13388
+PRE_INSTALL = :
13389
+POST_INSTALL = :
13390
+NORMAL_UNINSTALL = :
13391
+PRE_UNINSTALL = :
13392
+POST_UNINSTALL = :
13393
+build_triplet = @build@
13394
+host_triplet = @host@
13395
+subdir = src/plugins/splash/ubuntu-text
13396
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
13397
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
13398
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
13399
+ $(top_srcdir)/configure.ac
13400
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
13401
+ $(ACLOCAL_M4)
13402
+mkinstalldirs = $(install_sh) -d
13403
+CONFIG_HEADER = $(top_builddir)/config.h
13404
+CONFIG_CLEAN_FILES =
13405
+CONFIG_CLEAN_VPATH_FILES =
13406
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
13407
+am__vpath_adj = case $$p in \
13408
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
13409
+ *) f=$$p;; \
13410
+ esac;
13411
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
13412
+am__install_max = 40
13413
+am__nobase_strip_setup = \
13414
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
13415
+am__nobase_strip = \
13416
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
13417
+am__nobase_list = $(am__nobase_strip_setup); \
13418
+ for p in $$list; do echo "$$p $$p"; done | \
13419
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
13420
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
13421
+ if (++n[$$2] == $(am__install_max)) \
13422
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
13423
+ END { for (dir in files) print dir, files[dir] }'
13424
+am__base_list = \
13425
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
13426
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
13427
+am__installdirs = "$(DESTDIR)$(plugindir)"
13428
+LTLIBRARIES = $(plugin_LTLIBRARIES)
13429
+am__DEPENDENCIES_1 =
13430
+ubuntu_text_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
13431
+ ../../../libply/libply.la \
13432
+ ../../../libply-splash-core/libply-splash-core.la
13433
+am_ubuntu_text_la_OBJECTS = ubuntu_text_la-plugin.lo
13434
+ubuntu_text_la_OBJECTS = $(am_ubuntu_text_la_OBJECTS)
13435
+AM_V_lt = $(am__v_lt_$(V))
13436
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
13437
+am__v_lt_0 = --silent
13438
+ubuntu_text_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
13439
+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
13440
+ $(ubuntu_text_la_CFLAGS) $(CFLAGS) $(ubuntu_text_la_LDFLAGS) \
13441
+ $(LDFLAGS) -o $@
13442
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
13443
+depcomp = $(SHELL) $(top_srcdir)/build-tools/depcomp
13444
+am__depfiles_maybe = depfiles
13445
+am__mv = mv -f
13446
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
13447
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
13448
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
13449
+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
13450
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
13451
+ $(AM_CFLAGS) $(CFLAGS)
13452
+AM_V_CC = $(am__v_CC_$(V))
13453
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
13454
+am__v_CC_0 = @echo " CC " $@;
13455
+AM_V_at = $(am__v_at_$(V))
13456
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
13457
+am__v_at_0 = @
13458
+CCLD = $(CC)
13459
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
13460
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
13461
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
13462
+AM_V_CCLD = $(am__v_CCLD_$(V))
13463
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
13464
+am__v_CCLD_0 = @echo " CCLD " $@;
13465
+AM_V_GEN = $(am__v_GEN_$(V))
13466
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
13467
+am__v_GEN_0 = @echo " GEN " $@;
13468
+SOURCES = $(ubuntu_text_la_SOURCES)
13469
+DIST_SOURCES = $(ubuntu_text_la_SOURCES)
13470
+ETAGS = etags
13471
+CTAGS = ctags
13472
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
13473
+ACLOCAL = @ACLOCAL@
13474
+AMTAR = @AMTAR@
13475
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
13476
+AR = @AR@
13477
+AUTOCONF = @AUTOCONF@
13478
+AUTOHEADER = @AUTOHEADER@
13479
+AUTOMAKE = @AUTOMAKE@
13480
+AWK = @AWK@
13481
+CC = @CC@
13482
+CCDEPMODE = @CCDEPMODE@
13483
+CFLAGS = @CFLAGS@
13484
+CPP = @CPP@
13485
+CPPFLAGS = @CPPFLAGS@
13486
+CYGPATH_W = @CYGPATH_W@
13487
+DEFS = @DEFS@
13488
+DEPDIR = @DEPDIR@
13489
+DRM_CFLAGS = @DRM_CFLAGS@
13490
+DRM_LIBS = @DRM_LIBS@
13491
+DSYMUTIL = @DSYMUTIL@
13492
+DUMPBIN = @DUMPBIN@
13493
+ECHO_C = @ECHO_C@
13494
+ECHO_N = @ECHO_N@
13495
+ECHO_T = @ECHO_T@
13496
+EGREP = @EGREP@
13497
+EXEEXT = @EXEEXT@
13498
+FGREP = @FGREP@
13499
+GREP = @GREP@
13500
+GTK_CFLAGS = @GTK_CFLAGS@
13501
+GTK_LIBS = @GTK_LIBS@
13502
+IMAGE_CFLAGS = @IMAGE_CFLAGS@
13503
+IMAGE_LIBS = @IMAGE_LIBS@
13504
+INSTALL = @INSTALL@
13505
+INSTALL_DATA = @INSTALL_DATA@
13506
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
13507
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
13508
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
13509
+LD = @LD@
13510
+LDFLAGS = @LDFLAGS@
13511
+LIBOBJS = @LIBOBJS@
13512
+LIBS = @LIBS@
13513
+LIBTOOL = @LIBTOOL@
13514
+LIPO = @LIPO@
13515
+LN_S = @LN_S@
13516
+LTLIBOBJS = @LTLIBOBJS@
13517
+LT_AGE = @LT_AGE@
13518
+LT_CURRENT = @LT_CURRENT@
13519
+LT_REVISION = @LT_REVISION@
13520
+MAINT = @MAINT@
13521
+MAKEINFO = @MAKEINFO@
13522
+MKDIR_P = @MKDIR_P@
13523
+NM = @NM@
13524
+NMEDIT = @NMEDIT@
13525
+OBJDUMP = @OBJDUMP@
13526
+OBJEXT = @OBJEXT@
13527
+OTOOL = @OTOOL@
13528
+OTOOL64 = @OTOOL64@
13529
+PACKAGE = @PACKAGE@
13530
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
13531
+PACKAGE_NAME = @PACKAGE_NAME@
13532
+PACKAGE_STRING = @PACKAGE_STRING@
13533
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
13534
+PACKAGE_URL = @PACKAGE_URL@
13535
+PACKAGE_VERSION = @PACKAGE_VERSION@
13536
+PANGO_CFLAGS = @PANGO_CFLAGS@
13537
+PANGO_LIBS = @PANGO_LIBS@
13538
+PATH_SEPARATOR = @PATH_SEPARATOR@
13539
+PKG_CONFIG = @PKG_CONFIG@
13540
+PLYMOUTH_CFLAGS = @PLYMOUTH_CFLAGS@
13541
+PLYMOUTH_CONF_DIR = @PLYMOUTH_CONF_DIR@
13542
+PLYMOUTH_DATADIR = @PLYMOUTH_DATADIR@
13543
+PLYMOUTH_LIBDIR = @PLYMOUTH_LIBDIR@
13544
+PLYMOUTH_LIBEXECDIR = @PLYMOUTH_LIBEXECDIR@
13545
+PLYMOUTH_LIBS = @PLYMOUTH_LIBS@
13546
+PLYMOUTH_PLUGIN_PATH = @PLYMOUTH_PLUGIN_PATH@
13547
+PLYMOUTH_POLICY_DIR = @PLYMOUTH_POLICY_DIR@
13548
+PLYMOUTH_THEME_PATH = @PLYMOUTH_THEME_PATH@
13549
+RANLIB = @RANLIB@
13550
+RELEASE_FILE = @RELEASE_FILE@
13551
+SED = @SED@
13552
+SET_MAKE = @SET_MAKE@
13553
+SHELL = @SHELL@
13554
+STRIP = @STRIP@
13555
+VERSION = @VERSION@
13556
+abs_builddir = @abs_builddir@
13557
+abs_srcdir = @abs_srcdir@
13558
+abs_top_builddir = @abs_top_builddir@
13559
+abs_top_srcdir = @abs_top_srcdir@
13560
+ac_ct_CC = @ac_ct_CC@
13561
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
13562
+am__include = @am__include@
13563
+am__leading_dot = @am__leading_dot@
13564
+am__quote = @am__quote@
13565
+am__tar = @am__tar@
13566
+am__untar = @am__untar@
13567
+background_color = @background_color@
13568
+background_end_color = @background_end_color@
13569
+background_start_color = @background_start_color@
13570
+bindir = @bindir@
13571
+build = @build@
13572
+build_alias = @build_alias@
13573
+build_cpu = @build_cpu@
13574
+build_os = @build_os@
13575
+build_vendor = @build_vendor@
13576
+builddir = @builddir@
13577
+datadir = @datadir@
13578
+datarootdir = @datarootdir@
13579
+docdir = @docdir@
13580
+dvidir = @dvidir@
13581
+exec_prefix = @exec_prefix@
13582
+host = @host@
13583
+host_alias = @host_alias@
13584
+host_cpu = @host_cpu@
13585
+host_os = @host_os@
13586
+host_vendor = @host_vendor@
13587
+htmldir = @htmldir@
13588
+includedir = @includedir@
13589
+infodir = @infodir@
13590
+install_sh = @install_sh@
13591
+libdir = @libdir@
13592
+libexecdir = @libexecdir@
13593
+localedir = @localedir@
13594
+localstatedir = @localstatedir@
13595
+logofile = @logofile@
13596
+lt_ECHO = @lt_ECHO@
13597
+mandir = @mandir@
13598
+mkdir_p = @mkdir_p@
13599
+oldincludedir = @oldincludedir@
13600
+pdfdir = @pdfdir@
13601
+plymouthclientdir = @plymouthclientdir@
13602
+plymouthdaemondir = @plymouthdaemondir@
13603
+prefix = @prefix@
13604
+program_transform_name = @program_transform_name@
13605
+psdir = @psdir@
13606
+sbindir = @sbindir@
13607
+sharedstatedir = @sharedstatedir@
13608
+srcdir = @srcdir@
13609
+sysconfdir = @sysconfdir@
13610
+target_alias = @target_alias@
13611
+top_build_prefix = @top_build_prefix@
13612
+top_builddir = @top_builddir@
13613
+top_srcdir = @top_srcdir@
13614
+INCLUDES = -I$(top_srcdir) \
13615
+ -I$(srcdir)/../../../libply \
13616
+ -I$(srcdir)/../../../libply-splash-core \
13617
+ -I$(srcdir)/../../.. \
13618
+ -I$(srcdir)/../.. \
13619
+ -I$(srcdir)/.. \
13620
+ -I$(srcdir)
13621
+
13622
+plugindir = $(libdir)/plymouth
13623
+plugin_LTLIBRARIES = ubuntu-text.la
13624
+ubuntu_text_la_CFLAGS = $(PLYMOUTH_CFLAGS) \
13625
+ -DPLYMOUTH_BACKGROUND_COLOR=$(background_color) \
13626
+ -DPLYMOUTH_BACKGROUND_END_COLOR=$(background_end_color) \
13627
+ -DPLYMOUTH_BACKGROUND_START_COLOR=$(background_start_color)
13628
+
13629
+ubuntu_text_la_LDFLAGS = -module -avoid-version -export-dynamic
13630
+ubuntu_text_la_LIBADD = $(PLYMOUTH_LIBS) \
13631
+ ../../../libply/libply.la \
13632
+ ../../../libply-splash-core/libply-splash-core.la
13633
+
13634
+ubuntu_text_la_SOURCES = $(srcdir)/plugin.c
13635
+MAINTAINERCLEANFILES = Makefile.in
13636
+all: all-am
13637
+
13638
+.SUFFIXES:
13639
+.SUFFIXES: .c .lo .o .obj
13640
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
13641
+ @for dep in $?; do \
13642
+ case '$(am__configure_deps)' in \
13643
+ *$$dep*) \
13644
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
13645
+ && { if test -f $@; then exit 0; else break; fi; }; \
13646
+ exit 1;; \
13647
+ esac; \
13648
+ done; \
13649
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/plugins/splash/ubuntu-text/Makefile'; \
13650
+ $(am__cd) $(top_srcdir) && \
13651
+ $(AUTOMAKE) --gnu src/plugins/splash/ubuntu-text/Makefile
13652
+.PRECIOUS: Makefile
13653
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
13654
+ @case '$?' in \
13655
+ *config.status*) \
13656
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
13657
+ *) \
13658
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
13659
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
13660
+ esac;
13661
+
13662
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
13663
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
13664
+
13665
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
13666
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
13667
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
13668
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
13669
+$(am__aclocal_m4_deps):
13670
+install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
13671
+ @$(NORMAL_INSTALL)
13672
+ test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
13673
+ @list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
13674
+ list2=; for p in $$list; do \
13675
+ if test -f $$p; then \
13676
+ list2="$$list2 $$p"; \
13677
+ else :; fi; \
13678
+ done; \
13679
+ test -z "$$list2" || { \
13680
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
13681
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
13682
+ }
13683
+
13684
+uninstall-pluginLTLIBRARIES:
13685
+ @$(NORMAL_UNINSTALL)
13686
+ @list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
13687
+ for p in $$list; do \
13688
+ $(am__strip_dir) \
13689
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$f'"; \
13690
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$f"; \
13691
+ done
13692
+
13693
+clean-pluginLTLIBRARIES:
13694
+ -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
13695
+ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
13696
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
13697
+ test "$$dir" != "$$p" || dir=.; \
13698
+ echo "rm -f \"$${dir}/so_locations\""; \
13699
+ rm -f "$${dir}/so_locations"; \
13700
+ done
13701
+ubuntu-text.la: $(ubuntu_text_la_OBJECTS) $(ubuntu_text_la_DEPENDENCIES)
13702
+ $(AM_V_CCLD)$(ubuntu_text_la_LINK) -rpath $(plugindir) $(ubuntu_text_la_OBJECTS) $(ubuntu_text_la_LIBADD) $(LIBS)
13703
+
13704
+mostlyclean-compile:
13705
+ -rm -f *.$(OBJEXT)
13706
+
13707
+distclean-compile:
13708
+ -rm -f *.tab.c
13709
+
13710
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ubuntu_text_la-plugin.Plo@am__quote@
13711
+
13712
+.c.o:
13713
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
13714
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
13715
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
13716
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
13717
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
13718
+@am__fastdepCC_FALSE@ $(COMPILE) -c $<
13719
+
13720
+.c.obj:
13721
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
13722
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
13723
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
13724
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
13725
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
13726
+@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
13727
+
13728
+.c.lo:
13729
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
13730
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
13731
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
13732
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
13733
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
13734
+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
13735
+
13736
+ubuntu_text_la-plugin.lo: $(srcdir)/plugin.c
13737
+@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
13738
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ubuntu_text_la-plugin.Tpo $(DEPDIR)/ubuntu_text_la-plugin.Plo
13739
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
13740
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/plugin.c' object='ubuntu_text_la-plugin.lo' libtool=yes @AMDEPBACKSLASH@
13741
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
13742
+@am__fastdepCC_FALSE@ $(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
13743
+
13744
+mostlyclean-libtool:
13745
+ -rm -f *.lo
13746
+
13747
+clean-libtool:
13748
+ -rm -rf .libs _libs
13749
+
13750
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
13751
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
13752
+ unique=`for i in $$list; do \
13753
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
13754
+ done | \
13755
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
13756
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
13757
+ mkid -fID $$unique
13758
+tags: TAGS
13759
+
13760
+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
13761
+ $(TAGS_FILES) $(LISP)
13762
+ set x; \
13763
+ here=`pwd`; \
13764
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
13765
+ unique=`for i in $$list; do \
13766
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
13767
+ done | \
13768
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
13769
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
13770
+ shift; \
13771
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
13772
+ test -n "$$unique" || unique=$$empty_fix; \
13773
+ if test $$# -gt 0; then \
13774
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
13775
+ "$$@" $$unique; \
13776
+ else \
13777
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
13778
+ $$unique; \
13779
+ fi; \
13780
+ fi
13781
+ctags: CTAGS
13782
+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
13783
+ $(TAGS_FILES) $(LISP)
13784
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
13785
+ unique=`for i in $$list; do \
13786
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
13787
+ done | \
13788
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
13789
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
13790
+ test -z "$(CTAGS_ARGS)$$unique" \
13791
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
13792
+ $$unique
13793
+
13794
+GTAGS:
13795
+ here=`$(am__cd) $(top_builddir) && pwd` \
13796
+ && $(am__cd) $(top_srcdir) \
13797
+ && gtags -i $(GTAGS_ARGS) "$$here"
13798
+
13799
+distclean-tags:
13800
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
13801
+
13802
+distdir: $(DISTFILES)
13803
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
13804
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
13805
+ list='$(DISTFILES)'; \
13806
+ dist_files=`for file in $$list; do echo $$file; done | \
13807
+ sed -e "s|^$$srcdirstrip/||;t" \
13808
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
13809
+ case $$dist_files in \
13810
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
13811
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
13812
+ sort -u` ;; \
13813
+ esac; \
13814
+ for file in $$dist_files; do \
13815
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
13816
+ if test -d $$d/$$file; then \
13817
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
13818
+ if test -d "$(distdir)/$$file"; then \
13819
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
13820
+ fi; \
13821
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
13822
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
13823
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
13824
+ fi; \
13825
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
13826
+ else \
13827
+ test -f "$(distdir)/$$file" \
13828
+ || cp -p $$d/$$file "$(distdir)/$$file" \
13829
+ || exit 1; \
13830
+ fi; \
13831
+ done
13832
+check-am: all-am
13833
+check: check-am
13834
+all-am: Makefile $(LTLIBRARIES)
13835
+installdirs:
13836
+ for dir in "$(DESTDIR)$(plugindir)"; do \
13837
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
13838
+ done
13839
+install: install-am
13840
+install-exec: install-exec-am
13841
+install-data: install-data-am
13842
+uninstall: uninstall-am
13843
+
13844
+install-am: all-am
13845
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
13846
+
13847
+installcheck: installcheck-am
13848
+install-strip:
13849
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
13850
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
13851
+ `test -z '$(STRIP)' || \
13852
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
13853
+mostlyclean-generic:
13854
+
13855
+clean-generic:
13856
+
13857
+distclean-generic:
13858
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
13859
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
13860
+
13861
+maintainer-clean-generic:
13862
+ @echo "This command is intended for maintainers to use"
13863
+ @echo "it deletes files that may require special tools to rebuild."
13864
+ -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
13865
+clean: clean-am
13866
+
13867
+clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \
13868
+ mostlyclean-am
13869
+
13870
+distclean: distclean-am
13871
+ -rm -rf ./$(DEPDIR)
13872
+ -rm -f Makefile
13873
+distclean-am: clean-am distclean-compile distclean-generic \
13874
+ distclean-tags
13875
+
13876
+dvi: dvi-am
13877
+
13878
+dvi-am:
13879
+
13880
+html: html-am
13881
+
13882
+html-am:
13883
+
13884
+info: info-am
13885
+
13886
+info-am:
13887
+
13888
+install-data-am: install-pluginLTLIBRARIES
13889
+
13890
+install-dvi: install-dvi-am
13891
+
13892
+install-dvi-am:
13893
+
13894
+install-exec-am:
13895
+
13896
+install-html: install-html-am
13897
+
13898
+install-html-am:
13899
+
13900
+install-info: install-info-am
13901
+
13902
+install-info-am:
13903
+
13904
+install-man:
13905
+
13906
+install-pdf: install-pdf-am
13907
+
13908
+install-pdf-am:
13909
+
13910
+install-ps: install-ps-am
13911
+
13912
+install-ps-am:
13913
+
13914
+installcheck-am:
13915
+
13916
+maintainer-clean: maintainer-clean-am
13917
+ -rm -rf ./$(DEPDIR)
13918
+ -rm -f Makefile
13919
+maintainer-clean-am: distclean-am maintainer-clean-generic
13920
+
13921
+mostlyclean: mostlyclean-am
13922
+
13923
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
13924
+ mostlyclean-libtool
13925
+
13926
+pdf: pdf-am
13927
+
13928
+pdf-am:
13929
+
13930
+ps: ps-am
13931
+
13932
+ps-am:
13933
+
13934
+uninstall-am: uninstall-pluginLTLIBRARIES
13935
+
13936
+.MAKE: install-am install-strip
13937
+
13938
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
13939
+ clean-libtool clean-pluginLTLIBRARIES ctags distclean \
13940
+ distclean-compile distclean-generic distclean-libtool \
13941
+ distclean-tags distdir dvi dvi-am html html-am info info-am \
13942
+ install install-am install-data install-data-am install-dvi \
13943
+ install-dvi-am install-exec install-exec-am install-html \
13944
+ install-html-am install-info install-info-am install-man \
13945
+ install-pdf install-pdf-am install-pluginLTLIBRARIES \
13946
+ install-ps install-ps-am install-strip installcheck \
13947
+ installcheck-am installdirs maintainer-clean \
13948
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
13949
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
13950
+ tags uninstall uninstall-am uninstall-pluginLTLIBRARIES
13951
+
13952
+
13953
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
13954
+# Otherwise a system limit (for SysV at least) may be exceeded.
13955
+.NOEXPORT:
13956
--- /dev/null
13957
+++ plymouth-0.8.2/src/plugins/splash/ubuntu-text/Makefile.am
13958
@@ -0,0 +1,23 @@
13959
+INCLUDES = -I$(top_srcdir) \
13960
+ -I$(srcdir)/../../../libply \
13961
+ -I$(srcdir)/../../../libply-splash-core \
13962
+ -I$(srcdir)/../../.. \
13963
+ -I$(srcdir)/../.. \
13964
+ -I$(srcdir)/.. \
13965
+ -I$(srcdir)
13966
+
13967
+plugindir = $(libdir)/plymouth
13968
+plugin_LTLIBRARIES = ubuntu-text.la
13969
+
13970
+ubuntu_text_la_CFLAGS = $(PLYMOUTH_CFLAGS) \
13971
+ -DPLYMOUTH_BACKGROUND_COLOR=$(background_color) \
13972
+ -DPLYMOUTH_BACKGROUND_END_COLOR=$(background_end_color) \
13973
+ -DPLYMOUTH_BACKGROUND_START_COLOR=$(background_start_color)
13974
+
13975
+ubuntu_text_la_LDFLAGS = -module -avoid-version -export-dynamic
13976
+ubuntu_text_la_LIBADD = $(PLYMOUTH_LIBS) \
13977
+ ../../../libply/libply.la \
13978
+ ../../../libply-splash-core/libply-splash-core.la
13979
+ubuntu_text_la_SOURCES = $(srcdir)/plugin.c
13980
+
13981
+MAINTAINERCLEANFILES = Makefile.in
13982
--- /dev/null
13983
+++ plymouth-0.8.2/src/plugins/splash/ubuntu-text/plugin.c
13984
@@ -0,0 +1,795 @@
13985
+/* ubuntu-text.c - boot splash plugin
13986
+ *
13987
+ * Copyright (C) 2010 Canonical Ltd.
13988
+ * Copyright (C) 2008 Red Hat, Inc.
13989
+ *
13990
+ * This program is free software; you can redistribute it and/or modify
13991
+ * it under the terms of the GNU General Public License as published by
13992
+ * the Free Software Foundation; either version 2, or (at your option)
13993
+ * any later version.
13994
+ *
13995
+ * This program is distributed in the hope that it will be useful,
13996
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
13997
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13998
+ * GNU General Public License for more details.
13999
+ *
14000
+ * You should have received a copy of the GNU General Public License
14001
+ * along with this program; if not, write to the Free Software
14002
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
14003
+ * 02111-1307, USA.
14004
+ *
14005
+ * Written by: Scott James Remnant <scott@ubuntu.com>
14006
+ * Adam Jackson <ajax@redhat.com>
14007
+ * Ray Strode <rstrode@redhat.com>
14008
+ */
14009
+#include "config.h"
14010
+
14011
+#include <assert.h>
14012
+#include <errno.h>
14013
+#include <fcntl.h>
14014
+#include <math.h>
14015
+#include <signal.h>
14016
+#include <stdbool.h>
14017
+#include <stdio.h>
14018
+#include <stdint.h>
14019
+#include <stdlib.h>
14020
+#include <string.h>
14021
+#include <sys/ioctl.h>
14022
+#include <sys/stat.h>
14023
+#include <sys/time.h>
14024
+#include <sys/types.h>
14025
+#include <termios.h>
14026
+#include <unistd.h>
14027
+#include <values.h>
14028
+#include <wchar.h>
14029
+
14030
+#include "ply-trigger.h"
14031
+#include "ply-boot-splash-plugin.h"
14032
+#include "ply-buffer.h"
14033
+#include "ply-event-loop.h"
14034
+#include "ply-key-file.h"
14035
+#include "ply-list.h"
14036
+#include "ply-logger.h"
14037
+#include "ply-text-display.h"
14038
+#include "ply-text-progress-bar.h"
14039
+#include "ply-utils.h"
14040
+
14041
+#include <linux/kd.h>
14042
+
14043
+#define CLEAR_LINE_SEQUENCE "\033[2K\r\n"
14044
+#define BACKSPACE "\b\033[0K"
14045
+
14046
+typedef enum {
14047
+ PLY_BOOT_SPLASH_DISPLAY_NORMAL,
14048
+ PLY_BOOT_SPLASH_DISPLAY_QUESTION_ENTRY,
14049
+ PLY_BOOT_SPLASH_DISPLAY_PASSWORD_ENTRY
14050
+} ply_boot_splash_display_type_t;
14051
+
14052
+struct _ply_boot_splash_plugin
14053
+{
14054
+ ply_event_loop_t *loop;
14055
+ ply_boot_splash_mode_t mode;
14056
+
14057
+ ply_list_t *views;
14058
+
14059
+ ply_boot_splash_display_type_t state;
14060
+
14061
+ char *message;
14062
+
14063
+ uint32_t is_animating : 1;
14064
+};
14065
+
14066
+typedef struct
14067
+{
14068
+ ply_boot_splash_plugin_t *plugin;
14069
+ ply_text_display_t *display;
14070
+
14071
+} view_t;
14072
+
14073
+static void hide_splash_screen (ply_boot_splash_plugin_t *plugin,
14074
+ ply_event_loop_t *loop);
14075
+
14076
+static view_t *
14077
+view_new (ply_boot_splash_plugin_t *plugin,
14078
+ ply_text_display_t *display)
14079
+{
14080
+ view_t *view;
14081
+
14082
+ view = calloc (1, sizeof (view_t));
14083
+ view->plugin = plugin;
14084
+ view->display = display;
14085
+
14086
+ return view;
14087
+}
14088
+
14089
+static void
14090
+view_free (view_t *view)
14091
+{
14092
+ free (view);
14093
+}
14094
+
14095
+static void
14096
+view_show_message (view_t *view)
14097
+{
14098
+ ply_boot_splash_plugin_t *plugin;
14099
+ int display_width, display_height, y;
14100
+ ply_terminal_color_t color;
14101
+ char *message;
14102
+
14103
+ plugin = view->plugin;
14104
+
14105
+ display_width = ply_text_display_get_number_of_columns (view->display);
14106
+ display_height = ply_text_display_get_number_of_rows (view->display);
14107
+
14108
+ if (!strncmp (plugin->message, "keys:", 5))
14109
+ {
14110
+ message = plugin->message + 5;
14111
+ color = PLY_TERMINAL_COLOR_WHITE;
14112
+ y = display_height - 4;
14113
+ }
14114
+ else
14115
+ {
14116
+ message = plugin->message;
14117
+ color = PLY_TERMINAL_COLOR_BLUE;
14118
+ y = display_height / 2 + 7;
14119
+ }
14120
+
14121
+ ply_text_display_set_cursor_position (view->display, 0, y);
14122
+ ply_text_display_clear_line (view->display);
14123
+ ply_text_display_set_cursor_position (view->display,
14124
+ (display_width -
14125
+ strlen (message)) / 2,
14126
+ y);
14127
+
14128
+ ply_text_display_set_foreground_color (view->display, color);
14129
+ ply_text_display_write (view->display, "%s", message);
14130
+}
14131
+
14132
+static void
14133
+view_show_prompt (view_t *view,
14134
+ const char *prompt,
14135
+ const char *entered_text)
14136
+{
14137
+ ply_boot_splash_plugin_t *plugin;
14138
+ int display_width, display_height;
14139
+ int i;
14140
+
14141
+ plugin = view->plugin;
14142
+
14143
+ display_width = ply_text_display_get_number_of_columns (view->display);
14144
+ display_height = ply_text_display_get_number_of_rows (view->display);
14145
+
14146
+ ply_text_display_set_cursor_position (view->display, 0,
14147
+ display_height / 2 + 8);
14148
+ ply_text_display_clear_line (view->display);
14149
+ ply_text_display_set_cursor_position (view->display,
14150
+ display_width / 2 - (strlen (prompt)),
14151
+ display_height / 2 + 8);
14152
+
14153
+ ply_text_display_write (view->display, "%s:%s", prompt, entered_text);
14154
+
14155
+ ply_text_display_show_cursor (view->display);
14156
+}
14157
+
14158
+static void
14159
+view_start_animation (view_t *view)
14160
+{
14161
+ ply_boot_splash_plugin_t *plugin;
14162
+ ply_terminal_t *terminal;
14163
+
14164
+ assert (view != NULL);
14165
+
14166
+ plugin = view->plugin;
14167
+
14168
+ terminal = ply_text_display_get_terminal (view->display);
14169
+
14170
+ ply_terminal_set_color_hex_value (terminal,
14171
+ PLY_TERMINAL_COLOR_BLACK,
14172
+ 0x2c001e);
14173
+ ply_terminal_set_color_hex_value (terminal,
14174
+ PLY_TERMINAL_COLOR_WHITE,
14175
+ 0xffffff);
14176
+ ply_terminal_set_color_hex_value (terminal,
14177
+ PLY_TERMINAL_COLOR_BROWN,
14178
+ 0xff4012);
14179
+ ply_terminal_set_color_hex_value (terminal,
14180
+ PLY_TERMINAL_COLOR_BLUE,
14181
+ 0x988592);
14182
+
14183
+ ply_text_display_set_background_color (view->display,
14184
+ PLY_TERMINAL_COLOR_BLACK);
14185
+ ply_text_display_clear_screen (view->display);
14186
+ ply_text_display_hide_cursor (view->display);
14187
+}
14188
+
14189
+static void
14190
+view_redraw (view_t *view)
14191
+{
14192
+ unsigned long screen_width, screen_height;
14193
+
14194
+ screen_width = ply_text_display_get_number_of_columns (view->display);
14195
+ screen_height = ply_text_display_get_number_of_rows (view->display);
14196
+
14197
+ ply_text_display_draw_area (view->display, 0, 0,
14198
+ screen_width, screen_height);
14199
+}
14200
+
14201
+static void
14202
+redraw_views (ply_boot_splash_plugin_t *plugin)
14203
+{
14204
+ ply_list_node_t *node;
14205
+
14206
+ node = ply_list_get_first_node (plugin->views);
14207
+ while (node != NULL)
14208
+ {
14209
+ ply_list_node_t *next_node;
14210
+ view_t *view;
14211
+
14212
+ view = ply_list_node_get_data (node);
14213
+ next_node = ply_list_get_next_node (plugin->views, node);
14214
+
14215
+ view_redraw (view);
14216
+
14217
+ node = next_node;
14218
+ }
14219
+}
14220
+
14221
+static void
14222
+view_hide (view_t *view)
14223
+{
14224
+ if (view->display != NULL)
14225
+ {
14226
+ ply_terminal_t *terminal;
14227
+
14228
+ terminal = ply_text_display_get_terminal (view->display);
14229
+
14230
+ ply_text_display_set_background_color (view->display, PLY_TERMINAL_COLOR_DEFAULT);
14231
+ ply_text_display_clear_screen (view->display);
14232
+ ply_text_display_show_cursor (view->display);
14233
+
14234
+ ply_terminal_reset_colors (terminal);
14235
+ }
14236
+}
14237
+
14238
+static void
14239
+hide_views (ply_boot_splash_plugin_t *plugin)
14240
+{
14241
+ ply_list_node_t *node;
14242
+
14243
+ node = ply_list_get_first_node (plugin->views);
14244
+ while (node != NULL)
14245
+ {
14246
+ ply_list_node_t *next_node;
14247
+ view_t *view;
14248
+
14249
+ view = ply_list_node_get_data (node);
14250
+ next_node = ply_list_get_next_node (plugin->views, node);
14251
+
14252
+ view_hide (view);
14253
+
14254
+ node = next_node;
14255
+ }
14256
+}
14257
+
14258
+static void
14259
+pause_views (ply_boot_splash_plugin_t *plugin)
14260
+{
14261
+ ply_list_node_t *node;
14262
+
14263
+ node = ply_list_get_first_node (plugin->views);
14264
+ while (node != NULL)
14265
+ {
14266
+ ply_list_node_t *next_node;
14267
+ view_t *view;
14268
+
14269
+ view = ply_list_node_get_data (node);
14270
+ next_node = ply_list_get_next_node (plugin->views, node);
14271
+
14272
+ ply_text_display_pause_updates (view->display);
14273
+
14274
+ node = next_node;
14275
+ }
14276
+}
14277
+
14278
+static void
14279
+unpause_views (ply_boot_splash_plugin_t *plugin)
14280
+{
14281
+ ply_list_node_t *node;
14282
+
14283
+ node = ply_list_get_first_node (plugin->views);
14284
+ while (node != NULL)
14285
+ {
14286
+ ply_list_node_t *next_node;
14287
+ view_t *view;
14288
+
14289
+ view = ply_list_node_get_data (node);
14290
+ next_node = ply_list_get_next_node (plugin->views, node);
14291
+
14292
+ ply_text_display_unpause_updates (view->display);
14293
+
14294
+ node = next_node;
14295
+ }
14296
+}
14297
+
14298
+static ply_boot_splash_plugin_t *
14299
+create_plugin (ply_key_file_t *key_file)
14300
+{
14301
+ ply_boot_splash_plugin_t *plugin;
14302
+
14303
+ ply_trace ("creating plugin");
14304
+
14305
+ plugin = calloc (1, sizeof (ply_boot_splash_plugin_t));
14306
+ plugin->message = NULL;
14307
+
14308
+ plugin->views = ply_list_new ();
14309
+
14310
+ return plugin;
14311
+}
14312
+
14313
+static void
14314
+detach_from_event_loop (ply_boot_splash_plugin_t *plugin)
14315
+{
14316
+ plugin->loop = NULL;
14317
+
14318
+ ply_trace ("detaching from event loop");
14319
+}
14320
+
14321
+static void
14322
+free_views (ply_boot_splash_plugin_t *plugin)
14323
+{
14324
+ ply_list_node_t *node;
14325
+
14326
+ node = ply_list_get_first_node (plugin->views);
14327
+
14328
+ while (node != NULL)
14329
+ {
14330
+ ply_list_node_t *next_node;
14331
+ view_t *view;
14332
+
14333
+ view = ply_list_node_get_data (node);
14334
+ next_node = ply_list_get_next_node (plugin->views, node);
14335
+
14336
+ view_free (view);
14337
+ ply_list_remove_node (plugin->views, node);
14338
+
14339
+ node = next_node;
14340
+ }
14341
+
14342
+ ply_list_free (plugin->views);
14343
+ plugin->views = NULL;
14344
+}
14345
+
14346
+static void
14347
+destroy_plugin (ply_boot_splash_plugin_t *plugin)
14348
+{
14349
+ ply_trace ("destroying plugin");
14350
+
14351
+ if (plugin == NULL)
14352
+ return;
14353
+
14354
+ /* It doesn't ever make sense to keep this plugin on screen
14355
+ * after exit
14356
+ */
14357
+ hide_splash_screen (plugin, plugin->loop);
14358
+
14359
+ free_views (plugin);
14360
+ if (plugin->message != NULL)
14361
+ free (plugin->message);
14362
+
14363
+ free (plugin);
14364
+}
14365
+
14366
+static void
14367
+show_message (ply_boot_splash_plugin_t *plugin)
14368
+{
14369
+ ply_list_node_t *node;
14370
+
14371
+ node = ply_list_get_first_node (plugin->views);
14372
+ while (node != NULL)
14373
+ {
14374
+ ply_list_node_t *next_node;
14375
+ view_t *view;
14376
+
14377
+ view = ply_list_node_get_data (node);
14378
+ next_node = ply_list_get_next_node (plugin->views, node);
14379
+
14380
+ view_show_message (view);
14381
+
14382
+ node = next_node;
14383
+ }
14384
+}
14385
+
14386
+static void
14387
+animate_frame (ply_boot_splash_plugin_t *plugin,
14388
+ int frame)
14389
+{
14390
+ ply_list_node_t *node;
14391
+
14392
+ node = ply_list_get_first_node (plugin->views);
14393
+ while (node != NULL)
14394
+ {
14395
+ ply_list_node_t *next_node;
14396
+ view_t *view;
14397
+ int display_width, display_height;
14398
+
14399
+ view = ply_list_node_get_data (node);
14400
+ next_node = ply_list_get_next_node (plugin->views, node);
14401
+
14402
+ display_width = ply_text_display_get_number_of_columns (view->display);
14403
+ display_height = ply_text_display_get_number_of_rows (view->display);
14404
+
14405
+ ply_text_display_set_cursor_position (view->display,
14406
+ (display_width - 12) / 2,
14407
+ display_height / 2);
14408
+
14409
+ ply_text_display_set_background_color (view->display, PLY_TERMINAL_COLOR_BLACK);
14410
+ ply_text_display_set_foreground_color (view->display, PLY_TERMINAL_COLOR_WHITE);
14411
+ ply_text_display_write (view->display, "Ubuntu 10.04");
14412
+
14413
+ ply_text_display_set_cursor_position (view->display,
14414
+ (display_width - 10) / 2,
14415
+ (display_height / 2) + 2);
14416
+
14417
+ if ((frame < 1) || (frame > 4))
14418
+ ply_text_display_set_foreground_color (view->display, PLY_TERMINAL_COLOR_WHITE);
14419
+ else
14420
+ ply_text_display_set_foreground_color (view->display, PLY_TERMINAL_COLOR_BROWN);
14421
+ ply_text_display_write (view->display, ". ");
14422
+
14423
+ if ((frame < 2) || (frame > 5))
14424
+ ply_text_display_set_foreground_color (view->display, PLY_TERMINAL_COLOR_WHITE);
14425
+ else
14426
+ ply_text_display_set_foreground_color (view->display, PLY_TERMINAL_COLOR_BROWN);
14427
+ ply_text_display_write (view->display, ". ");
14428
+
14429
+ if ((frame < 3) || (frame > 6))
14430
+ ply_text_display_set_foreground_color (view->display, PLY_TERMINAL_COLOR_WHITE);
14431
+ else
14432
+ ply_text_display_set_foreground_color (view->display, PLY_TERMINAL_COLOR_BROWN);
14433
+ ply_text_display_write (view->display, ". ");
14434
+
14435
+ if (frame < 4)
14436
+ ply_text_display_set_foreground_color (view->display, PLY_TERMINAL_COLOR_WHITE);
14437
+ else
14438
+ ply_text_display_set_foreground_color (view->display, PLY_TERMINAL_COLOR_BROWN);
14439
+ ply_text_display_write (view->display, ".");
14440
+
14441
+ node = next_node;
14442
+ }
14443
+}
14444
+
14445
+static void
14446
+on_timeout (ply_boot_splash_plugin_t *plugin)
14447
+{
14448
+ static int frame = 0;
14449
+
14450
+ frame += 1;
14451
+ frame %= 8;
14452
+
14453
+ animate_frame (plugin, frame);
14454
+
14455
+ ply_event_loop_watch_for_timeout (plugin->loop, 1.0,
14456
+ (ply_event_loop_timeout_handler_t)
14457
+ on_timeout, plugin);
14458
+}
14459
+
14460
+static void
14461
+start_animation (ply_boot_splash_plugin_t *plugin)
14462
+{
14463
+ ply_list_node_t *node;
14464
+
14465
+ assert (plugin != NULL);
14466
+ assert (plugin->loop != NULL);
14467
+
14468
+ redraw_views (plugin);
14469
+
14470
+ if (plugin->message != NULL)
14471
+ show_message (plugin);
14472
+
14473
+ if (plugin->is_animating)
14474
+ return;
14475
+
14476
+ node = ply_list_get_first_node (plugin->views);
14477
+ while (node != NULL)
14478
+ {
14479
+ ply_list_node_t *next_node;
14480
+ view_t *view;
14481
+
14482
+ view = ply_list_node_get_data (node);
14483
+ next_node = ply_list_get_next_node (plugin->views, node);
14484
+
14485
+ view_start_animation (view);
14486
+
14487
+ node = next_node;
14488
+ }
14489
+
14490
+ plugin->is_animating = true;
14491
+
14492
+ animate_frame (plugin, 0);
14493
+ ply_event_loop_watch_for_timeout (plugin->loop, 1.0,
14494
+ (ply_event_loop_timeout_handler_t)
14495
+ on_timeout, plugin);
14496
+}
14497
+
14498
+static void
14499
+stop_animation (ply_boot_splash_plugin_t *plugin)
14500
+{
14501
+ ply_list_node_t *node;
14502
+
14503
+ assert (plugin != NULL);
14504
+ assert (plugin->loop != NULL);
14505
+
14506
+ if (!plugin->is_animating)
14507
+ return;
14508
+
14509
+ plugin->is_animating = false;
14510
+
14511
+ node = ply_list_get_first_node (plugin->views);
14512
+ while (node != NULL)
14513
+ {
14514
+ ply_list_node_t *next_node;
14515
+ view_t *view;
14516
+
14517
+ view = ply_list_node_get_data (node);
14518
+ next_node = ply_list_get_next_node (plugin->views, node);
14519
+
14520
+ node = next_node;
14521
+ }
14522
+
14523
+ ply_event_loop_stop_watching_for_timeout (plugin->loop,
14524
+ (ply_event_loop_timeout_handler_t)
14525
+ on_timeout, plugin);
14526
+
14527
+ redraw_views (plugin);
14528
+}
14529
+
14530
+static void
14531
+on_draw (view_t *view,
14532
+ ply_terminal_t *terminal,
14533
+ int x,
14534
+ int y,
14535
+ int width,
14536
+ int height)
14537
+{
14538
+}
14539
+
14540
+static void
14541
+add_text_display (ply_boot_splash_plugin_t *plugin,
14542
+ ply_text_display_t *display)
14543
+{
14544
+ view_t *view;
14545
+ ply_terminal_t *terminal;
14546
+
14547
+ view = view_new (plugin, display);
14548
+
14549
+ terminal = ply_text_display_get_terminal (view->display);
14550
+ if (ply_terminal_open (terminal))
14551
+ {
14552
+ ply_terminal_set_mode (terminal, PLY_TERMINAL_MODE_TEXT);
14553
+ ply_terminal_activate_vt (terminal);
14554
+ }
14555
+
14556
+ ply_text_display_set_draw_handler (view->display,
14557
+ (ply_text_display_draw_handler_t)
14558
+ on_draw, view);
14559
+
14560
+ ply_list_append_data (plugin->views, view);
14561
+}
14562
+
14563
+static void
14564
+remove_text_display (ply_boot_splash_plugin_t *plugin,
14565
+ ply_text_display_t *display)
14566
+{
14567
+ ply_list_node_t *node;
14568
+
14569
+ node = ply_list_get_first_node (plugin->views);
14570
+ while (node != NULL)
14571
+ {
14572
+ view_t *view;
14573
+ ply_list_node_t *next_node;
14574
+
14575
+ view = ply_list_node_get_data (node);
14576
+ next_node = ply_list_get_next_node (plugin->views, node);
14577
+
14578
+ if (view->display == display)
14579
+ {
14580
+ ply_text_display_set_draw_handler (view->display,
14581
+ NULL, NULL);
14582
+ view_free (view);
14583
+ ply_list_remove_node (plugin->views, node);
14584
+ return;
14585
+ }
14586
+
14587
+ node = next_node;
14588
+ }
14589
+}
14590
+
14591
+static bool
14592
+show_splash_screen (ply_boot_splash_plugin_t *plugin,
14593
+ ply_event_loop_t *loop,
14594
+ ply_buffer_t *boot_buffer,
14595
+ ply_boot_splash_mode_t mode)
14596
+{
14597
+ assert (plugin != NULL);
14598
+
14599
+ plugin->loop = loop;
14600
+ plugin->mode = mode;
14601
+ ply_event_loop_watch_for_exit (loop, (ply_event_loop_exit_handler_t)
14602
+ detach_from_event_loop,
14603
+ plugin);
14604
+
14605
+ ply_show_new_kernel_messages (false);
14606
+ start_animation (plugin);
14607
+
14608
+ return true;
14609
+}
14610
+
14611
+static void
14612
+update_status (ply_boot_splash_plugin_t *plugin,
14613
+ const char *status)
14614
+{
14615
+ assert (plugin != NULL);
14616
+
14617
+ ply_trace ("status update");
14618
+}
14619
+
14620
+static void
14621
+hide_splash_screen (ply_boot_splash_plugin_t *plugin,
14622
+ ply_event_loop_t *loop)
14623
+{
14624
+ assert (plugin != NULL);
14625
+
14626
+ ply_trace ("hiding splash screen");
14627
+
14628
+ if (plugin->loop != NULL)
14629
+ {
14630
+ stop_animation (plugin);
14631
+
14632
+ ply_event_loop_stop_watching_for_exit (plugin->loop,
14633
+ (ply_event_loop_exit_handler_t)
14634
+ detach_from_event_loop,
14635
+ plugin);
14636
+ detach_from_event_loop (plugin);
14637
+ }
14638
+
14639
+ hide_views (plugin);
14640
+ ply_show_new_kernel_messages (true);
14641
+}
14642
+
14643
+static void
14644
+display_normal (ply_boot_splash_plugin_t *plugin)
14645
+{
14646
+ pause_views (plugin);
14647
+ if (plugin->state != PLY_BOOT_SPLASH_DISPLAY_NORMAL)
14648
+ {
14649
+ plugin->state = PLY_BOOT_SPLASH_DISPLAY_NORMAL;
14650
+ start_animation (plugin);
14651
+ redraw_views (plugin);
14652
+ }
14653
+ unpause_views (plugin);
14654
+}
14655
+
14656
+static void
14657
+display_message (ply_boot_splash_plugin_t *plugin,
14658
+ const char *message)
14659
+{
14660
+ if (plugin->message != NULL)
14661
+ free (plugin->message);
14662
+
14663
+ plugin->message = strdup (message);
14664
+ start_animation (plugin);
14665
+}
14666
+
14667
+static void
14668
+show_password_prompt (ply_boot_splash_plugin_t *plugin,
14669
+ const char *prompt,
14670
+ int bullets)
14671
+{
14672
+ ply_list_node_t *node;
14673
+ int i;
14674
+ char *entered_text;
14675
+
14676
+ entered_text = calloc (bullets + 1, sizeof (char));
14677
+
14678
+ for (i = 0; i < bullets; i++)
14679
+ entered_text[i] = '*';
14680
+
14681
+ node = ply_list_get_first_node (plugin->views);
14682
+ while (node != NULL)
14683
+ {
14684
+ ply_list_node_t *next_node;
14685
+ view_t *view;
14686
+
14687
+ view = ply_list_node_get_data (node);
14688
+ next_node = ply_list_get_next_node (plugin->views, node);
14689
+
14690
+ view_show_prompt (view, prompt, entered_text);
14691
+
14692
+ node = next_node;
14693
+ }
14694
+ free (entered_text);
14695
+}
14696
+
14697
+static void
14698
+show_prompt (ply_boot_splash_plugin_t *plugin,
14699
+ const char *prompt,
14700
+ const char *text)
14701
+{
14702
+ ply_list_node_t *node;
14703
+
14704
+ node = ply_list_get_first_node (plugin->views);
14705
+ while (node != NULL)
14706
+ {
14707
+ ply_list_node_t *next_node;
14708
+ view_t *view;
14709
+
14710
+ view = ply_list_node_get_data (node);
14711
+ next_node = ply_list_get_next_node (plugin->views, node);
14712
+
14713
+ view_show_prompt (view, prompt, text);
14714
+
14715
+ node = next_node;
14716
+ }
14717
+}
14718
+
14719
+static void
14720
+display_password (ply_boot_splash_plugin_t *plugin,
14721
+ const char *prompt,
14722
+ int bullets)
14723
+{
14724
+ pause_views (plugin);
14725
+ if (plugin->state == PLY_BOOT_SPLASH_DISPLAY_NORMAL)
14726
+ stop_animation (plugin);
14727
+
14728
+ plugin->state = PLY_BOOT_SPLASH_DISPLAY_PASSWORD_ENTRY;
14729
+
14730
+ if (!prompt)
14731
+ prompt = "Password";
14732
+
14733
+ show_password_prompt (plugin, prompt, bullets);
14734
+
14735
+ unpause_views (plugin);
14736
+}
14737
+
14738
+static void
14739
+display_question (ply_boot_splash_plugin_t *plugin,
14740
+ const char *prompt,
14741
+ const char *entry_text)
14742
+{
14743
+ pause_views (plugin);
14744
+ if (plugin->state == PLY_BOOT_SPLASH_DISPLAY_NORMAL)
14745
+ stop_animation (plugin);
14746
+
14747
+ plugin->state = PLY_BOOT_SPLASH_DISPLAY_PASSWORD_ENTRY;
14748
+
14749
+ if (!prompt)
14750
+ prompt = "Password";
14751
+
14752
+ show_prompt (plugin, prompt, entry_text);
14753
+
14754
+ unpause_views (plugin);
14755
+}
14756
+
14757
+
14758
+ply_boot_splash_plugin_interface_t *
14759
+ply_boot_splash_plugin_get_interface (void)
14760
+{
14761
+ static ply_boot_splash_plugin_interface_t plugin_interface =
14762
+ {
14763
+ .create_plugin = create_plugin,
14764
+ .destroy_plugin = destroy_plugin,
14765
+ .add_text_display = add_text_display,
14766
+ .remove_text_display = remove_text_display,
14767
+ .show_splash_screen = show_splash_screen,
14768
+ .update_status = update_status,
14769
+ .hide_splash_screen = hide_splash_screen,
14770
+ .display_normal = display_normal,
14771
+ .display_message = display_message,
14772
+ .display_password = display_password,
14773
+ .display_question = display_question,
14774
+ };
14775
+
14776
+ return &plugin_interface;
14777
+}
14778
+
14779
+/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
14780
--- plymouth-0.8.2.orig/src/plugins/splash/two-step/Makefile.in
14781
+++ plymouth-0.8.2/src/plugins/splash/two-step/Makefile.in
14782
@@ -173,6 +173,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
14783
PACKAGE_NAME = @PACKAGE_NAME@
14784
PACKAGE_STRING = @PACKAGE_STRING@
14785
PACKAGE_TARNAME = @PACKAGE_TARNAME@
14786
+PACKAGE_URL = @PACKAGE_URL@
14787
PACKAGE_VERSION = @PACKAGE_VERSION@
14788
PANGO_CFLAGS = @PANGO_CFLAGS@
14789
PANGO_LIBS = @PANGO_LIBS@
14790
--- plymouth-0.8.2.orig/src/plugins/splash/text/Makefile.in
14791
+++ plymouth-0.8.2/src/plugins/splash/text/Makefile.in
14792
@@ -171,6 +171,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
14793
PACKAGE_NAME = @PACKAGE_NAME@
14794
PACKAGE_STRING = @PACKAGE_STRING@
14795
PACKAGE_TARNAME = @PACKAGE_TARNAME@
14796
+PACKAGE_URL = @PACKAGE_URL@
14797
PACKAGE_VERSION = @PACKAGE_VERSION@
14798
PANGO_CFLAGS = @PANGO_CFLAGS@
14799
PANGO_LIBS = @PANGO_LIBS@
14800
--- plymouth-0.8.2.orig/src/plugins/splash/text/plugin.c
14801
+++ plymouth-0.8.2/src/plugins/splash/text/plugin.c
14802
@@ -485,7 +485,10 @@ add_text_display (ply_boot_splash_plugin
14803
14804
terminal = ply_text_display_get_terminal (view->display);
14805
if (ply_terminal_open (terminal))
14806
- ply_terminal_activate_vt (terminal);
14807
+ {
14808
+ ply_terminal_set_mode (terminal, PLY_TERMINAL_MODE_TEXT);
14809
+ ply_terminal_activate_vt (terminal);
14810
+ }
14811
14812
ply_text_display_set_draw_handler (view->display,
14813
(ply_text_display_draw_handler_t)
14814
--- plymouth-0.8.2.orig/src/plugins/splash/throbgress/Makefile.in
14815
+++ plymouth-0.8.2/src/plugins/splash/throbgress/Makefile.in
14816
@@ -173,6 +173,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
14817
PACKAGE_NAME = @PACKAGE_NAME@
14818
PACKAGE_STRING = @PACKAGE_STRING@
14819
PACKAGE_TARNAME = @PACKAGE_TARNAME@
14820
+PACKAGE_URL = @PACKAGE_URL@
14821
PACKAGE_VERSION = @PACKAGE_VERSION@
14822
PANGO_CFLAGS = @PANGO_CFLAGS@
14823
PANGO_LIBS = @PANGO_LIBS@
14824
13266
--- plymouth-0.8.2.orig/src/plugins/controls/Makefile.in
14825
13267
+++ plymouth-0.8.2/src/plugins/controls/Makefile.in
14826
13268
@@ -154,6 +154,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
14841
13283
PACKAGE_VERSION = @PACKAGE_VERSION@
14842
13284
PANGO_CFLAGS = @PANGO_CFLAGS@
14843
13285
PANGO_LIBS = @PANGO_LIBS@
13286
--- plymouth-0.8.2.orig/src/plugins/renderers/Makefile.am
13287
+++ plymouth-0.8.2/src/plugins/renderers/Makefile.am
13288
@@ -1,2 +1,5 @@
13289
SUBDIRS = frame-buffer drm x11
13290
+if BUILD_VGA16FB
13291
+SUBDIRS += vga16fb
13292
+endif
13293
MAINTAINERCLEANFILES = Makefile.in
14844
13294
--- plymouth-0.8.2.orig/src/plugins/renderers/Makefile.in
14845
13295
+++ plymouth-0.8.2/src/plugins/renderers/Makefile.in
14846
13296
@@ -33,6 +33,7 @@ PRE_UNINSTALL = :
14877
13327
MAINTAINERCLEANFILES = Makefile.in
14878
13328
all: all-recursive
14879
13329
14880
--- plymouth-0.8.2.orig/src/plugins/renderers/Makefile.am
14881
+++ plymouth-0.8.2/src/plugins/renderers/Makefile.am
14882
@@ -1,2 +1,5 @@
14883
SUBDIRS = frame-buffer drm x11
14884
+if BUILD_VGA16FB
14885
+SUBDIRS += vga16fb
14886
+endif
14887
MAINTAINERCLEANFILES = Makefile.in
14888
--- plymouth-0.8.2.orig/src/plugins/renderers/frame-buffer/Makefile.in
14889
+++ plymouth-0.8.2/src/plugins/renderers/frame-buffer/Makefile.in
14890
@@ -173,6 +173,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
14891
PACKAGE_NAME = @PACKAGE_NAME@
14892
PACKAGE_STRING = @PACKAGE_STRING@
14893
PACKAGE_TARNAME = @PACKAGE_TARNAME@
14894
+PACKAGE_URL = @PACKAGE_URL@
14895
PACKAGE_VERSION = @PACKAGE_VERSION@
14896
PANGO_CFLAGS = @PANGO_CFLAGS@
14897
PANGO_LIBS = @PANGO_LIBS@
14898
13330
--- plymouth-0.8.2.orig/src/plugins/renderers/frame-buffer/plugin.c
14899
13331
+++ plymouth-0.8.2/src/plugins/renderers/frame-buffer/plugin.c
14900
13332
@@ -56,7 +56,7 @@
14931
13363
.get_input_source = get_input_source,
14932
13364
.open_input_source = open_input_source,
14933
13365
.set_handler_for_input_source = set_handler_for_input_source,
14934
--- plymouth-0.8.2.orig/src/plugins/renderers/x11/Makefile.in
14935
+++ plymouth-0.8.2/src/plugins/renderers/x11/Makefile.in
14936
@@ -172,6 +172,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
14937
PACKAGE_NAME = @PACKAGE_NAME@
14938
PACKAGE_STRING = @PACKAGE_STRING@
14939
PACKAGE_TARNAME = @PACKAGE_TARNAME@
14940
+PACKAGE_URL = @PACKAGE_URL@
14941
PACKAGE_VERSION = @PACKAGE_VERSION@
14942
PANGO_CFLAGS = @PANGO_CFLAGS@
14943
PANGO_LIBS = @PANGO_LIBS@
14944
--- plymouth-0.8.2.orig/src/plugins/renderers/drm/Makefile.in
14945
+++ plymouth-0.8.2/src/plugins/renderers/drm/Makefile.in
14946
@@ -175,6 +175,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
14947
PACKAGE_NAME = @PACKAGE_NAME@
14948
PACKAGE_STRING = @PACKAGE_STRING@
14949
PACKAGE_TARNAME = @PACKAGE_TARNAME@
14950
+PACKAGE_URL = @PACKAGE_URL@
14951
PACKAGE_VERSION = @PACKAGE_VERSION@
14952
PANGO_CFLAGS = @PANGO_CFLAGS@
14953
PANGO_LIBS = @PANGO_LIBS@
14954
--- plymouth-0.8.2.orig/src/plugins/renderers/drm/plugin.c
14955
+++ plymouth-0.8.2/src/plugins/renderers/drm/plugin.c
14956
@@ -454,10 +454,15 @@ load_driver (ply_renderer_backend_t *bac
14957
backend->driver_interface = ply_renderer_radeon_driver_get_interface ();
14958
backend->driver_supports_mapping_console = false;
14959
}
14960
- else if (strcmp (driver_name, "nouveau") == 0)
14961
+ else if (strcmp (driver_name, "nouveau") == 0
14962
+ || strcmp (driver_name, "lbm-nouveau") == 0)
14963
{
14964
+#ifdef GDM_HANGING_IS_FINE_WITH_ME
14965
backend->driver_interface = ply_renderer_nouveau_driver_get_interface ();
14966
backend->driver_supports_mapping_console = false;
14967
+#else
14968
+ ply_trace("falling back to framebuffer for nouveau to avoid DRM hang");
14969
+#endif
14970
}
14971
free (driver_name);
14972
14973
--- /dev/null
14974
+++ plymouth-0.8.2/src/plugins/renderers/vga16fb/Makefile.in
14975
@@ -0,0 +1,592 @@
14976
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
14977
+# @configure_input@
14978
+
14979
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
14980
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
14981
+# Inc.
14982
+# This Makefile.in is free software; the Free Software Foundation
14983
+# gives unlimited permission to copy and/or distribute it,
14984
+# with or without modifications, as long as this notice is preserved.
14985
+
14986
+# This program is distributed in the hope that it will be useful,
14987
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
14988
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
14989
+# PARTICULAR PURPOSE.
14990
+
14991
+@SET_MAKE@
14992
+
14993
+VPATH = @srcdir@
14994
+pkgdatadir = $(datadir)/@PACKAGE@
14995
+pkgincludedir = $(includedir)/@PACKAGE@
14996
+pkglibdir = $(libdir)/@PACKAGE@
14997
+pkglibexecdir = $(libexecdir)/@PACKAGE@
14998
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
14999
+install_sh_DATA = $(install_sh) -c -m 644
15000
+install_sh_PROGRAM = $(install_sh) -c
15001
+install_sh_SCRIPT = $(install_sh) -c
15002
+INSTALL_HEADER = $(INSTALL_DATA)
15003
+transform = $(program_transform_name)
15004
+NORMAL_INSTALL = :
15005
+PRE_INSTALL = :
15006
+POST_INSTALL = :
15007
+NORMAL_UNINSTALL = :
15008
+PRE_UNINSTALL = :
15009
+POST_UNINSTALL = :
15010
+build_triplet = @build@
15011
+host_triplet = @host@
15012
+subdir = src/plugins/renderers/vga16fb
15013
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
15014
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
15015
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
15016
+ $(top_srcdir)/configure.ac
15017
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
15018
+ $(ACLOCAL_M4)
15019
+mkinstalldirs = $(install_sh) -d
15020
+CONFIG_HEADER = $(top_builddir)/config.h
15021
+CONFIG_CLEAN_FILES =
15022
+CONFIG_CLEAN_VPATH_FILES =
15023
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
15024
+am__vpath_adj = case $$p in \
15025
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
15026
+ *) f=$$p;; \
15027
+ esac;
15028
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
15029
+am__install_max = 40
15030
+am__nobase_strip_setup = \
15031
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
15032
+am__nobase_strip = \
15033
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
15034
+am__nobase_list = $(am__nobase_strip_setup); \
15035
+ for p in $$list; do echo "$$p $$p"; done | \
15036
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
15037
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
15038
+ if (++n[$$2] == $(am__install_max)) \
15039
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
15040
+ END { for (dir in files) print dir, files[dir] }'
15041
+am__base_list = \
15042
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
15043
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
15044
+am__installdirs = "$(DESTDIR)$(plugindir)"
15045
+LTLIBRARIES = $(plugin_LTLIBRARIES)
15046
+am__DEPENDENCIES_1 =
15047
+vga16fb_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
15048
+ ../../../libply/libply.la \
15049
+ ../../../libply-splash-core/libply-splash-core.la
15050
+am_vga16fb_la_OBJECTS = vga16fb_la-plugin.lo
15051
+vga16fb_la_OBJECTS = $(am_vga16fb_la_OBJECTS)
15052
+AM_V_lt = $(am__v_lt_$(V))
15053
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
15054
+am__v_lt_0 = --silent
15055
+vga16fb_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
15056
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(vga16fb_la_CFLAGS) \
15057
+ $(CFLAGS) $(vga16fb_la_LDFLAGS) $(LDFLAGS) -o $@
15058
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
15059
+depcomp = $(SHELL) $(top_srcdir)/build-tools/depcomp
15060
+am__depfiles_maybe = depfiles
15061
+am__mv = mv -f
15062
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
15063
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
15064
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
15065
+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
15066
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
15067
+ $(AM_CFLAGS) $(CFLAGS)
15068
+AM_V_CC = $(am__v_CC_$(V))
15069
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
15070
+am__v_CC_0 = @echo " CC " $@;
15071
+AM_V_at = $(am__v_at_$(V))
15072
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
15073
+am__v_at_0 = @
15074
+CCLD = $(CC)
15075
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
15076
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
15077
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
15078
+AM_V_CCLD = $(am__v_CCLD_$(V))
15079
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
15080
+am__v_CCLD_0 = @echo " CCLD " $@;
15081
+AM_V_GEN = $(am__v_GEN_$(V))
15082
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
15083
+am__v_GEN_0 = @echo " GEN " $@;
15084
+SOURCES = $(vga16fb_la_SOURCES)
15085
+DIST_SOURCES = $(vga16fb_la_SOURCES)
15086
+ETAGS = etags
15087
+CTAGS = ctags
15088
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
15089
+ACLOCAL = @ACLOCAL@
15090
+AMTAR = @AMTAR@
15091
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
15092
+AR = @AR@
15093
+AUTOCONF = @AUTOCONF@
15094
+AUTOHEADER = @AUTOHEADER@
15095
+AUTOMAKE = @AUTOMAKE@
15096
+AWK = @AWK@
15097
+CC = @CC@
15098
+CCDEPMODE = @CCDEPMODE@
15099
+CFLAGS = @CFLAGS@
15100
+CPP = @CPP@
15101
+CPPFLAGS = @CPPFLAGS@
15102
+CYGPATH_W = @CYGPATH_W@
15103
+DEFS = @DEFS@
15104
+DEPDIR = @DEPDIR@
15105
+DRM_CFLAGS = @DRM_CFLAGS@
15106
+DRM_LIBS = @DRM_LIBS@
15107
+DSYMUTIL = @DSYMUTIL@
15108
+DUMPBIN = @DUMPBIN@
15109
+ECHO_C = @ECHO_C@
15110
+ECHO_N = @ECHO_N@
15111
+ECHO_T = @ECHO_T@
15112
+EGREP = @EGREP@
15113
+EXEEXT = @EXEEXT@
15114
+FGREP = @FGREP@
15115
+GREP = @GREP@
15116
+GTK_CFLAGS = @GTK_CFLAGS@
15117
+GTK_LIBS = @GTK_LIBS@
15118
+IMAGE_CFLAGS = @IMAGE_CFLAGS@
15119
+IMAGE_LIBS = @IMAGE_LIBS@
15120
+INSTALL = @INSTALL@
15121
+INSTALL_DATA = @INSTALL_DATA@
15122
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
15123
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
15124
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
15125
+LD = @LD@
15126
+LDFLAGS = @LDFLAGS@
15127
+LIBOBJS = @LIBOBJS@
15128
+LIBS = @LIBS@
15129
+LIBTOOL = @LIBTOOL@
15130
+LIPO = @LIPO@
15131
+LN_S = @LN_S@
15132
+LTLIBOBJS = @LTLIBOBJS@
15133
+LT_AGE = @LT_AGE@
15134
+LT_CURRENT = @LT_CURRENT@
15135
+LT_REVISION = @LT_REVISION@
15136
+MAINT = @MAINT@
15137
+MAKEINFO = @MAKEINFO@
15138
+MKDIR_P = @MKDIR_P@
15139
+NM = @NM@
15140
+NMEDIT = @NMEDIT@
15141
+OBJDUMP = @OBJDUMP@
15142
+OBJEXT = @OBJEXT@
15143
+OTOOL = @OTOOL@
15144
+OTOOL64 = @OTOOL64@
15145
+PACKAGE = @PACKAGE@
15146
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
15147
+PACKAGE_NAME = @PACKAGE_NAME@
15148
+PACKAGE_STRING = @PACKAGE_STRING@
15149
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
15150
+PACKAGE_URL = @PACKAGE_URL@
15151
+PACKAGE_VERSION = @PACKAGE_VERSION@
15152
+PANGO_CFLAGS = @PANGO_CFLAGS@
15153
+PANGO_LIBS = @PANGO_LIBS@
15154
+PATH_SEPARATOR = @PATH_SEPARATOR@
15155
+PKG_CONFIG = @PKG_CONFIG@
15156
+PLYMOUTH_CFLAGS = @PLYMOUTH_CFLAGS@
15157
+PLYMOUTH_CONF_DIR = @PLYMOUTH_CONF_DIR@
15158
+PLYMOUTH_DATADIR = @PLYMOUTH_DATADIR@
15159
+PLYMOUTH_LIBDIR = @PLYMOUTH_LIBDIR@
15160
+PLYMOUTH_LIBEXECDIR = @PLYMOUTH_LIBEXECDIR@
15161
+PLYMOUTH_LIBS = @PLYMOUTH_LIBS@
15162
+PLYMOUTH_PLUGIN_PATH = @PLYMOUTH_PLUGIN_PATH@
15163
+PLYMOUTH_POLICY_DIR = @PLYMOUTH_POLICY_DIR@
15164
+PLYMOUTH_THEME_PATH = @PLYMOUTH_THEME_PATH@
15165
+RANLIB = @RANLIB@
15166
+RELEASE_FILE = @RELEASE_FILE@
15167
+SED = @SED@
15168
+SET_MAKE = @SET_MAKE@
15169
+SHELL = @SHELL@
15170
+STRIP = @STRIP@
15171
+VERSION = @VERSION@
15172
+abs_builddir = @abs_builddir@
15173
+abs_srcdir = @abs_srcdir@
15174
+abs_top_builddir = @abs_top_builddir@
15175
+abs_top_srcdir = @abs_top_srcdir@
15176
+ac_ct_CC = @ac_ct_CC@
15177
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
15178
+am__include = @am__include@
15179
+am__leading_dot = @am__leading_dot@
15180
+am__quote = @am__quote@
15181
+am__tar = @am__tar@
15182
+am__untar = @am__untar@
15183
+background_color = @background_color@
15184
+background_end_color = @background_end_color@
15185
+background_start_color = @background_start_color@
15186
+bindir = @bindir@
15187
+build = @build@
15188
+build_alias = @build_alias@
15189
+build_cpu = @build_cpu@
15190
+build_os = @build_os@
15191
+build_vendor = @build_vendor@
15192
+builddir = @builddir@
15193
+datadir = @datadir@
15194
+datarootdir = @datarootdir@
15195
+docdir = @docdir@
15196
+dvidir = @dvidir@
15197
+exec_prefix = @exec_prefix@
15198
+host = @host@
15199
+host_alias = @host_alias@
15200
+host_cpu = @host_cpu@
15201
+host_os = @host_os@
15202
+host_vendor = @host_vendor@
15203
+htmldir = @htmldir@
15204
+includedir = @includedir@
15205
+infodir = @infodir@
15206
+install_sh = @install_sh@
15207
+libdir = @libdir@
15208
+libexecdir = @libexecdir@
15209
+localedir = @localedir@
15210
+localstatedir = @localstatedir@
15211
+logofile = @logofile@
15212
+lt_ECHO = @lt_ECHO@
15213
+mandir = @mandir@
15214
+mkdir_p = @mkdir_p@
15215
+oldincludedir = @oldincludedir@
15216
+pdfdir = @pdfdir@
15217
+plymouthclientdir = @plymouthclientdir@
15218
+plymouthdaemondir = @plymouthdaemondir@
15219
+prefix = @prefix@
15220
+program_transform_name = @program_transform_name@
15221
+psdir = @psdir@
15222
+sbindir = @sbindir@
15223
+sharedstatedir = @sharedstatedir@
15224
+srcdir = @srcdir@
15225
+sysconfdir = @sysconfdir@
15226
+target_alias = @target_alias@
15227
+top_build_prefix = @top_build_prefix@
15228
+top_builddir = @top_builddir@
15229
+top_srcdir = @top_srcdir@
15230
+INCLUDES = -I$(top_srcdir) \
15231
+ -I$(srcdir)/../../../libply \
15232
+ -I$(srcdir)/../../../libply-splash-core \
15233
+ -I$(srcdir)/../../.. \
15234
+ -I$(srcdir)/../.. \
15235
+ -I$(srcdir)/.. \
15236
+ -I$(srcdir)
15237
+
15238
+plugindir = $(libdir)/plymouth/renderers
15239
+plugin_LTLIBRARIES = vga16fb.la
15240
+vga16fb_la_CFLAGS = $(PLYMOUTH_CFLAGS)
15241
+vga16fb_la_LDFLAGS = -module -avoid-version -export-dynamic
15242
+vga16fb_la_LIBADD = $(PLYMOUTH_LIBS) \
15243
+ ../../../libply/libply.la \
15244
+ ../../../libply-splash-core/libply-splash-core.la
15245
+
15246
+vga16fb_la_SOURCES = $(srcdir)/plugin.c
15247
+MAINTAINERCLEANFILES = Makefile.in
15248
+all: all-am
15249
+
15250
+.SUFFIXES:
15251
+.SUFFIXES: .c .lo .o .obj
15252
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
15253
+ @for dep in $?; do \
15254
+ case '$(am__configure_deps)' in \
15255
+ *$$dep*) \
15256
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
15257
+ && { if test -f $@; then exit 0; else break; fi; }; \
15258
+ exit 1;; \
15259
+ esac; \
15260
+ done; \
15261
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/plugins/renderers/vga16fb/Makefile'; \
15262
+ $(am__cd) $(top_srcdir) && \
15263
+ $(AUTOMAKE) --gnu src/plugins/renderers/vga16fb/Makefile
15264
+.PRECIOUS: Makefile
15265
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
15266
+ @case '$?' in \
15267
+ *config.status*) \
15268
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
15269
+ *) \
15270
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
15271
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
15272
+ esac;
15273
+
15274
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
15275
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
15276
+
15277
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
15278
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
15279
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
15280
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
15281
+$(am__aclocal_m4_deps):
15282
+install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
15283
+ @$(NORMAL_INSTALL)
15284
+ test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
15285
+ @list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
15286
+ list2=; for p in $$list; do \
15287
+ if test -f $$p; then \
15288
+ list2="$$list2 $$p"; \
15289
+ else :; fi; \
15290
+ done; \
15291
+ test -z "$$list2" || { \
15292
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
15293
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
15294
+ }
15295
+
15296
+uninstall-pluginLTLIBRARIES:
15297
+ @$(NORMAL_UNINSTALL)
15298
+ @list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
15299
+ for p in $$list; do \
15300
+ $(am__strip_dir) \
15301
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$f'"; \
15302
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$f"; \
15303
+ done
15304
+
15305
+clean-pluginLTLIBRARIES:
15306
+ -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
15307
+ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
15308
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
15309
+ test "$$dir" != "$$p" || dir=.; \
15310
+ echo "rm -f \"$${dir}/so_locations\""; \
15311
+ rm -f "$${dir}/so_locations"; \
15312
+ done
15313
+vga16fb.la: $(vga16fb_la_OBJECTS) $(vga16fb_la_DEPENDENCIES)
15314
+ $(AM_V_CCLD)$(vga16fb_la_LINK) -rpath $(plugindir) $(vga16fb_la_OBJECTS) $(vga16fb_la_LIBADD) $(LIBS)
15315
+
15316
+mostlyclean-compile:
15317
+ -rm -f *.$(OBJEXT)
15318
+
15319
+distclean-compile:
15320
+ -rm -f *.tab.c
15321
+
15322
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vga16fb_la-plugin.Plo@am__quote@
15323
+
15324
+.c.o:
15325
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
15326
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
15327
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
15328
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
15329
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
15330
+@am__fastdepCC_FALSE@ $(COMPILE) -c $<
15331
+
15332
+.c.obj:
15333
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
15334
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
15335
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
15336
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
15337
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
15338
+@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
15339
+
15340
+.c.lo:
15341
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
15342
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
15343
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
15344
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
15345
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
15346
+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
15347
+
15348
+vga16fb_la-plugin.lo: $(srcdir)/plugin.c
15349
+@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
15350
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vga16fb_la-plugin.Tpo $(DEPDIR)/vga16fb_la-plugin.Plo
15351
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
15352
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/plugin.c' object='vga16fb_la-plugin.lo' libtool=yes @AMDEPBACKSLASH@
15353
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
15354
+@am__fastdepCC_FALSE@ $(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
15355
+
15356
+mostlyclean-libtool:
15357
+ -rm -f *.lo
15358
+
15359
+clean-libtool:
15360
+ -rm -rf .libs _libs
15361
+
15362
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
15363
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
15364
+ unique=`for i in $$list; do \
15365
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
15366
+ done | \
15367
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
15368
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
15369
+ mkid -fID $$unique
15370
+tags: TAGS
15371
+
15372
+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
15373
+ $(TAGS_FILES) $(LISP)
15374
+ set x; \
15375
+ here=`pwd`; \
15376
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
15377
+ unique=`for i in $$list; do \
15378
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
15379
+ done | \
15380
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
15381
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
15382
+ shift; \
15383
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
15384
+ test -n "$$unique" || unique=$$empty_fix; \
15385
+ if test $$# -gt 0; then \
15386
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
15387
+ "$$@" $$unique; \
15388
+ else \
15389
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
15390
+ $$unique; \
15391
+ fi; \
15392
+ fi
15393
+ctags: CTAGS
15394
+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
15395
+ $(TAGS_FILES) $(LISP)
15396
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
15397
+ unique=`for i in $$list; do \
15398
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
15399
+ done | \
15400
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
15401
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
15402
+ test -z "$(CTAGS_ARGS)$$unique" \
15403
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
15404
+ $$unique
15405
+
15406
+GTAGS:
15407
+ here=`$(am__cd) $(top_builddir) && pwd` \
15408
+ && $(am__cd) $(top_srcdir) \
15409
+ && gtags -i $(GTAGS_ARGS) "$$here"
15410
+
15411
+distclean-tags:
15412
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
15413
+
15414
+distdir: $(DISTFILES)
15415
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
15416
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
15417
+ list='$(DISTFILES)'; \
15418
+ dist_files=`for file in $$list; do echo $$file; done | \
15419
+ sed -e "s|^$$srcdirstrip/||;t" \
15420
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
15421
+ case $$dist_files in \
15422
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
15423
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
15424
+ sort -u` ;; \
15425
+ esac; \
15426
+ for file in $$dist_files; do \
15427
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
15428
+ if test -d $$d/$$file; then \
15429
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
15430
+ if test -d "$(distdir)/$$file"; then \
15431
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
15432
+ fi; \
15433
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
15434
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
15435
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
15436
+ fi; \
15437
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
15438
+ else \
15439
+ test -f "$(distdir)/$$file" \
15440
+ || cp -p $$d/$$file "$(distdir)/$$file" \
15441
+ || exit 1; \
15442
+ fi; \
15443
+ done
15444
+check-am: all-am
15445
+check: check-am
15446
+all-am: Makefile $(LTLIBRARIES)
15447
+installdirs:
15448
+ for dir in "$(DESTDIR)$(plugindir)"; do \
15449
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
15450
+ done
15451
+install: install-am
15452
+install-exec: install-exec-am
15453
+install-data: install-data-am
15454
+uninstall: uninstall-am
15455
+
15456
+install-am: all-am
15457
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
15458
+
15459
+installcheck: installcheck-am
15460
+install-strip:
15461
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
15462
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
15463
+ `test -z '$(STRIP)' || \
15464
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
15465
+mostlyclean-generic:
15466
+
15467
+clean-generic:
15468
+
15469
+distclean-generic:
15470
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
15471
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
15472
+
15473
+maintainer-clean-generic:
15474
+ @echo "This command is intended for maintainers to use"
15475
+ @echo "it deletes files that may require special tools to rebuild."
15476
+ -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
15477
+clean: clean-am
15478
+
15479
+clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \
15480
+ mostlyclean-am
15481
+
15482
+distclean: distclean-am
15483
+ -rm -rf ./$(DEPDIR)
15484
+ -rm -f Makefile
15485
+distclean-am: clean-am distclean-compile distclean-generic \
15486
+ distclean-tags
15487
+
15488
+dvi: dvi-am
15489
+
15490
+dvi-am:
15491
+
15492
+html: html-am
15493
+
15494
+html-am:
15495
+
15496
+info: info-am
15497
+
15498
+info-am:
15499
+
15500
+install-data-am: install-pluginLTLIBRARIES
15501
+
15502
+install-dvi: install-dvi-am
15503
+
15504
+install-dvi-am:
15505
+
15506
+install-exec-am:
15507
+
15508
+install-html: install-html-am
15509
+
15510
+install-html-am:
15511
+
15512
+install-info: install-info-am
15513
+
15514
+install-info-am:
15515
+
15516
+install-man:
15517
+
15518
+install-pdf: install-pdf-am
15519
+
15520
+install-pdf-am:
15521
+
15522
+install-ps: install-ps-am
15523
+
15524
+install-ps-am:
15525
+
15526
+installcheck-am:
15527
+
15528
+maintainer-clean: maintainer-clean-am
15529
+ -rm -rf ./$(DEPDIR)
15530
+ -rm -f Makefile
15531
+maintainer-clean-am: distclean-am maintainer-clean-generic
15532
+
15533
+mostlyclean: mostlyclean-am
15534
+
15535
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
15536
+ mostlyclean-libtool
15537
+
15538
+pdf: pdf-am
15539
+
15540
+pdf-am:
15541
+
15542
+ps: ps-am
15543
+
15544
+ps-am:
15545
+
15546
+uninstall-am: uninstall-pluginLTLIBRARIES
15547
+
15548
+.MAKE: install-am install-strip
15549
+
15550
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
15551
+ clean-libtool clean-pluginLTLIBRARIES ctags distclean \
15552
+ distclean-compile distclean-generic distclean-libtool \
15553
+ distclean-tags distdir dvi dvi-am html html-am info info-am \
15554
+ install install-am install-data install-data-am install-dvi \
15555
+ install-dvi-am install-exec install-exec-am install-html \
15556
+ install-html-am install-info install-info-am install-man \
15557
+ install-pdf install-pdf-am install-pluginLTLIBRARIES \
15558
+ install-ps install-ps-am install-strip installcheck \
15559
+ installcheck-am installdirs maintainer-clean \
15560
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
15561
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
15562
+ tags uninstall uninstall-am uninstall-pluginLTLIBRARIES
15563
+
15564
+
15565
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
15566
+# Otherwise a system limit (for SysV at least) may be exceeded.
15567
+.NOEXPORT:
15568
--- /dev/null
15569
+++ plymouth-0.8.2/src/plugins/renderers/vga16fb/Makefile.am
15570
@@ -0,0 +1,20 @@
15571
+INCLUDES = -I$(top_srcdir) \
15572
+ -I$(srcdir)/../../../libply \
15573
+ -I$(srcdir)/../../../libply-splash-core \
15574
+ -I$(srcdir)/../../.. \
15575
+ -I$(srcdir)/../.. \
15576
+ -I$(srcdir)/.. \
15577
+ -I$(srcdir)
15578
+
15579
+plugindir = $(libdir)/plymouth/renderers
15580
+plugin_LTLIBRARIES = vga16fb.la
15581
+
15582
+vga16fb_la_CFLAGS = $(PLYMOUTH_CFLAGS)
15583
+
15584
+vga16fb_la_LDFLAGS = -module -avoid-version -export-dynamic
15585
+vga16fb_la_LIBADD = $(PLYMOUTH_LIBS) \
15586
+ ../../../libply/libply.la \
15587
+ ../../../libply-splash-core/libply-splash-core.la
15588
+vga16fb_la_SOURCES = $(srcdir)/plugin.c
15589
+
15590
+MAINTAINERCLEANFILES = Makefile.in
13366
--- plymouth-0.8.2.orig/src/plugins/renderers/frame-buffer/Makefile.in
13367
+++ plymouth-0.8.2/src/plugins/renderers/frame-buffer/Makefile.in
13368
@@ -173,6 +173,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
13369
PACKAGE_NAME = @PACKAGE_NAME@
13370
PACKAGE_STRING = @PACKAGE_STRING@
13371
PACKAGE_TARNAME = @PACKAGE_TARNAME@
13372
+PACKAGE_URL = @PACKAGE_URL@
13373
PACKAGE_VERSION = @PACKAGE_VERSION@
13374
PANGO_CFLAGS = @PANGO_CFLAGS@
13375
PANGO_LIBS = @PANGO_LIBS@
15591
13376
--- /dev/null
15592
13377
+++ plymouth-0.8.2/src/plugins/renderers/vga16fb/plugin.c
15593
13378
@@ -0,0 +1,696 @@
16288
14073
+}
16289
14074
+/* vim: set ts=4 sw=4 et ai ci cino={.5s,^-2,+.5s,t0,g0,e-2,n-2,p2s,(0,=.5s,:.5s */
16290
14075
--- /dev/null
14076
+++ plymouth-0.8.2/src/plugins/renderers/vga16fb/Makefile.am
14077
@@ -0,0 +1,20 @@
14078
+INCLUDES = -I$(top_srcdir) \
14079
+ -I$(srcdir)/../../../libply \
14080
+ -I$(srcdir)/../../../libply-splash-core \
14081
+ -I$(srcdir)/../../.. \
14082
+ -I$(srcdir)/../.. \
14083
+ -I$(srcdir)/.. \
14084
+ -I$(srcdir)
14085
+
14086
+plugindir = $(libdir)/plymouth/renderers
14087
+plugin_LTLIBRARIES = vga16fb.la
14088
+
14089
+vga16fb_la_CFLAGS = $(PLYMOUTH_CFLAGS)
14090
+
14091
+vga16fb_la_LDFLAGS = -module -avoid-version -export-dynamic
14092
+vga16fb_la_LIBADD = $(PLYMOUTH_LIBS) \
14093
+ ../../../libply/libply.la \
14094
+ ../../../libply-splash-core/libply-splash-core.la
14095
+vga16fb_la_SOURCES = $(srcdir)/plugin.c
14096
+
14097
+MAINTAINERCLEANFILES = Makefile.in
14098
--- /dev/null
16291
14099
+++ plymouth-0.8.2/src/plugins/renderers/vga16fb/vga.h
16292
14100
@@ -0,0 +1,107 @@
16293
14101
+/* vga.h - inlines for programming the VGA
16397
14205
+#endif /* PLY_VGA_H */
16398
14206
+/* vim: set ts=4 sw=4 et ai ci cino={.5s,^-2,+.5s,t0,g0,e-2,n-2,p2s,(0,=.5s,:.5s */
16399
14207
+
16400
--- plymouth-0.8.2.orig/src/client/Makefile.in
16401
+++ plymouth-0.8.2/src/client/Makefile.in
16402
@@ -228,6 +228,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
16403
PACKAGE_NAME = @PACKAGE_NAME@
16404
PACKAGE_STRING = @PACKAGE_STRING@
16405
PACKAGE_TARNAME = @PACKAGE_TARNAME@
16406
+PACKAGE_URL = @PACKAGE_URL@
16407
PACKAGE_VERSION = @PACKAGE_VERSION@
16408
PANGO_CFLAGS = @PANGO_CFLAGS@
16409
PANGO_LIBS = @PANGO_LIBS@
16410
--- plymouth-0.8.2.orig/src/client/ply-boot-client.h
16411
+++ plymouth-0.8.2/src/client/ply-boot-client.h
16412
@@ -129,6 +129,7 @@ void ply_boot_client_ask_daemon_has_acti
16413
ply_boot_client_response_handler_t handler,
16414
ply_boot_client_response_handler_t failed_handler,
16415
void *user_data);
16416
+void ply_boot_client_flush (ply_boot_client_t *client);
16417
void ply_boot_client_disconnect (ply_boot_client_t *client);
16418
void ply_boot_client_attach_to_event_loop (ply_boot_client_t *client,
16419
ply_event_loop_t *loop);
16420
--- plymouth-0.8.2.orig/src/client/ply-boot-client.c
16421
+++ plymouth-0.8.2/src/client/ply-boot-client.c
16422
@@ -743,6 +743,19 @@ ply_boot_client_tell_daemon_about_error
16423
}
16424
16425
void
16426
+ply_boot_client_flush (ply_boot_client_t *client)
16427
+{
16428
+ assert (client != NULL);
16429
+
16430
+ while (ply_list_get_length (client->requests_to_send) > 0)
16431
+ {
16432
+ if (ply_list_get_length (client->requests_waiting_for_replies) > 0)
16433
+ ply_boot_client_process_incoming_replies (client);
16434
+ ply_boot_client_process_pending_requests (client);
16435
+ }
16436
+}
16437
+
16438
+void
16439
ply_boot_client_disconnect (ply_boot_client_t *client)
16440
{
16441
assert (client != NULL);
16442
--- plymouth-0.8.2.orig/src/client/tests/Makefile.in
16443
+++ plymouth-0.8.2/src/client/tests/Makefile.in
16444
@@ -121,6 +121,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
16445
PACKAGE_NAME = @PACKAGE_NAME@
16446
PACKAGE_STRING = @PACKAGE_STRING@
16447
PACKAGE_TARNAME = @PACKAGE_TARNAME@
16448
+PACKAGE_URL = @PACKAGE_URL@
16449
PACKAGE_VERSION = @PACKAGE_VERSION@
16450
PANGO_CFLAGS = @PANGO_CFLAGS@
16451
PANGO_LIBS = @PANGO_LIBS@
16452
--- plymouth-0.8.2.orig/src/libply/Makefile.in
16453
+++ plymouth-0.8.2/src/libply/Makefile.in
16454
@@ -219,6 +219,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
16455
PACKAGE_NAME = @PACKAGE_NAME@
16456
PACKAGE_STRING = @PACKAGE_STRING@
16457
PACKAGE_TARNAME = @PACKAGE_TARNAME@
16458
+PACKAGE_URL = @PACKAGE_URL@
16459
PACKAGE_VERSION = @PACKAGE_VERSION@
16460
PANGO_CFLAGS = @PANGO_CFLAGS@
16461
PANGO_LIBS = @PANGO_LIBS@
16462
--- plymouth-0.8.2.orig/src/libply/tests/Makefile.in
16463
+++ plymouth-0.8.2/src/libply/tests/Makefile.in
16464
@@ -342,6 +342,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
14208
--- /dev/null
14209
+++ plymouth-0.8.2/src/plugins/renderers/vga16fb/Makefile.in
14210
@@ -0,0 +1,592 @@
14211
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
14212
+# @configure_input@
14213
+
14214
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
14215
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
14216
+# Inc.
14217
+# This Makefile.in is free software; the Free Software Foundation
14218
+# gives unlimited permission to copy and/or distribute it,
14219
+# with or without modifications, as long as this notice is preserved.
14220
+
14221
+# This program is distributed in the hope that it will be useful,
14222
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
14223
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
14224
+# PARTICULAR PURPOSE.
14225
+
14226
+@SET_MAKE@
14227
+
14228
+VPATH = @srcdir@
14229
+pkgdatadir = $(datadir)/@PACKAGE@
14230
+pkgincludedir = $(includedir)/@PACKAGE@
14231
+pkglibdir = $(libdir)/@PACKAGE@
14232
+pkglibexecdir = $(libexecdir)/@PACKAGE@
14233
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
14234
+install_sh_DATA = $(install_sh) -c -m 644
14235
+install_sh_PROGRAM = $(install_sh) -c
14236
+install_sh_SCRIPT = $(install_sh) -c
14237
+INSTALL_HEADER = $(INSTALL_DATA)
14238
+transform = $(program_transform_name)
14239
+NORMAL_INSTALL = :
14240
+PRE_INSTALL = :
14241
+POST_INSTALL = :
14242
+NORMAL_UNINSTALL = :
14243
+PRE_UNINSTALL = :
14244
+POST_UNINSTALL = :
14245
+build_triplet = @build@
14246
+host_triplet = @host@
14247
+subdir = src/plugins/renderers/vga16fb
14248
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
14249
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
14250
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
14251
+ $(top_srcdir)/configure.ac
14252
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
14253
+ $(ACLOCAL_M4)
14254
+mkinstalldirs = $(install_sh) -d
14255
+CONFIG_HEADER = $(top_builddir)/config.h
14256
+CONFIG_CLEAN_FILES =
14257
+CONFIG_CLEAN_VPATH_FILES =
14258
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
14259
+am__vpath_adj = case $$p in \
14260
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
14261
+ *) f=$$p;; \
14262
+ esac;
14263
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
14264
+am__install_max = 40
14265
+am__nobase_strip_setup = \
14266
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
14267
+am__nobase_strip = \
14268
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
14269
+am__nobase_list = $(am__nobase_strip_setup); \
14270
+ for p in $$list; do echo "$$p $$p"; done | \
14271
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
14272
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
14273
+ if (++n[$$2] == $(am__install_max)) \
14274
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
14275
+ END { for (dir in files) print dir, files[dir] }'
14276
+am__base_list = \
14277
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
14278
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
14279
+am__installdirs = "$(DESTDIR)$(plugindir)"
14280
+LTLIBRARIES = $(plugin_LTLIBRARIES)
14281
+am__DEPENDENCIES_1 =
14282
+vga16fb_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
14283
+ ../../../libply/libply.la \
14284
+ ../../../libply-splash-core/libply-splash-core.la
14285
+am_vga16fb_la_OBJECTS = vga16fb_la-plugin.lo
14286
+vga16fb_la_OBJECTS = $(am_vga16fb_la_OBJECTS)
14287
+AM_V_lt = $(am__v_lt_$(V))
14288
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
14289
+am__v_lt_0 = --silent
14290
+vga16fb_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
14291
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(vga16fb_la_CFLAGS) \
14292
+ $(CFLAGS) $(vga16fb_la_LDFLAGS) $(LDFLAGS) -o $@
14293
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
14294
+depcomp = $(SHELL) $(top_srcdir)/build-tools/depcomp
14295
+am__depfiles_maybe = depfiles
14296
+am__mv = mv -f
14297
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
14298
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
14299
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
14300
+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
14301
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
14302
+ $(AM_CFLAGS) $(CFLAGS)
14303
+AM_V_CC = $(am__v_CC_$(V))
14304
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
14305
+am__v_CC_0 = @echo " CC " $@;
14306
+AM_V_at = $(am__v_at_$(V))
14307
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
14308
+am__v_at_0 = @
14309
+CCLD = $(CC)
14310
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
14311
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
14312
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
14313
+AM_V_CCLD = $(am__v_CCLD_$(V))
14314
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
14315
+am__v_CCLD_0 = @echo " CCLD " $@;
14316
+AM_V_GEN = $(am__v_GEN_$(V))
14317
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
14318
+am__v_GEN_0 = @echo " GEN " $@;
14319
+SOURCES = $(vga16fb_la_SOURCES)
14320
+DIST_SOURCES = $(vga16fb_la_SOURCES)
14321
+ETAGS = etags
14322
+CTAGS = ctags
14323
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
14324
+ACLOCAL = @ACLOCAL@
14325
+AMTAR = @AMTAR@
14326
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
14327
+AR = @AR@
14328
+AUTOCONF = @AUTOCONF@
14329
+AUTOHEADER = @AUTOHEADER@
14330
+AUTOMAKE = @AUTOMAKE@
14331
+AWK = @AWK@
14332
+CC = @CC@
14333
+CCDEPMODE = @CCDEPMODE@
14334
+CFLAGS = @CFLAGS@
14335
+CPP = @CPP@
14336
+CPPFLAGS = @CPPFLAGS@
14337
+CYGPATH_W = @CYGPATH_W@
14338
+DEFS = @DEFS@
14339
+DEPDIR = @DEPDIR@
14340
+DRM_CFLAGS = @DRM_CFLAGS@
14341
+DRM_LIBS = @DRM_LIBS@
14342
+DSYMUTIL = @DSYMUTIL@
14343
+DUMPBIN = @DUMPBIN@
14344
+ECHO_C = @ECHO_C@
14345
+ECHO_N = @ECHO_N@
14346
+ECHO_T = @ECHO_T@
14347
+EGREP = @EGREP@
14348
+EXEEXT = @EXEEXT@
14349
+FGREP = @FGREP@
14350
+GREP = @GREP@
14351
+GTK_CFLAGS = @GTK_CFLAGS@
14352
+GTK_LIBS = @GTK_LIBS@
14353
+IMAGE_CFLAGS = @IMAGE_CFLAGS@
14354
+IMAGE_LIBS = @IMAGE_LIBS@
14355
+INSTALL = @INSTALL@
14356
+INSTALL_DATA = @INSTALL_DATA@
14357
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
14358
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
14359
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
14360
+LD = @LD@
14361
+LDFLAGS = @LDFLAGS@
14362
+LIBOBJS = @LIBOBJS@
14363
+LIBS = @LIBS@
14364
+LIBTOOL = @LIBTOOL@
14365
+LIPO = @LIPO@
14366
+LN_S = @LN_S@
14367
+LTLIBOBJS = @LTLIBOBJS@
14368
+LT_AGE = @LT_AGE@
14369
+LT_CURRENT = @LT_CURRENT@
14370
+LT_REVISION = @LT_REVISION@
14371
+MAINT = @MAINT@
14372
+MAKEINFO = @MAKEINFO@
14373
+MKDIR_P = @MKDIR_P@
14374
+NM = @NM@
14375
+NMEDIT = @NMEDIT@
14376
+OBJDUMP = @OBJDUMP@
14377
+OBJEXT = @OBJEXT@
14378
+OTOOL = @OTOOL@
14379
+OTOOL64 = @OTOOL64@
14380
+PACKAGE = @PACKAGE@
14381
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
14382
+PACKAGE_NAME = @PACKAGE_NAME@
14383
+PACKAGE_STRING = @PACKAGE_STRING@
14384
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
14385
+PACKAGE_URL = @PACKAGE_URL@
14386
+PACKAGE_VERSION = @PACKAGE_VERSION@
14387
+PANGO_CFLAGS = @PANGO_CFLAGS@
14388
+PANGO_LIBS = @PANGO_LIBS@
14389
+PATH_SEPARATOR = @PATH_SEPARATOR@
14390
+PKG_CONFIG = @PKG_CONFIG@
14391
+PLYMOUTH_CFLAGS = @PLYMOUTH_CFLAGS@
14392
+PLYMOUTH_CONF_DIR = @PLYMOUTH_CONF_DIR@
14393
+PLYMOUTH_DATADIR = @PLYMOUTH_DATADIR@
14394
+PLYMOUTH_LIBDIR = @PLYMOUTH_LIBDIR@
14395
+PLYMOUTH_LIBEXECDIR = @PLYMOUTH_LIBEXECDIR@
14396
+PLYMOUTH_LIBS = @PLYMOUTH_LIBS@
14397
+PLYMOUTH_PLUGIN_PATH = @PLYMOUTH_PLUGIN_PATH@
14398
+PLYMOUTH_POLICY_DIR = @PLYMOUTH_POLICY_DIR@
14399
+PLYMOUTH_THEME_PATH = @PLYMOUTH_THEME_PATH@
14400
+RANLIB = @RANLIB@
14401
+RELEASE_FILE = @RELEASE_FILE@
14402
+SED = @SED@
14403
+SET_MAKE = @SET_MAKE@
14404
+SHELL = @SHELL@
14405
+STRIP = @STRIP@
14406
+VERSION = @VERSION@
14407
+abs_builddir = @abs_builddir@
14408
+abs_srcdir = @abs_srcdir@
14409
+abs_top_builddir = @abs_top_builddir@
14410
+abs_top_srcdir = @abs_top_srcdir@
14411
+ac_ct_CC = @ac_ct_CC@
14412
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
14413
+am__include = @am__include@
14414
+am__leading_dot = @am__leading_dot@
14415
+am__quote = @am__quote@
14416
+am__tar = @am__tar@
14417
+am__untar = @am__untar@
14418
+background_color = @background_color@
14419
+background_end_color = @background_end_color@
14420
+background_start_color = @background_start_color@
14421
+bindir = @bindir@
14422
+build = @build@
14423
+build_alias = @build_alias@
14424
+build_cpu = @build_cpu@
14425
+build_os = @build_os@
14426
+build_vendor = @build_vendor@
14427
+builddir = @builddir@
14428
+datadir = @datadir@
14429
+datarootdir = @datarootdir@
14430
+docdir = @docdir@
14431
+dvidir = @dvidir@
14432
+exec_prefix = @exec_prefix@
14433
+host = @host@
14434
+host_alias = @host_alias@
14435
+host_cpu = @host_cpu@
14436
+host_os = @host_os@
14437
+host_vendor = @host_vendor@
14438
+htmldir = @htmldir@
14439
+includedir = @includedir@
14440
+infodir = @infodir@
14441
+install_sh = @install_sh@
14442
+libdir = @libdir@
14443
+libexecdir = @libexecdir@
14444
+localedir = @localedir@
14445
+localstatedir = @localstatedir@
14446
+logofile = @logofile@
14447
+lt_ECHO = @lt_ECHO@
14448
+mandir = @mandir@
14449
+mkdir_p = @mkdir_p@
14450
+oldincludedir = @oldincludedir@
14451
+pdfdir = @pdfdir@
14452
+plymouthclientdir = @plymouthclientdir@
14453
+plymouthdaemondir = @plymouthdaemondir@
14454
+prefix = @prefix@
14455
+program_transform_name = @program_transform_name@
14456
+psdir = @psdir@
14457
+sbindir = @sbindir@
14458
+sharedstatedir = @sharedstatedir@
14459
+srcdir = @srcdir@
14460
+sysconfdir = @sysconfdir@
14461
+target_alias = @target_alias@
14462
+top_build_prefix = @top_build_prefix@
14463
+top_builddir = @top_builddir@
14464
+top_srcdir = @top_srcdir@
14465
+INCLUDES = -I$(top_srcdir) \
14466
+ -I$(srcdir)/../../../libply \
14467
+ -I$(srcdir)/../../../libply-splash-core \
14468
+ -I$(srcdir)/../../.. \
14469
+ -I$(srcdir)/../.. \
14470
+ -I$(srcdir)/.. \
14471
+ -I$(srcdir)
14472
+
14473
+plugindir = $(libdir)/plymouth/renderers
14474
+plugin_LTLIBRARIES = vga16fb.la
14475
+vga16fb_la_CFLAGS = $(PLYMOUTH_CFLAGS)
14476
+vga16fb_la_LDFLAGS = -module -avoid-version -export-dynamic
14477
+vga16fb_la_LIBADD = $(PLYMOUTH_LIBS) \
14478
+ ../../../libply/libply.la \
14479
+ ../../../libply-splash-core/libply-splash-core.la
14480
+
14481
+vga16fb_la_SOURCES = $(srcdir)/plugin.c
14482
+MAINTAINERCLEANFILES = Makefile.in
14483
+all: all-am
14484
+
14485
+.SUFFIXES:
14486
+.SUFFIXES: .c .lo .o .obj
14487
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
14488
+ @for dep in $?; do \
14489
+ case '$(am__configure_deps)' in \
14490
+ *$$dep*) \
14491
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
14492
+ && { if test -f $@; then exit 0; else break; fi; }; \
14493
+ exit 1;; \
14494
+ esac; \
14495
+ done; \
14496
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/plugins/renderers/vga16fb/Makefile'; \
14497
+ $(am__cd) $(top_srcdir) && \
14498
+ $(AUTOMAKE) --gnu src/plugins/renderers/vga16fb/Makefile
14499
+.PRECIOUS: Makefile
14500
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
14501
+ @case '$?' in \
14502
+ *config.status*) \
14503
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
14504
+ *) \
14505
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
14506
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
14507
+ esac;
14508
+
14509
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
14510
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
14511
+
14512
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
14513
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
14514
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
14515
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
14516
+$(am__aclocal_m4_deps):
14517
+install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
14518
+ @$(NORMAL_INSTALL)
14519
+ test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
14520
+ @list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
14521
+ list2=; for p in $$list; do \
14522
+ if test -f $$p; then \
14523
+ list2="$$list2 $$p"; \
14524
+ else :; fi; \
14525
+ done; \
14526
+ test -z "$$list2" || { \
14527
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
14528
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
14529
+ }
14530
+
14531
+uninstall-pluginLTLIBRARIES:
14532
+ @$(NORMAL_UNINSTALL)
14533
+ @list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
14534
+ for p in $$list; do \
14535
+ $(am__strip_dir) \
14536
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$f'"; \
14537
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$f"; \
14538
+ done
14539
+
14540
+clean-pluginLTLIBRARIES:
14541
+ -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
14542
+ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
14543
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
14544
+ test "$$dir" != "$$p" || dir=.; \
14545
+ echo "rm -f \"$${dir}/so_locations\""; \
14546
+ rm -f "$${dir}/so_locations"; \
14547
+ done
14548
+vga16fb.la: $(vga16fb_la_OBJECTS) $(vga16fb_la_DEPENDENCIES)
14549
+ $(AM_V_CCLD)$(vga16fb_la_LINK) -rpath $(plugindir) $(vga16fb_la_OBJECTS) $(vga16fb_la_LIBADD) $(LIBS)
14550
+
14551
+mostlyclean-compile:
14552
+ -rm -f *.$(OBJEXT)
14553
+
14554
+distclean-compile:
14555
+ -rm -f *.tab.c
14556
+
14557
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vga16fb_la-plugin.Plo@am__quote@
14558
+
14559
+.c.o:
14560
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
14561
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
14562
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
14563
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
14564
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
14565
+@am__fastdepCC_FALSE@ $(COMPILE) -c $<
14566
+
14567
+.c.obj:
14568
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
14569
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
14570
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
14571
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
14572
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
14573
+@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
14574
+
14575
+.c.lo:
14576
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
14577
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
14578
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
14579
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
14580
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
14581
+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
14582
+
14583
+vga16fb_la-plugin.lo: $(srcdir)/plugin.c
14584
+@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
14585
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vga16fb_la-plugin.Tpo $(DEPDIR)/vga16fb_la-plugin.Plo
14586
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
14587
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/plugin.c' object='vga16fb_la-plugin.lo' libtool=yes @AMDEPBACKSLASH@
14588
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
14589
+@am__fastdepCC_FALSE@ $(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
14590
+
14591
+mostlyclean-libtool:
14592
+ -rm -f *.lo
14593
+
14594
+clean-libtool:
14595
+ -rm -rf .libs _libs
14596
+
14597
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
14598
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
14599
+ unique=`for i in $$list; do \
14600
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
14601
+ done | \
14602
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
14603
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
14604
+ mkid -fID $$unique
14605
+tags: TAGS
14606
+
14607
+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
14608
+ $(TAGS_FILES) $(LISP)
14609
+ set x; \
14610
+ here=`pwd`; \
14611
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
14612
+ unique=`for i in $$list; do \
14613
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
14614
+ done | \
14615
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
14616
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
14617
+ shift; \
14618
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
14619
+ test -n "$$unique" || unique=$$empty_fix; \
14620
+ if test $$# -gt 0; then \
14621
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
14622
+ "$$@" $$unique; \
14623
+ else \
14624
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
14625
+ $$unique; \
14626
+ fi; \
14627
+ fi
14628
+ctags: CTAGS
14629
+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
14630
+ $(TAGS_FILES) $(LISP)
14631
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
14632
+ unique=`for i in $$list; do \
14633
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
14634
+ done | \
14635
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
14636
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
14637
+ test -z "$(CTAGS_ARGS)$$unique" \
14638
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
14639
+ $$unique
14640
+
14641
+GTAGS:
14642
+ here=`$(am__cd) $(top_builddir) && pwd` \
14643
+ && $(am__cd) $(top_srcdir) \
14644
+ && gtags -i $(GTAGS_ARGS) "$$here"
14645
+
14646
+distclean-tags:
14647
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
14648
+
14649
+distdir: $(DISTFILES)
14650
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
14651
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
14652
+ list='$(DISTFILES)'; \
14653
+ dist_files=`for file in $$list; do echo $$file; done | \
14654
+ sed -e "s|^$$srcdirstrip/||;t" \
14655
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
14656
+ case $$dist_files in \
14657
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
14658
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
14659
+ sort -u` ;; \
14660
+ esac; \
14661
+ for file in $$dist_files; do \
14662
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
14663
+ if test -d $$d/$$file; then \
14664
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
14665
+ if test -d "$(distdir)/$$file"; then \
14666
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
14667
+ fi; \
14668
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
14669
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
14670
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
14671
+ fi; \
14672
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
14673
+ else \
14674
+ test -f "$(distdir)/$$file" \
14675
+ || cp -p $$d/$$file "$(distdir)/$$file" \
14676
+ || exit 1; \
14677
+ fi; \
14678
+ done
14679
+check-am: all-am
14680
+check: check-am
14681
+all-am: Makefile $(LTLIBRARIES)
14682
+installdirs:
14683
+ for dir in "$(DESTDIR)$(plugindir)"; do \
14684
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
14685
+ done
14686
+install: install-am
14687
+install-exec: install-exec-am
14688
+install-data: install-data-am
14689
+uninstall: uninstall-am
14690
+
14691
+install-am: all-am
14692
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
14693
+
14694
+installcheck: installcheck-am
14695
+install-strip:
14696
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
14697
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
14698
+ `test -z '$(STRIP)' || \
14699
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
14700
+mostlyclean-generic:
14701
+
14702
+clean-generic:
14703
+
14704
+distclean-generic:
14705
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
14706
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
14707
+
14708
+maintainer-clean-generic:
14709
+ @echo "This command is intended for maintainers to use"
14710
+ @echo "it deletes files that may require special tools to rebuild."
14711
+ -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
14712
+clean: clean-am
14713
+
14714
+clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \
14715
+ mostlyclean-am
14716
+
14717
+distclean: distclean-am
14718
+ -rm -rf ./$(DEPDIR)
14719
+ -rm -f Makefile
14720
+distclean-am: clean-am distclean-compile distclean-generic \
14721
+ distclean-tags
14722
+
14723
+dvi: dvi-am
14724
+
14725
+dvi-am:
14726
+
14727
+html: html-am
14728
+
14729
+html-am:
14730
+
14731
+info: info-am
14732
+
14733
+info-am:
14734
+
14735
+install-data-am: install-pluginLTLIBRARIES
14736
+
14737
+install-dvi: install-dvi-am
14738
+
14739
+install-dvi-am:
14740
+
14741
+install-exec-am:
14742
+
14743
+install-html: install-html-am
14744
+
14745
+install-html-am:
14746
+
14747
+install-info: install-info-am
14748
+
14749
+install-info-am:
14750
+
14751
+install-man:
14752
+
14753
+install-pdf: install-pdf-am
14754
+
14755
+install-pdf-am:
14756
+
14757
+install-ps: install-ps-am
14758
+
14759
+install-ps-am:
14760
+
14761
+installcheck-am:
14762
+
14763
+maintainer-clean: maintainer-clean-am
14764
+ -rm -rf ./$(DEPDIR)
14765
+ -rm -f Makefile
14766
+maintainer-clean-am: distclean-am maintainer-clean-generic
14767
+
14768
+mostlyclean: mostlyclean-am
14769
+
14770
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
14771
+ mostlyclean-libtool
14772
+
14773
+pdf: pdf-am
14774
+
14775
+pdf-am:
14776
+
14777
+ps: ps-am
14778
+
14779
+ps-am:
14780
+
14781
+uninstall-am: uninstall-pluginLTLIBRARIES
14782
+
14783
+.MAKE: install-am install-strip
14784
+
14785
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
14786
+ clean-libtool clean-pluginLTLIBRARIES ctags distclean \
14787
+ distclean-compile distclean-generic distclean-libtool \
14788
+ distclean-tags distdir dvi dvi-am html html-am info info-am \
14789
+ install install-am install-data install-data-am install-dvi \
14790
+ install-dvi-am install-exec install-exec-am install-html \
14791
+ install-html-am install-info install-info-am install-man \
14792
+ install-pdf install-pdf-am install-pluginLTLIBRARIES \
14793
+ install-ps install-ps-am install-strip installcheck \
14794
+ installcheck-am installdirs maintainer-clean \
14795
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
14796
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
14797
+ tags uninstall uninstall-am uninstall-pluginLTLIBRARIES
14798
+
14799
+
14800
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
14801
+# Otherwise a system limit (for SysV at least) may be exceeded.
14802
+.NOEXPORT:
14803
--- plymouth-0.8.2.orig/src/plugins/renderers/drm/plugin.c
14804
+++ plymouth-0.8.2/src/plugins/renderers/drm/plugin.c
14805
@@ -454,10 +454,15 @@ load_driver (ply_renderer_backend_t *bac
14806
backend->driver_interface = ply_renderer_radeon_driver_get_interface ();
14807
backend->driver_supports_mapping_console = false;
14808
}
14809
- else if (strcmp (driver_name, "nouveau") == 0)
14810
+ else if (strcmp (driver_name, "nouveau") == 0
14811
+ || strcmp (driver_name, "lbm-nouveau") == 0)
14812
{
14813
+#ifdef GDM_HANGING_IS_FINE_WITH_ME
14814
backend->driver_interface = ply_renderer_nouveau_driver_get_interface ();
14815
backend->driver_supports_mapping_console = false;
14816
+#else
14817
+ ply_trace("falling back to framebuffer for nouveau to avoid DRM hang");
14818
+#endif
14819
}
14820
free (driver_name);
14821
14822
--- plymouth-0.8.2.orig/src/plugins/renderers/drm/Makefile.in
14823
+++ plymouth-0.8.2/src/plugins/renderers/drm/Makefile.in
14824
@@ -175,6 +175,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
14825
PACKAGE_NAME = @PACKAGE_NAME@
14826
PACKAGE_STRING = @PACKAGE_STRING@
14827
PACKAGE_TARNAME = @PACKAGE_TARNAME@
14828
+PACKAGE_URL = @PACKAGE_URL@
14829
PACKAGE_VERSION = @PACKAGE_VERSION@
14830
PANGO_CFLAGS = @PANGO_CFLAGS@
14831
PANGO_LIBS = @PANGO_LIBS@
14832
--- plymouth-0.8.2.orig/src/plugins/renderers/x11/Makefile.in
14833
+++ plymouth-0.8.2/src/plugins/renderers/x11/Makefile.in
14834
@@ -172,6 +172,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
14835
PACKAGE_NAME = @PACKAGE_NAME@
14836
PACKAGE_STRING = @PACKAGE_STRING@
14837
PACKAGE_TARNAME = @PACKAGE_TARNAME@
14838
+PACKAGE_URL = @PACKAGE_URL@
14839
PACKAGE_VERSION = @PACKAGE_VERSION@
14840
PANGO_CFLAGS = @PANGO_CFLAGS@
14841
PANGO_LIBS = @PANGO_LIBS@
14842
--- plymouth-0.8.2.orig/src/plugins/splash/Makefile.am
14843
+++ plymouth-0.8.2/src/plugins/splash/Makefile.am
14844
@@ -1,2 +1,2 @@
14845
-SUBDIRS = throbgress fade-throbber text details space-flares two-step script
14846
+SUBDIRS = throbgress fade-throbber text details space-flares two-step script ubuntu-text
14847
MAINTAINERCLEANFILES = Makefile.in
14848
--- plymouth-0.8.2.orig/src/plugins/splash/Makefile.in
14849
+++ plymouth-0.8.2/src/plugins/splash/Makefile.in
14850
@@ -154,6 +154,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
14851
PACKAGE_NAME = @PACKAGE_NAME@
14852
PACKAGE_STRING = @PACKAGE_STRING@
14853
PACKAGE_TARNAME = @PACKAGE_TARNAME@
14854
+PACKAGE_URL = @PACKAGE_URL@
14855
PACKAGE_VERSION = @PACKAGE_VERSION@
14856
PANGO_CFLAGS = @PANGO_CFLAGS@
14857
PANGO_LIBS = @PANGO_LIBS@
14858
@@ -233,7 +234,7 @@ target_alias = @target_alias@
14859
top_build_prefix = @top_build_prefix@
14860
top_builddir = @top_builddir@
14861
top_srcdir = @top_srcdir@
14862
-SUBDIRS = throbgress fade-throbber text details space-flares two-step script
14863
+SUBDIRS = throbgress fade-throbber text details space-flares two-step script ubuntu-text
14864
MAINTAINERCLEANFILES = Makefile.in
14865
all: all-recursive
14866
14867
--- plymouth-0.8.2.orig/src/plugins/splash/space-flares/Makefile.in
14868
+++ plymouth-0.8.2/src/plugins/splash/space-flares/Makefile.in
14869
@@ -174,6 +174,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
14870
PACKAGE_NAME = @PACKAGE_NAME@
14871
PACKAGE_STRING = @PACKAGE_STRING@
14872
PACKAGE_TARNAME = @PACKAGE_TARNAME@
14873
+PACKAGE_URL = @PACKAGE_URL@
14874
PACKAGE_VERSION = @PACKAGE_VERSION@
14875
PANGO_CFLAGS = @PANGO_CFLAGS@
14876
PANGO_LIBS = @PANGO_LIBS@
14877
--- plymouth-0.8.2.orig/src/plugins/splash/script/script-lib-sprite.c
14878
+++ plymouth-0.8.2/src/plugins/splash/script/script-lib-sprite.c
14879
@@ -399,6 +399,45 @@ static script_return_t sprite_window_set
14880
return script_return_obj_null ();
14881
}
14882
14883
+static script_return_t sprite_window_get_bits_per_pixel (script_state_t *state,
14884
+ void *user_data)
14885
+{
14886
+ script_lib_sprite_data_t *data = user_data;
14887
+ ply_list_node_t *node;
14888
+ int index;
14889
+ script_obj_t *index_obj;
14890
+ script_lib_display_t *display;
14891
+ unsigned int bits_per_pixel;
14892
+
14893
+ index_obj = script_obj_hash_peek_element (state->local, "window");
14894
+
14895
+ if (index_obj)
14896
+ {
14897
+ index = script_obj_as_number (index_obj);
14898
+ script_obj_unref(index_obj);
14899
+ if (index < 0)
14900
+ return script_return_obj_null ();
14901
+ node = ply_list_get_nth_node (data->displays, index);
14902
+ if (node == NULL)
14903
+ return script_return_obj_null ();
14904
+ display = ply_list_node_get_data (node);
14905
+ bits_per_pixel = ply_pixel_display_get_bits_per_pixel (display->pixel_display);
14906
+ return script_return_obj (script_obj_new_number (bits_per_pixel));
14907
+ }
14908
+
14909
+ bits_per_pixel = 0;
14910
+ for (node = ply_list_get_first_node (data->displays);
14911
+ node;
14912
+ node = ply_list_get_next_node (data->displays, node))
14913
+ {
14914
+ display = ply_list_node_get_data (node);
14915
+ bits_per_pixel = ply_pixel_display_get_bits_per_pixel (display->pixel_display);
14916
+ if (bits_per_pixel)
14917
+ break;
14918
+ }
14919
+ return script_return_obj (script_obj_new_number (bits_per_pixel));
14920
+}
14921
+
14922
static uint32_t extract_rgb_color (script_state_t *state)
14923
{
14924
uint8_t red = CLAMP (255 * script_obj_hash_get_number (state->local, "red"), 0, 255);
14925
@@ -651,6 +690,12 @@ script_lib_sprite_data_t *script_lib_spr
14926
"value",
14927
NULL);
14928
script_add_native_function (window_hash,
14929
+ "GetBitsPerPixel",
14930
+ sprite_window_get_bits_per_pixel,
14931
+ data,
14932
+ "window",
14933
+ NULL);
14934
+ script_add_native_function (window_hash,
14935
"SetBackgroundTopColor",
14936
sprite_window_set_background_top_color,
14937
data,
14938
--- plymouth-0.8.2.orig/src/plugins/splash/script/plugin.c
14939
+++ plymouth-0.8.2/src/plugins/splash/script/plugin.c
14940
@@ -418,6 +418,8 @@ static void
14941
become_idle (ply_boot_splash_plugin_t *plugin,
14942
ply_trigger_t *idle_trigger)
14943
{
14944
+ stop_animation (plugin);
14945
+
14946
ply_trigger_pull (idle_trigger, NULL);
14947
}
14948
14949
--- plymouth-0.8.2.orig/src/plugins/splash/script/script-lib-image.c
14950
+++ plymouth-0.8.2/src/plugins/splash/script/script-lib-image.c
14951
@@ -171,7 +171,7 @@ static script_return_t image_text (scrip
14952
14953
alpha_obj = script_obj_hash_peek_element (state->local, "alpha");
14954
14955
- if (alpha_obj)
14956
+ if (alpha_obj && !script_obj_is_null(alpha_obj))
14957
{
14958
alpha = CLAMP(script_obj_as_number (alpha_obj), 0, 1);
14959
script_obj_unref(alpha_obj);
14960
--- plymouth-0.8.2.orig/src/plugins/splash/script/Makefile.in
14961
+++ plymouth-0.8.2/src/plugins/splash/script/Makefile.in
14962
@@ -179,6 +179,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
14963
PACKAGE_NAME = @PACKAGE_NAME@
14964
PACKAGE_STRING = @PACKAGE_STRING@
14965
PACKAGE_TARNAME = @PACKAGE_TARNAME@
14966
+PACKAGE_URL = @PACKAGE_URL@
14967
PACKAGE_VERSION = @PACKAGE_VERSION@
14968
PANGO_CFLAGS = @PANGO_CFLAGS@
14969
PANGO_LIBS = @PANGO_LIBS@
14970
--- plymouth-0.8.2.orig/src/plugins/splash/throbgress/Makefile.in
14971
+++ plymouth-0.8.2/src/plugins/splash/throbgress/Makefile.in
14972
@@ -173,6 +173,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
14973
PACKAGE_NAME = @PACKAGE_NAME@
14974
PACKAGE_STRING = @PACKAGE_STRING@
14975
PACKAGE_TARNAME = @PACKAGE_TARNAME@
14976
+PACKAGE_URL = @PACKAGE_URL@
14977
PACKAGE_VERSION = @PACKAGE_VERSION@
14978
PANGO_CFLAGS = @PANGO_CFLAGS@
14979
PANGO_LIBS = @PANGO_LIBS@
14980
--- plymouth-0.8.2.orig/src/plugins/splash/text/plugin.c
14981
+++ plymouth-0.8.2/src/plugins/splash/text/plugin.c
14982
@@ -485,7 +485,10 @@ add_text_display (ply_boot_splash_plugin
14983
14984
terminal = ply_text_display_get_terminal (view->display);
14985
if (ply_terminal_open (terminal))
14986
- ply_terminal_activate_vt (terminal);
14987
+ {
14988
+ ply_terminal_set_mode (terminal, PLY_TERMINAL_MODE_TEXT);
14989
+ ply_terminal_activate_vt (terminal);
14990
+ }
14991
14992
ply_text_display_set_draw_handler (view->display,
14993
(ply_text_display_draw_handler_t)
14994
--- plymouth-0.8.2.orig/src/plugins/splash/text/Makefile.in
14995
+++ plymouth-0.8.2/src/plugins/splash/text/Makefile.in
14996
@@ -171,6 +171,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
14997
PACKAGE_NAME = @PACKAGE_NAME@
14998
PACKAGE_STRING = @PACKAGE_STRING@
14999
PACKAGE_TARNAME = @PACKAGE_TARNAME@
15000
+PACKAGE_URL = @PACKAGE_URL@
15001
PACKAGE_VERSION = @PACKAGE_VERSION@
15002
PANGO_CFLAGS = @PANGO_CFLAGS@
15003
PANGO_LIBS = @PANGO_LIBS@
15004
--- /dev/null
15005
+++ plymouth-0.8.2/src/plugins/splash/ubuntu-text/plugin.c
15006
@@ -0,0 +1,795 @@
15007
+/* ubuntu-text.c - boot splash plugin
15008
+ *
15009
+ * Copyright (C) 2010 Canonical Ltd.
15010
+ * Copyright (C) 2008 Red Hat, Inc.
15011
+ *
15012
+ * This program is free software; you can redistribute it and/or modify
15013
+ * it under the terms of the GNU General Public License as published by
15014
+ * the Free Software Foundation; either version 2, or (at your option)
15015
+ * any later version.
15016
+ *
15017
+ * This program is distributed in the hope that it will be useful,
15018
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
15019
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15020
+ * GNU General Public License for more details.
15021
+ *
15022
+ * You should have received a copy of the GNU General Public License
15023
+ * along with this program; if not, write to the Free Software
15024
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
15025
+ * 02111-1307, USA.
15026
+ *
15027
+ * Written by: Scott James Remnant <scott@ubuntu.com>
15028
+ * Adam Jackson <ajax@redhat.com>
15029
+ * Ray Strode <rstrode@redhat.com>
15030
+ */
15031
+#include "config.h"
15032
+
15033
+#include <assert.h>
15034
+#include <errno.h>
15035
+#include <fcntl.h>
15036
+#include <math.h>
15037
+#include <signal.h>
15038
+#include <stdbool.h>
15039
+#include <stdio.h>
15040
+#include <stdint.h>
15041
+#include <stdlib.h>
15042
+#include <string.h>
15043
+#include <sys/ioctl.h>
15044
+#include <sys/stat.h>
15045
+#include <sys/time.h>
15046
+#include <sys/types.h>
15047
+#include <termios.h>
15048
+#include <unistd.h>
15049
+#include <values.h>
15050
+#include <wchar.h>
15051
+
15052
+#include "ply-trigger.h"
15053
+#include "ply-boot-splash-plugin.h"
15054
+#include "ply-buffer.h"
15055
+#include "ply-event-loop.h"
15056
+#include "ply-key-file.h"
15057
+#include "ply-list.h"
15058
+#include "ply-logger.h"
15059
+#include "ply-text-display.h"
15060
+#include "ply-text-progress-bar.h"
15061
+#include "ply-utils.h"
15062
+
15063
+#include <linux/kd.h>
15064
+
15065
+#define CLEAR_LINE_SEQUENCE "\033[2K\r\n"
15066
+#define BACKSPACE "\b\033[0K"
15067
+
15068
+typedef enum {
15069
+ PLY_BOOT_SPLASH_DISPLAY_NORMAL,
15070
+ PLY_BOOT_SPLASH_DISPLAY_QUESTION_ENTRY,
15071
+ PLY_BOOT_SPLASH_DISPLAY_PASSWORD_ENTRY
15072
+} ply_boot_splash_display_type_t;
15073
+
15074
+struct _ply_boot_splash_plugin
15075
+{
15076
+ ply_event_loop_t *loop;
15077
+ ply_boot_splash_mode_t mode;
15078
+
15079
+ ply_list_t *views;
15080
+
15081
+ ply_boot_splash_display_type_t state;
15082
+
15083
+ char *message;
15084
+
15085
+ uint32_t is_animating : 1;
15086
+};
15087
+
15088
+typedef struct
15089
+{
15090
+ ply_boot_splash_plugin_t *plugin;
15091
+ ply_text_display_t *display;
15092
+
15093
+} view_t;
15094
+
15095
+static void hide_splash_screen (ply_boot_splash_plugin_t *plugin,
15096
+ ply_event_loop_t *loop);
15097
+
15098
+static view_t *
15099
+view_new (ply_boot_splash_plugin_t *plugin,
15100
+ ply_text_display_t *display)
15101
+{
15102
+ view_t *view;
15103
+
15104
+ view = calloc (1, sizeof (view_t));
15105
+ view->plugin = plugin;
15106
+ view->display = display;
15107
+
15108
+ return view;
15109
+}
15110
+
15111
+static void
15112
+view_free (view_t *view)
15113
+{
15114
+ free (view);
15115
+}
15116
+
15117
+static void
15118
+view_show_message (view_t *view)
15119
+{
15120
+ ply_boot_splash_plugin_t *plugin;
15121
+ int display_width, display_height, y;
15122
+ ply_terminal_color_t color;
15123
+ char *message;
15124
+
15125
+ plugin = view->plugin;
15126
+
15127
+ display_width = ply_text_display_get_number_of_columns (view->display);
15128
+ display_height = ply_text_display_get_number_of_rows (view->display);
15129
+
15130
+ if (!strncmp (plugin->message, "keys:", 5))
15131
+ {
15132
+ message = plugin->message + 5;
15133
+ color = PLY_TERMINAL_COLOR_WHITE;
15134
+ y = display_height - 4;
15135
+ }
15136
+ else
15137
+ {
15138
+ message = plugin->message;
15139
+ color = PLY_TERMINAL_COLOR_BLUE;
15140
+ y = display_height / 2 + 7;
15141
+ }
15142
+
15143
+ ply_text_display_set_cursor_position (view->display, 0, y);
15144
+ ply_text_display_clear_line (view->display);
15145
+ ply_text_display_set_cursor_position (view->display,
15146
+ (display_width -
15147
+ strlen (message)) / 2,
15148
+ y);
15149
+
15150
+ ply_text_display_set_foreground_color (view->display, color);
15151
+ ply_text_display_write (view->display, "%s", message);
15152
+}
15153
+
15154
+static void
15155
+view_show_prompt (view_t *view,
15156
+ const char *prompt,
15157
+ const char *entered_text)
15158
+{
15159
+ ply_boot_splash_plugin_t *plugin;
15160
+ int display_width, display_height;
15161
+ int i;
15162
+
15163
+ plugin = view->plugin;
15164
+
15165
+ display_width = ply_text_display_get_number_of_columns (view->display);
15166
+ display_height = ply_text_display_get_number_of_rows (view->display);
15167
+
15168
+ ply_text_display_set_cursor_position (view->display, 0,
15169
+ display_height / 2 + 8);
15170
+ ply_text_display_clear_line (view->display);
15171
+ ply_text_display_set_cursor_position (view->display,
15172
+ display_width / 2 - (strlen (prompt)),
15173
+ display_height / 2 + 8);
15174
+
15175
+ ply_text_display_write (view->display, "%s:%s", prompt, entered_text);
15176
+
15177
+ ply_text_display_show_cursor (view->display);
15178
+}
15179
+
15180
+static void
15181
+view_start_animation (view_t *view)
15182
+{
15183
+ ply_boot_splash_plugin_t *plugin;
15184
+ ply_terminal_t *terminal;
15185
+
15186
+ assert (view != NULL);
15187
+
15188
+ plugin = view->plugin;
15189
+
15190
+ terminal = ply_text_display_get_terminal (view->display);
15191
+
15192
+ ply_terminal_set_color_hex_value (terminal,
15193
+ PLY_TERMINAL_COLOR_BLACK,
15194
+ 0x2c001e);
15195
+ ply_terminal_set_color_hex_value (terminal,
15196
+ PLY_TERMINAL_COLOR_WHITE,
15197
+ 0xffffff);
15198
+ ply_terminal_set_color_hex_value (terminal,
15199
+ PLY_TERMINAL_COLOR_BROWN,
15200
+ 0xff4012);
15201
+ ply_terminal_set_color_hex_value (terminal,
15202
+ PLY_TERMINAL_COLOR_BLUE,
15203
+ 0x988592);
15204
+
15205
+ ply_text_display_set_background_color (view->display,
15206
+ PLY_TERMINAL_COLOR_BLACK);
15207
+ ply_text_display_clear_screen (view->display);
15208
+ ply_text_display_hide_cursor (view->display);
15209
+}
15210
+
15211
+static void
15212
+view_redraw (view_t *view)
15213
+{
15214
+ unsigned long screen_width, screen_height;
15215
+
15216
+ screen_width = ply_text_display_get_number_of_columns (view->display);
15217
+ screen_height = ply_text_display_get_number_of_rows (view->display);
15218
+
15219
+ ply_text_display_draw_area (view->display, 0, 0,
15220
+ screen_width, screen_height);
15221
+}
15222
+
15223
+static void
15224
+redraw_views (ply_boot_splash_plugin_t *plugin)
15225
+{
15226
+ ply_list_node_t *node;
15227
+
15228
+ node = ply_list_get_first_node (plugin->views);
15229
+ while (node != NULL)
15230
+ {
15231
+ ply_list_node_t *next_node;
15232
+ view_t *view;
15233
+
15234
+ view = ply_list_node_get_data (node);
15235
+ next_node = ply_list_get_next_node (plugin->views, node);
15236
+
15237
+ view_redraw (view);
15238
+
15239
+ node = next_node;
15240
+ }
15241
+}
15242
+
15243
+static void
15244
+view_hide (view_t *view)
15245
+{
15246
+ if (view->display != NULL)
15247
+ {
15248
+ ply_terminal_t *terminal;
15249
+
15250
+ terminal = ply_text_display_get_terminal (view->display);
15251
+
15252
+ ply_text_display_set_background_color (view->display, PLY_TERMINAL_COLOR_DEFAULT);
15253
+ ply_text_display_clear_screen (view->display);
15254
+ ply_text_display_show_cursor (view->display);
15255
+
15256
+ ply_terminal_reset_colors (terminal);
15257
+ }
15258
+}
15259
+
15260
+static void
15261
+hide_views (ply_boot_splash_plugin_t *plugin)
15262
+{
15263
+ ply_list_node_t *node;
15264
+
15265
+ node = ply_list_get_first_node (plugin->views);
15266
+ while (node != NULL)
15267
+ {
15268
+ ply_list_node_t *next_node;
15269
+ view_t *view;
15270
+
15271
+ view = ply_list_node_get_data (node);
15272
+ next_node = ply_list_get_next_node (plugin->views, node);
15273
+
15274
+ view_hide (view);
15275
+
15276
+ node = next_node;
15277
+ }
15278
+}
15279
+
15280
+static void
15281
+pause_views (ply_boot_splash_plugin_t *plugin)
15282
+{
15283
+ ply_list_node_t *node;
15284
+
15285
+ node = ply_list_get_first_node (plugin->views);
15286
+ while (node != NULL)
15287
+ {
15288
+ ply_list_node_t *next_node;
15289
+ view_t *view;
15290
+
15291
+ view = ply_list_node_get_data (node);
15292
+ next_node = ply_list_get_next_node (plugin->views, node);
15293
+
15294
+ ply_text_display_pause_updates (view->display);
15295
+
15296
+ node = next_node;
15297
+ }
15298
+}
15299
+
15300
+static void
15301
+unpause_views (ply_boot_splash_plugin_t *plugin)
15302
+{
15303
+ ply_list_node_t *node;
15304
+
15305
+ node = ply_list_get_first_node (plugin->views);
15306
+ while (node != NULL)
15307
+ {
15308
+ ply_list_node_t *next_node;
15309
+ view_t *view;
15310
+
15311
+ view = ply_list_node_get_data (node);
15312
+ next_node = ply_list_get_next_node (plugin->views, node);
15313
+
15314
+ ply_text_display_unpause_updates (view->display);
15315
+
15316
+ node = next_node;
15317
+ }
15318
+}
15319
+
15320
+static ply_boot_splash_plugin_t *
15321
+create_plugin (ply_key_file_t *key_file)
15322
+{
15323
+ ply_boot_splash_plugin_t *plugin;
15324
+
15325
+ ply_trace ("creating plugin");
15326
+
15327
+ plugin = calloc (1, sizeof (ply_boot_splash_plugin_t));
15328
+ plugin->message = NULL;
15329
+
15330
+ plugin->views = ply_list_new ();
15331
+
15332
+ return plugin;
15333
+}
15334
+
15335
+static void
15336
+detach_from_event_loop (ply_boot_splash_plugin_t *plugin)
15337
+{
15338
+ plugin->loop = NULL;
15339
+
15340
+ ply_trace ("detaching from event loop");
15341
+}
15342
+
15343
+static void
15344
+free_views (ply_boot_splash_plugin_t *plugin)
15345
+{
15346
+ ply_list_node_t *node;
15347
+
15348
+ node = ply_list_get_first_node (plugin->views);
15349
+
15350
+ while (node != NULL)
15351
+ {
15352
+ ply_list_node_t *next_node;
15353
+ view_t *view;
15354
+
15355
+ view = ply_list_node_get_data (node);
15356
+ next_node = ply_list_get_next_node (plugin->views, node);
15357
+
15358
+ view_free (view);
15359
+ ply_list_remove_node (plugin->views, node);
15360
+
15361
+ node = next_node;
15362
+ }
15363
+
15364
+ ply_list_free (plugin->views);
15365
+ plugin->views = NULL;
15366
+}
15367
+
15368
+static void
15369
+destroy_plugin (ply_boot_splash_plugin_t *plugin)
15370
+{
15371
+ ply_trace ("destroying plugin");
15372
+
15373
+ if (plugin == NULL)
15374
+ return;
15375
+
15376
+ /* It doesn't ever make sense to keep this plugin on screen
15377
+ * after exit
15378
+ */
15379
+ hide_splash_screen (plugin, plugin->loop);
15380
+
15381
+ free_views (plugin);
15382
+ if (plugin->message != NULL)
15383
+ free (plugin->message);
15384
+
15385
+ free (plugin);
15386
+}
15387
+
15388
+static void
15389
+show_message (ply_boot_splash_plugin_t *plugin)
15390
+{
15391
+ ply_list_node_t *node;
15392
+
15393
+ node = ply_list_get_first_node (plugin->views);
15394
+ while (node != NULL)
15395
+ {
15396
+ ply_list_node_t *next_node;
15397
+ view_t *view;
15398
+
15399
+ view = ply_list_node_get_data (node);
15400
+ next_node = ply_list_get_next_node (plugin->views, node);
15401
+
15402
+ view_show_message (view);
15403
+
15404
+ node = next_node;
15405
+ }
15406
+}
15407
+
15408
+static void
15409
+animate_frame (ply_boot_splash_plugin_t *plugin,
15410
+ int frame)
15411
+{
15412
+ ply_list_node_t *node;
15413
+
15414
+ node = ply_list_get_first_node (plugin->views);
15415
+ while (node != NULL)
15416
+ {
15417
+ ply_list_node_t *next_node;
15418
+ view_t *view;
15419
+ int display_width, display_height;
15420
+
15421
+ view = ply_list_node_get_data (node);
15422
+ next_node = ply_list_get_next_node (plugin->views, node);
15423
+
15424
+ display_width = ply_text_display_get_number_of_columns (view->display);
15425
+ display_height = ply_text_display_get_number_of_rows (view->display);
15426
+
15427
+ ply_text_display_set_cursor_position (view->display,
15428
+ (display_width - 12) / 2,
15429
+ display_height / 2);
15430
+
15431
+ ply_text_display_set_background_color (view->display, PLY_TERMINAL_COLOR_BLACK);
15432
+ ply_text_display_set_foreground_color (view->display, PLY_TERMINAL_COLOR_WHITE);
15433
+ ply_text_display_write (view->display, "Ubuntu 10.04");
15434
+
15435
+ ply_text_display_set_cursor_position (view->display,
15436
+ (display_width - 10) / 2,
15437
+ (display_height / 2) + 2);
15438
+
15439
+ if ((frame < 1) || (frame > 4))
15440
+ ply_text_display_set_foreground_color (view->display, PLY_TERMINAL_COLOR_WHITE);
15441
+ else
15442
+ ply_text_display_set_foreground_color (view->display, PLY_TERMINAL_COLOR_BROWN);
15443
+ ply_text_display_write (view->display, ". ");
15444
+
15445
+ if ((frame < 2) || (frame > 5))
15446
+ ply_text_display_set_foreground_color (view->display, PLY_TERMINAL_COLOR_WHITE);
15447
+ else
15448
+ ply_text_display_set_foreground_color (view->display, PLY_TERMINAL_COLOR_BROWN);
15449
+ ply_text_display_write (view->display, ". ");
15450
+
15451
+ if ((frame < 3) || (frame > 6))
15452
+ ply_text_display_set_foreground_color (view->display, PLY_TERMINAL_COLOR_WHITE);
15453
+ else
15454
+ ply_text_display_set_foreground_color (view->display, PLY_TERMINAL_COLOR_BROWN);
15455
+ ply_text_display_write (view->display, ". ");
15456
+
15457
+ if (frame < 4)
15458
+ ply_text_display_set_foreground_color (view->display, PLY_TERMINAL_COLOR_WHITE);
15459
+ else
15460
+ ply_text_display_set_foreground_color (view->display, PLY_TERMINAL_COLOR_BROWN);
15461
+ ply_text_display_write (view->display, ".");
15462
+
15463
+ node = next_node;
15464
+ }
15465
+}
15466
+
15467
+static void
15468
+on_timeout (ply_boot_splash_plugin_t *plugin)
15469
+{
15470
+ static int frame = 0;
15471
+
15472
+ frame += 1;
15473
+ frame %= 8;
15474
+
15475
+ animate_frame (plugin, frame);
15476
+
15477
+ ply_event_loop_watch_for_timeout (plugin->loop, 1.0,
15478
+ (ply_event_loop_timeout_handler_t)
15479
+ on_timeout, plugin);
15480
+}
15481
+
15482
+static void
15483
+start_animation (ply_boot_splash_plugin_t *plugin)
15484
+{
15485
+ ply_list_node_t *node;
15486
+
15487
+ assert (plugin != NULL);
15488
+ assert (plugin->loop != NULL);
15489
+
15490
+ redraw_views (plugin);
15491
+
15492
+ if (plugin->message != NULL)
15493
+ show_message (plugin);
15494
+
15495
+ if (plugin->is_animating)
15496
+ return;
15497
+
15498
+ node = ply_list_get_first_node (plugin->views);
15499
+ while (node != NULL)
15500
+ {
15501
+ ply_list_node_t *next_node;
15502
+ view_t *view;
15503
+
15504
+ view = ply_list_node_get_data (node);
15505
+ next_node = ply_list_get_next_node (plugin->views, node);
15506
+
15507
+ view_start_animation (view);
15508
+
15509
+ node = next_node;
15510
+ }
15511
+
15512
+ plugin->is_animating = true;
15513
+
15514
+ animate_frame (plugin, 0);
15515
+ ply_event_loop_watch_for_timeout (plugin->loop, 1.0,
15516
+ (ply_event_loop_timeout_handler_t)
15517
+ on_timeout, plugin);
15518
+}
15519
+
15520
+static void
15521
+stop_animation (ply_boot_splash_plugin_t *plugin)
15522
+{
15523
+ ply_list_node_t *node;
15524
+
15525
+ assert (plugin != NULL);
15526
+ assert (plugin->loop != NULL);
15527
+
15528
+ if (!plugin->is_animating)
15529
+ return;
15530
+
15531
+ plugin->is_animating = false;
15532
+
15533
+ node = ply_list_get_first_node (plugin->views);
15534
+ while (node != NULL)
15535
+ {
15536
+ ply_list_node_t *next_node;
15537
+ view_t *view;
15538
+
15539
+ view = ply_list_node_get_data (node);
15540
+ next_node = ply_list_get_next_node (plugin->views, node);
15541
+
15542
+ node = next_node;
15543
+ }
15544
+
15545
+ ply_event_loop_stop_watching_for_timeout (plugin->loop,
15546
+ (ply_event_loop_timeout_handler_t)
15547
+ on_timeout, plugin);
15548
+
15549
+ redraw_views (plugin);
15550
+}
15551
+
15552
+static void
15553
+on_draw (view_t *view,
15554
+ ply_terminal_t *terminal,
15555
+ int x,
15556
+ int y,
15557
+ int width,
15558
+ int height)
15559
+{
15560
+}
15561
+
15562
+static void
15563
+add_text_display (ply_boot_splash_plugin_t *plugin,
15564
+ ply_text_display_t *display)
15565
+{
15566
+ view_t *view;
15567
+ ply_terminal_t *terminal;
15568
+
15569
+ view = view_new (plugin, display);
15570
+
15571
+ terminal = ply_text_display_get_terminal (view->display);
15572
+ if (ply_terminal_open (terminal))
15573
+ {
15574
+ ply_terminal_set_mode (terminal, PLY_TERMINAL_MODE_TEXT);
15575
+ ply_terminal_activate_vt (terminal);
15576
+ }
15577
+
15578
+ ply_text_display_set_draw_handler (view->display,
15579
+ (ply_text_display_draw_handler_t)
15580
+ on_draw, view);
15581
+
15582
+ ply_list_append_data (plugin->views, view);
15583
+}
15584
+
15585
+static void
15586
+remove_text_display (ply_boot_splash_plugin_t *plugin,
15587
+ ply_text_display_t *display)
15588
+{
15589
+ ply_list_node_t *node;
15590
+
15591
+ node = ply_list_get_first_node (plugin->views);
15592
+ while (node != NULL)
15593
+ {
15594
+ view_t *view;
15595
+ ply_list_node_t *next_node;
15596
+
15597
+ view = ply_list_node_get_data (node);
15598
+ next_node = ply_list_get_next_node (plugin->views, node);
15599
+
15600
+ if (view->display == display)
15601
+ {
15602
+ ply_text_display_set_draw_handler (view->display,
15603
+ NULL, NULL);
15604
+ view_free (view);
15605
+ ply_list_remove_node (plugin->views, node);
15606
+ return;
15607
+ }
15608
+
15609
+ node = next_node;
15610
+ }
15611
+}
15612
+
15613
+static bool
15614
+show_splash_screen (ply_boot_splash_plugin_t *plugin,
15615
+ ply_event_loop_t *loop,
15616
+ ply_buffer_t *boot_buffer,
15617
+ ply_boot_splash_mode_t mode)
15618
+{
15619
+ assert (plugin != NULL);
15620
+
15621
+ plugin->loop = loop;
15622
+ plugin->mode = mode;
15623
+ ply_event_loop_watch_for_exit (loop, (ply_event_loop_exit_handler_t)
15624
+ detach_from_event_loop,
15625
+ plugin);
15626
+
15627
+ ply_show_new_kernel_messages (false);
15628
+ start_animation (plugin);
15629
+
15630
+ return true;
15631
+}
15632
+
15633
+static void
15634
+update_status (ply_boot_splash_plugin_t *plugin,
15635
+ const char *status)
15636
+{
15637
+ assert (plugin != NULL);
15638
+
15639
+ ply_trace ("status update");
15640
+}
15641
+
15642
+static void
15643
+hide_splash_screen (ply_boot_splash_plugin_t *plugin,
15644
+ ply_event_loop_t *loop)
15645
+{
15646
+ assert (plugin != NULL);
15647
+
15648
+ ply_trace ("hiding splash screen");
15649
+
15650
+ if (plugin->loop != NULL)
15651
+ {
15652
+ stop_animation (plugin);
15653
+
15654
+ ply_event_loop_stop_watching_for_exit (plugin->loop,
15655
+ (ply_event_loop_exit_handler_t)
15656
+ detach_from_event_loop,
15657
+ plugin);
15658
+ detach_from_event_loop (plugin);
15659
+ }
15660
+
15661
+ hide_views (plugin);
15662
+ ply_show_new_kernel_messages (true);
15663
+}
15664
+
15665
+static void
15666
+display_normal (ply_boot_splash_plugin_t *plugin)
15667
+{
15668
+ pause_views (plugin);
15669
+ if (plugin->state != PLY_BOOT_SPLASH_DISPLAY_NORMAL)
15670
+ {
15671
+ plugin->state = PLY_BOOT_SPLASH_DISPLAY_NORMAL;
15672
+ start_animation (plugin);
15673
+ redraw_views (plugin);
15674
+ }
15675
+ unpause_views (plugin);
15676
+}
15677
+
15678
+static void
15679
+display_message (ply_boot_splash_plugin_t *plugin,
15680
+ const char *message)
15681
+{
15682
+ if (plugin->message != NULL)
15683
+ free (plugin->message);
15684
+
15685
+ plugin->message = strdup (message);
15686
+ start_animation (plugin);
15687
+}
15688
+
15689
+static void
15690
+show_password_prompt (ply_boot_splash_plugin_t *plugin,
15691
+ const char *prompt,
15692
+ int bullets)
15693
+{
15694
+ ply_list_node_t *node;
15695
+ int i;
15696
+ char *entered_text;
15697
+
15698
+ entered_text = calloc (bullets + 1, sizeof (char));
15699
+
15700
+ for (i = 0; i < bullets; i++)
15701
+ entered_text[i] = '*';
15702
+
15703
+ node = ply_list_get_first_node (plugin->views);
15704
+ while (node != NULL)
15705
+ {
15706
+ ply_list_node_t *next_node;
15707
+ view_t *view;
15708
+
15709
+ view = ply_list_node_get_data (node);
15710
+ next_node = ply_list_get_next_node (plugin->views, node);
15711
+
15712
+ view_show_prompt (view, prompt, entered_text);
15713
+
15714
+ node = next_node;
15715
+ }
15716
+ free (entered_text);
15717
+}
15718
+
15719
+static void
15720
+show_prompt (ply_boot_splash_plugin_t *plugin,
15721
+ const char *prompt,
15722
+ const char *text)
15723
+{
15724
+ ply_list_node_t *node;
15725
+
15726
+ node = ply_list_get_first_node (plugin->views);
15727
+ while (node != NULL)
15728
+ {
15729
+ ply_list_node_t *next_node;
15730
+ view_t *view;
15731
+
15732
+ view = ply_list_node_get_data (node);
15733
+ next_node = ply_list_get_next_node (plugin->views, node);
15734
+
15735
+ view_show_prompt (view, prompt, text);
15736
+
15737
+ node = next_node;
15738
+ }
15739
+}
15740
+
15741
+static void
15742
+display_password (ply_boot_splash_plugin_t *plugin,
15743
+ const char *prompt,
15744
+ int bullets)
15745
+{
15746
+ pause_views (plugin);
15747
+ if (plugin->state == PLY_BOOT_SPLASH_DISPLAY_NORMAL)
15748
+ stop_animation (plugin);
15749
+
15750
+ plugin->state = PLY_BOOT_SPLASH_DISPLAY_PASSWORD_ENTRY;
15751
+
15752
+ if (!prompt)
15753
+ prompt = "Password";
15754
+
15755
+ show_password_prompt (plugin, prompt, bullets);
15756
+
15757
+ unpause_views (plugin);
15758
+}
15759
+
15760
+static void
15761
+display_question (ply_boot_splash_plugin_t *plugin,
15762
+ const char *prompt,
15763
+ const char *entry_text)
15764
+{
15765
+ pause_views (plugin);
15766
+ if (plugin->state == PLY_BOOT_SPLASH_DISPLAY_NORMAL)
15767
+ stop_animation (plugin);
15768
+
15769
+ plugin->state = PLY_BOOT_SPLASH_DISPLAY_PASSWORD_ENTRY;
15770
+
15771
+ if (!prompt)
15772
+ prompt = "Password";
15773
+
15774
+ show_prompt (plugin, prompt, entry_text);
15775
+
15776
+ unpause_views (plugin);
15777
+}
15778
+
15779
+
15780
+ply_boot_splash_plugin_interface_t *
15781
+ply_boot_splash_plugin_get_interface (void)
15782
+{
15783
+ static ply_boot_splash_plugin_interface_t plugin_interface =
15784
+ {
15785
+ .create_plugin = create_plugin,
15786
+ .destroy_plugin = destroy_plugin,
15787
+ .add_text_display = add_text_display,
15788
+ .remove_text_display = remove_text_display,
15789
+ .show_splash_screen = show_splash_screen,
15790
+ .update_status = update_status,
15791
+ .hide_splash_screen = hide_splash_screen,
15792
+ .display_normal = display_normal,
15793
+ .display_message = display_message,
15794
+ .display_password = display_password,
15795
+ .display_question = display_question,
15796
+ };
15797
+
15798
+ return &plugin_interface;
15799
+}
15800
+
15801
+/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
15802
--- /dev/null
15803
+++ plymouth-0.8.2/src/plugins/splash/ubuntu-text/Makefile.am
15804
@@ -0,0 +1,23 @@
15805
+INCLUDES = -I$(top_srcdir) \
15806
+ -I$(srcdir)/../../../libply \
15807
+ -I$(srcdir)/../../../libply-splash-core \
15808
+ -I$(srcdir)/../../.. \
15809
+ -I$(srcdir)/../.. \
15810
+ -I$(srcdir)/.. \
15811
+ -I$(srcdir)
15812
+
15813
+plugindir = $(libdir)/plymouth
15814
+plugin_LTLIBRARIES = ubuntu-text.la
15815
+
15816
+ubuntu_text_la_CFLAGS = $(PLYMOUTH_CFLAGS) \
15817
+ -DPLYMOUTH_BACKGROUND_COLOR=$(background_color) \
15818
+ -DPLYMOUTH_BACKGROUND_END_COLOR=$(background_end_color) \
15819
+ -DPLYMOUTH_BACKGROUND_START_COLOR=$(background_start_color)
15820
+
15821
+ubuntu_text_la_LDFLAGS = -module -avoid-version -export-dynamic
15822
+ubuntu_text_la_LIBADD = $(PLYMOUTH_LIBS) \
15823
+ ../../../libply/libply.la \
15824
+ ../../../libply-splash-core/libply-splash-core.la
15825
+ubuntu_text_la_SOURCES = $(srcdir)/plugin.c
15826
+
15827
+MAINTAINERCLEANFILES = Makefile.in
15828
--- /dev/null
15829
+++ plymouth-0.8.2/src/plugins/splash/ubuntu-text/Makefile.in
15830
@@ -0,0 +1,597 @@
15831
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
15832
+# @configure_input@
15833
+
15834
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
15835
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
15836
+# Inc.
15837
+# This Makefile.in is free software; the Free Software Foundation
15838
+# gives unlimited permission to copy and/or distribute it,
15839
+# with or without modifications, as long as this notice is preserved.
15840
+
15841
+# This program is distributed in the hope that it will be useful,
15842
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
15843
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
15844
+# PARTICULAR PURPOSE.
15845
+
15846
+@SET_MAKE@
15847
+
15848
+VPATH = @srcdir@
15849
+pkgdatadir = $(datadir)/@PACKAGE@
15850
+pkgincludedir = $(includedir)/@PACKAGE@
15851
+pkglibdir = $(libdir)/@PACKAGE@
15852
+pkglibexecdir = $(libexecdir)/@PACKAGE@
15853
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
15854
+install_sh_DATA = $(install_sh) -c -m 644
15855
+install_sh_PROGRAM = $(install_sh) -c
15856
+install_sh_SCRIPT = $(install_sh) -c
15857
+INSTALL_HEADER = $(INSTALL_DATA)
15858
+transform = $(program_transform_name)
15859
+NORMAL_INSTALL = :
15860
+PRE_INSTALL = :
15861
+POST_INSTALL = :
15862
+NORMAL_UNINSTALL = :
15863
+PRE_UNINSTALL = :
15864
+POST_UNINSTALL = :
15865
+build_triplet = @build@
15866
+host_triplet = @host@
15867
+subdir = src/plugins/splash/ubuntu-text
15868
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
15869
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
15870
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
15871
+ $(top_srcdir)/configure.ac
15872
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
15873
+ $(ACLOCAL_M4)
15874
+mkinstalldirs = $(install_sh) -d
15875
+CONFIG_HEADER = $(top_builddir)/config.h
15876
+CONFIG_CLEAN_FILES =
15877
+CONFIG_CLEAN_VPATH_FILES =
15878
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
15879
+am__vpath_adj = case $$p in \
15880
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
15881
+ *) f=$$p;; \
15882
+ esac;
15883
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
15884
+am__install_max = 40
15885
+am__nobase_strip_setup = \
15886
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
15887
+am__nobase_strip = \
15888
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
15889
+am__nobase_list = $(am__nobase_strip_setup); \
15890
+ for p in $$list; do echo "$$p $$p"; done | \
15891
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
15892
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
15893
+ if (++n[$$2] == $(am__install_max)) \
15894
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
15895
+ END { for (dir in files) print dir, files[dir] }'
15896
+am__base_list = \
15897
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
15898
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
15899
+am__installdirs = "$(DESTDIR)$(plugindir)"
15900
+LTLIBRARIES = $(plugin_LTLIBRARIES)
15901
+am__DEPENDENCIES_1 =
15902
+ubuntu_text_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
15903
+ ../../../libply/libply.la \
15904
+ ../../../libply-splash-core/libply-splash-core.la
15905
+am_ubuntu_text_la_OBJECTS = ubuntu_text_la-plugin.lo
15906
+ubuntu_text_la_OBJECTS = $(am_ubuntu_text_la_OBJECTS)
15907
+AM_V_lt = $(am__v_lt_$(V))
15908
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
15909
+am__v_lt_0 = --silent
15910
+ubuntu_text_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
15911
+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
15912
+ $(ubuntu_text_la_CFLAGS) $(CFLAGS) $(ubuntu_text_la_LDFLAGS) \
15913
+ $(LDFLAGS) -o $@
15914
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
15915
+depcomp = $(SHELL) $(top_srcdir)/build-tools/depcomp
15916
+am__depfiles_maybe = depfiles
15917
+am__mv = mv -f
15918
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
15919
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
15920
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
15921
+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
15922
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
15923
+ $(AM_CFLAGS) $(CFLAGS)
15924
+AM_V_CC = $(am__v_CC_$(V))
15925
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
15926
+am__v_CC_0 = @echo " CC " $@;
15927
+AM_V_at = $(am__v_at_$(V))
15928
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
15929
+am__v_at_0 = @
15930
+CCLD = $(CC)
15931
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
15932
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
15933
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
15934
+AM_V_CCLD = $(am__v_CCLD_$(V))
15935
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
15936
+am__v_CCLD_0 = @echo " CCLD " $@;
15937
+AM_V_GEN = $(am__v_GEN_$(V))
15938
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
15939
+am__v_GEN_0 = @echo " GEN " $@;
15940
+SOURCES = $(ubuntu_text_la_SOURCES)
15941
+DIST_SOURCES = $(ubuntu_text_la_SOURCES)
15942
+ETAGS = etags
15943
+CTAGS = ctags
15944
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
15945
+ACLOCAL = @ACLOCAL@
15946
+AMTAR = @AMTAR@
15947
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
15948
+AR = @AR@
15949
+AUTOCONF = @AUTOCONF@
15950
+AUTOHEADER = @AUTOHEADER@
15951
+AUTOMAKE = @AUTOMAKE@
15952
+AWK = @AWK@
15953
+CC = @CC@
15954
+CCDEPMODE = @CCDEPMODE@
15955
+CFLAGS = @CFLAGS@
15956
+CPP = @CPP@
15957
+CPPFLAGS = @CPPFLAGS@
15958
+CYGPATH_W = @CYGPATH_W@
15959
+DEFS = @DEFS@
15960
+DEPDIR = @DEPDIR@
15961
+DRM_CFLAGS = @DRM_CFLAGS@
15962
+DRM_LIBS = @DRM_LIBS@
15963
+DSYMUTIL = @DSYMUTIL@
15964
+DUMPBIN = @DUMPBIN@
15965
+ECHO_C = @ECHO_C@
15966
+ECHO_N = @ECHO_N@
15967
+ECHO_T = @ECHO_T@
15968
+EGREP = @EGREP@
15969
+EXEEXT = @EXEEXT@
15970
+FGREP = @FGREP@
15971
+GREP = @GREP@
15972
+GTK_CFLAGS = @GTK_CFLAGS@
15973
+GTK_LIBS = @GTK_LIBS@
15974
+IMAGE_CFLAGS = @IMAGE_CFLAGS@
15975
+IMAGE_LIBS = @IMAGE_LIBS@
15976
+INSTALL = @INSTALL@
15977
+INSTALL_DATA = @INSTALL_DATA@
15978
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
15979
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
15980
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
15981
+LD = @LD@
15982
+LDFLAGS = @LDFLAGS@
15983
+LIBOBJS = @LIBOBJS@
15984
+LIBS = @LIBS@
15985
+LIBTOOL = @LIBTOOL@
15986
+LIPO = @LIPO@
15987
+LN_S = @LN_S@
15988
+LTLIBOBJS = @LTLIBOBJS@
15989
+LT_AGE = @LT_AGE@
15990
+LT_CURRENT = @LT_CURRENT@
15991
+LT_REVISION = @LT_REVISION@
15992
+MAINT = @MAINT@
15993
+MAKEINFO = @MAKEINFO@
15994
+MKDIR_P = @MKDIR_P@
15995
+NM = @NM@
15996
+NMEDIT = @NMEDIT@
15997
+OBJDUMP = @OBJDUMP@
15998
+OBJEXT = @OBJEXT@
15999
+OTOOL = @OTOOL@
16000
+OTOOL64 = @OTOOL64@
16001
+PACKAGE = @PACKAGE@
16002
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
16003
+PACKAGE_NAME = @PACKAGE_NAME@
16004
+PACKAGE_STRING = @PACKAGE_STRING@
16005
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
16006
+PACKAGE_URL = @PACKAGE_URL@
16007
+PACKAGE_VERSION = @PACKAGE_VERSION@
16008
+PANGO_CFLAGS = @PANGO_CFLAGS@
16009
+PANGO_LIBS = @PANGO_LIBS@
16010
+PATH_SEPARATOR = @PATH_SEPARATOR@
16011
+PKG_CONFIG = @PKG_CONFIG@
16012
+PLYMOUTH_CFLAGS = @PLYMOUTH_CFLAGS@
16013
+PLYMOUTH_CONF_DIR = @PLYMOUTH_CONF_DIR@
16014
+PLYMOUTH_DATADIR = @PLYMOUTH_DATADIR@
16015
+PLYMOUTH_LIBDIR = @PLYMOUTH_LIBDIR@
16016
+PLYMOUTH_LIBEXECDIR = @PLYMOUTH_LIBEXECDIR@
16017
+PLYMOUTH_LIBS = @PLYMOUTH_LIBS@
16018
+PLYMOUTH_PLUGIN_PATH = @PLYMOUTH_PLUGIN_PATH@
16019
+PLYMOUTH_POLICY_DIR = @PLYMOUTH_POLICY_DIR@
16020
+PLYMOUTH_THEME_PATH = @PLYMOUTH_THEME_PATH@
16021
+RANLIB = @RANLIB@
16022
+RELEASE_FILE = @RELEASE_FILE@
16023
+SED = @SED@
16024
+SET_MAKE = @SET_MAKE@
16025
+SHELL = @SHELL@
16026
+STRIP = @STRIP@
16027
+VERSION = @VERSION@
16028
+abs_builddir = @abs_builddir@
16029
+abs_srcdir = @abs_srcdir@
16030
+abs_top_builddir = @abs_top_builddir@
16031
+abs_top_srcdir = @abs_top_srcdir@
16032
+ac_ct_CC = @ac_ct_CC@
16033
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
16034
+am__include = @am__include@
16035
+am__leading_dot = @am__leading_dot@
16036
+am__quote = @am__quote@
16037
+am__tar = @am__tar@
16038
+am__untar = @am__untar@
16039
+background_color = @background_color@
16040
+background_end_color = @background_end_color@
16041
+background_start_color = @background_start_color@
16042
+bindir = @bindir@
16043
+build = @build@
16044
+build_alias = @build_alias@
16045
+build_cpu = @build_cpu@
16046
+build_os = @build_os@
16047
+build_vendor = @build_vendor@
16048
+builddir = @builddir@
16049
+datadir = @datadir@
16050
+datarootdir = @datarootdir@
16051
+docdir = @docdir@
16052
+dvidir = @dvidir@
16053
+exec_prefix = @exec_prefix@
16054
+host = @host@
16055
+host_alias = @host_alias@
16056
+host_cpu = @host_cpu@
16057
+host_os = @host_os@
16058
+host_vendor = @host_vendor@
16059
+htmldir = @htmldir@
16060
+includedir = @includedir@
16061
+infodir = @infodir@
16062
+install_sh = @install_sh@
16063
+libdir = @libdir@
16064
+libexecdir = @libexecdir@
16065
+localedir = @localedir@
16066
+localstatedir = @localstatedir@
16067
+logofile = @logofile@
16068
+lt_ECHO = @lt_ECHO@
16069
+mandir = @mandir@
16070
+mkdir_p = @mkdir_p@
16071
+oldincludedir = @oldincludedir@
16072
+pdfdir = @pdfdir@
16073
+plymouthclientdir = @plymouthclientdir@
16074
+plymouthdaemondir = @plymouthdaemondir@
16075
+prefix = @prefix@
16076
+program_transform_name = @program_transform_name@
16077
+psdir = @psdir@
16078
+sbindir = @sbindir@
16079
+sharedstatedir = @sharedstatedir@
16080
+srcdir = @srcdir@
16081
+sysconfdir = @sysconfdir@
16082
+target_alias = @target_alias@
16083
+top_build_prefix = @top_build_prefix@
16084
+top_builddir = @top_builddir@
16085
+top_srcdir = @top_srcdir@
16086
+INCLUDES = -I$(top_srcdir) \
16087
+ -I$(srcdir)/../../../libply \
16088
+ -I$(srcdir)/../../../libply-splash-core \
16089
+ -I$(srcdir)/../../.. \
16090
+ -I$(srcdir)/../.. \
16091
+ -I$(srcdir)/.. \
16092
+ -I$(srcdir)
16093
+
16094
+plugindir = $(libdir)/plymouth
16095
+plugin_LTLIBRARIES = ubuntu-text.la
16096
+ubuntu_text_la_CFLAGS = $(PLYMOUTH_CFLAGS) \
16097
+ -DPLYMOUTH_BACKGROUND_COLOR=$(background_color) \
16098
+ -DPLYMOUTH_BACKGROUND_END_COLOR=$(background_end_color) \
16099
+ -DPLYMOUTH_BACKGROUND_START_COLOR=$(background_start_color)
16100
+
16101
+ubuntu_text_la_LDFLAGS = -module -avoid-version -export-dynamic
16102
+ubuntu_text_la_LIBADD = $(PLYMOUTH_LIBS) \
16103
+ ../../../libply/libply.la \
16104
+ ../../../libply-splash-core/libply-splash-core.la
16105
+
16106
+ubuntu_text_la_SOURCES = $(srcdir)/plugin.c
16107
+MAINTAINERCLEANFILES = Makefile.in
16108
+all: all-am
16109
+
16110
+.SUFFIXES:
16111
+.SUFFIXES: .c .lo .o .obj
16112
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
16113
+ @for dep in $?; do \
16114
+ case '$(am__configure_deps)' in \
16115
+ *$$dep*) \
16116
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
16117
+ && { if test -f $@; then exit 0; else break; fi; }; \
16118
+ exit 1;; \
16119
+ esac; \
16120
+ done; \
16121
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/plugins/splash/ubuntu-text/Makefile'; \
16122
+ $(am__cd) $(top_srcdir) && \
16123
+ $(AUTOMAKE) --gnu src/plugins/splash/ubuntu-text/Makefile
16124
+.PRECIOUS: Makefile
16125
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
16126
+ @case '$?' in \
16127
+ *config.status*) \
16128
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
16129
+ *) \
16130
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
16131
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
16132
+ esac;
16133
+
16134
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
16135
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
16136
+
16137
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
16138
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
16139
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
16140
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
16141
+$(am__aclocal_m4_deps):
16142
+install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
16143
+ @$(NORMAL_INSTALL)
16144
+ test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
16145
+ @list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
16146
+ list2=; for p in $$list; do \
16147
+ if test -f $$p; then \
16148
+ list2="$$list2 $$p"; \
16149
+ else :; fi; \
16150
+ done; \
16151
+ test -z "$$list2" || { \
16152
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
16153
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
16154
+ }
16155
+
16156
+uninstall-pluginLTLIBRARIES:
16157
+ @$(NORMAL_UNINSTALL)
16158
+ @list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
16159
+ for p in $$list; do \
16160
+ $(am__strip_dir) \
16161
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$f'"; \
16162
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$f"; \
16163
+ done
16164
+
16165
+clean-pluginLTLIBRARIES:
16166
+ -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
16167
+ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
16168
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
16169
+ test "$$dir" != "$$p" || dir=.; \
16170
+ echo "rm -f \"$${dir}/so_locations\""; \
16171
+ rm -f "$${dir}/so_locations"; \
16172
+ done
16173
+ubuntu-text.la: $(ubuntu_text_la_OBJECTS) $(ubuntu_text_la_DEPENDENCIES)
16174
+ $(AM_V_CCLD)$(ubuntu_text_la_LINK) -rpath $(plugindir) $(ubuntu_text_la_OBJECTS) $(ubuntu_text_la_LIBADD) $(LIBS)
16175
+
16176
+mostlyclean-compile:
16177
+ -rm -f *.$(OBJEXT)
16178
+
16179
+distclean-compile:
16180
+ -rm -f *.tab.c
16181
+
16182
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ubuntu_text_la-plugin.Plo@am__quote@
16183
+
16184
+.c.o:
16185
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
16186
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
16187
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
16188
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
16189
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
16190
+@am__fastdepCC_FALSE@ $(COMPILE) -c $<
16191
+
16192
+.c.obj:
16193
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
16194
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
16195
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
16196
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
16197
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
16198
+@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
16199
+
16200
+.c.lo:
16201
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
16202
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
16203
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
16204
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
16205
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
16206
+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
16207
+
16208
+ubuntu_text_la-plugin.lo: $(srcdir)/plugin.c
16209
+@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
16210
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ubuntu_text_la-plugin.Tpo $(DEPDIR)/ubuntu_text_la-plugin.Plo
16211
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
16212
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/plugin.c' object='ubuntu_text_la-plugin.lo' libtool=yes @AMDEPBACKSLASH@
16213
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
16214
+@am__fastdepCC_FALSE@ $(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
16215
+
16216
+mostlyclean-libtool:
16217
+ -rm -f *.lo
16218
+
16219
+clean-libtool:
16220
+ -rm -rf .libs _libs
16221
+
16222
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
16223
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
16224
+ unique=`for i in $$list; do \
16225
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
16226
+ done | \
16227
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
16228
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
16229
+ mkid -fID $$unique
16230
+tags: TAGS
16231
+
16232
+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
16233
+ $(TAGS_FILES) $(LISP)
16234
+ set x; \
16235
+ here=`pwd`; \
16236
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
16237
+ unique=`for i in $$list; do \
16238
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
16239
+ done | \
16240
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
16241
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
16242
+ shift; \
16243
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
16244
+ test -n "$$unique" || unique=$$empty_fix; \
16245
+ if test $$# -gt 0; then \
16246
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
16247
+ "$$@" $$unique; \
16248
+ else \
16249
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
16250
+ $$unique; \
16251
+ fi; \
16252
+ fi
16253
+ctags: CTAGS
16254
+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
16255
+ $(TAGS_FILES) $(LISP)
16256
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
16257
+ unique=`for i in $$list; do \
16258
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
16259
+ done | \
16260
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
16261
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
16262
+ test -z "$(CTAGS_ARGS)$$unique" \
16263
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
16264
+ $$unique
16265
+
16266
+GTAGS:
16267
+ here=`$(am__cd) $(top_builddir) && pwd` \
16268
+ && $(am__cd) $(top_srcdir) \
16269
+ && gtags -i $(GTAGS_ARGS) "$$here"
16270
+
16271
+distclean-tags:
16272
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
16273
+
16274
+distdir: $(DISTFILES)
16275
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
16276
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
16277
+ list='$(DISTFILES)'; \
16278
+ dist_files=`for file in $$list; do echo $$file; done | \
16279
+ sed -e "s|^$$srcdirstrip/||;t" \
16280
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
16281
+ case $$dist_files in \
16282
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
16283
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
16284
+ sort -u` ;; \
16285
+ esac; \
16286
+ for file in $$dist_files; do \
16287
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
16288
+ if test -d $$d/$$file; then \
16289
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
16290
+ if test -d "$(distdir)/$$file"; then \
16291
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
16292
+ fi; \
16293
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
16294
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
16295
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
16296
+ fi; \
16297
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
16298
+ else \
16299
+ test -f "$(distdir)/$$file" \
16300
+ || cp -p $$d/$$file "$(distdir)/$$file" \
16301
+ || exit 1; \
16302
+ fi; \
16303
+ done
16304
+check-am: all-am
16305
+check: check-am
16306
+all-am: Makefile $(LTLIBRARIES)
16307
+installdirs:
16308
+ for dir in "$(DESTDIR)$(plugindir)"; do \
16309
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
16310
+ done
16311
+install: install-am
16312
+install-exec: install-exec-am
16313
+install-data: install-data-am
16314
+uninstall: uninstall-am
16315
+
16316
+install-am: all-am
16317
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
16318
+
16319
+installcheck: installcheck-am
16320
+install-strip:
16321
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
16322
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
16323
+ `test -z '$(STRIP)' || \
16324
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
16325
+mostlyclean-generic:
16326
+
16327
+clean-generic:
16328
+
16329
+distclean-generic:
16330
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
16331
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
16332
+
16333
+maintainer-clean-generic:
16334
+ @echo "This command is intended for maintainers to use"
16335
+ @echo "it deletes files that may require special tools to rebuild."
16336
+ -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
16337
+clean: clean-am
16338
+
16339
+clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \
16340
+ mostlyclean-am
16341
+
16342
+distclean: distclean-am
16343
+ -rm -rf ./$(DEPDIR)
16344
+ -rm -f Makefile
16345
+distclean-am: clean-am distclean-compile distclean-generic \
16346
+ distclean-tags
16347
+
16348
+dvi: dvi-am
16349
+
16350
+dvi-am:
16351
+
16352
+html: html-am
16353
+
16354
+html-am:
16355
+
16356
+info: info-am
16357
+
16358
+info-am:
16359
+
16360
+install-data-am: install-pluginLTLIBRARIES
16361
+
16362
+install-dvi: install-dvi-am
16363
+
16364
+install-dvi-am:
16365
+
16366
+install-exec-am:
16367
+
16368
+install-html: install-html-am
16369
+
16370
+install-html-am:
16371
+
16372
+install-info: install-info-am
16373
+
16374
+install-info-am:
16375
+
16376
+install-man:
16377
+
16378
+install-pdf: install-pdf-am
16379
+
16380
+install-pdf-am:
16381
+
16382
+install-ps: install-ps-am
16383
+
16384
+install-ps-am:
16385
+
16386
+installcheck-am:
16387
+
16388
+maintainer-clean: maintainer-clean-am
16389
+ -rm -rf ./$(DEPDIR)
16390
+ -rm -f Makefile
16391
+maintainer-clean-am: distclean-am maintainer-clean-generic
16392
+
16393
+mostlyclean: mostlyclean-am
16394
+
16395
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
16396
+ mostlyclean-libtool
16397
+
16398
+pdf: pdf-am
16399
+
16400
+pdf-am:
16401
+
16402
+ps: ps-am
16403
+
16404
+ps-am:
16405
+
16406
+uninstall-am: uninstall-pluginLTLIBRARIES
16407
+
16408
+.MAKE: install-am install-strip
16409
+
16410
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
16411
+ clean-libtool clean-pluginLTLIBRARIES ctags distclean \
16412
+ distclean-compile distclean-generic distclean-libtool \
16413
+ distclean-tags distdir dvi dvi-am html html-am info info-am \
16414
+ install install-am install-data install-data-am install-dvi \
16415
+ install-dvi-am install-exec install-exec-am install-html \
16416
+ install-html-am install-info install-info-am install-man \
16417
+ install-pdf install-pdf-am install-pluginLTLIBRARIES \
16418
+ install-ps install-ps-am install-strip installcheck \
16419
+ installcheck-am installdirs maintainer-clean \
16420
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
16421
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
16422
+ tags uninstall uninstall-am uninstall-pluginLTLIBRARIES
16423
+
16424
+
16425
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
16426
+# Otherwise a system limit (for SysV at least) may be exceeded.
16427
+.NOEXPORT:
16428
--- plymouth-0.8.2.orig/src/plugins/splash/details/plugin.c
16429
+++ plymouth-0.8.2/src/plugins/splash/details/plugin.c
16430
@@ -203,7 +203,10 @@ add_text_display (ply_boot_splash_plugin
16431
16432
terminal = ply_text_display_get_terminal (view->display);
16433
if (ply_terminal_open (terminal))
16434
- ply_terminal_activate_vt (terminal);
16435
+ {
16436
+ ply_terminal_set_mode (terminal, PLY_TERMINAL_MODE_TEXT);
16437
+ ply_terminal_activate_vt (terminal);
16438
+ }
16439
16440
ply_list_append_data (plugin->views, view);
16441
}
16442
--- plymouth-0.8.2.orig/src/plugins/splash/details/Makefile.in
16443
+++ plymouth-0.8.2/src/plugins/splash/details/Makefile.in
16444
@@ -172,6 +172,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
16445
PACKAGE_NAME = @PACKAGE_NAME@
16446
PACKAGE_STRING = @PACKAGE_STRING@
16447
PACKAGE_TARNAME = @PACKAGE_TARNAME@
16448
+PACKAGE_URL = @PACKAGE_URL@
16449
PACKAGE_VERSION = @PACKAGE_VERSION@
16450
PANGO_CFLAGS = @PANGO_CFLAGS@
16451
PANGO_LIBS = @PANGO_LIBS@
16452
--- plymouth-0.8.2.orig/src/plugins/splash/fade-throbber/Makefile.in
16453
+++ plymouth-0.8.2/src/plugins/splash/fade-throbber/Makefile.in
16454
@@ -174,6 +174,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
16455
PACKAGE_NAME = @PACKAGE_NAME@
16456
PACKAGE_STRING = @PACKAGE_STRING@
16457
PACKAGE_TARNAME = @PACKAGE_TARNAME@
16458
+PACKAGE_URL = @PACKAGE_URL@
16459
PACKAGE_VERSION = @PACKAGE_VERSION@
16460
PANGO_CFLAGS = @PANGO_CFLAGS@
16461
PANGO_LIBS = @PANGO_LIBS@
16462
--- plymouth-0.8.2.orig/src/plugins/splash/two-step/Makefile.in
16463
+++ plymouth-0.8.2/src/plugins/splash/two-step/Makefile.in
16464
@@ -173,6 +173,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
16465
16465
PACKAGE_NAME = @PACKAGE_NAME@
16466
16466
PACKAGE_STRING = @PACKAGE_STRING@
16467
16467
PACKAGE_TARNAME = @PACKAGE_TARNAME@
16479
16479
PACKAGE_VERSION = @PACKAGE_VERSION@
16480
16480
PANGO_CFLAGS = @PANGO_CFLAGS@
16481
16481
PANGO_LIBS = @PANGO_LIBS@
16482
--- plymouth-0.8.2.orig/src/libply-splash-core/Makefile.in
16483
+++ plymouth-0.8.2/src/libply-splash-core/Makefile.in
16484
@@ -185,6 +185,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
16485
PACKAGE_NAME = @PACKAGE_NAME@
16486
PACKAGE_STRING = @PACKAGE_STRING@
16487
PACKAGE_TARNAME = @PACKAGE_TARNAME@
16488
+PACKAGE_URL = @PACKAGE_URL@
16489
PACKAGE_VERSION = @PACKAGE_VERSION@
16490
PANGO_CFLAGS = @PANGO_CFLAGS@
16491
PANGO_LIBS = @PANGO_LIBS@
16492
--- plymouth-0.8.2.orig/src/libply-splash-core/ply-pixel-display.h
16493
+++ plymouth-0.8.2/src/libply-splash-core/ply-pixel-display.h
16494
@@ -48,6 +48,7 @@ void ply_pixel_display_free (ply_pixel_d
16495
16496
unsigned long ply_pixel_display_get_width (ply_pixel_display_t *display);
16497
unsigned long ply_pixel_display_get_height (ply_pixel_display_t *display);
16498
+unsigned int ply_pixel_display_get_bits_per_pixel (ply_pixel_display_t *display);
16499
16500
void ply_pixel_display_set_draw_handler (ply_pixel_display_t *display,
16501
ply_pixel_display_draw_handler_t draw_handler,
16502
16482
--- plymouth-0.8.2.orig/src/libply-splash-core/ply-pixel-display.c
16503
16483
+++ plymouth-0.8.2/src/libply-splash-core/ply-pixel-display.c
16504
16484
@@ -51,6 +51,7 @@ struct _ply_pixel_display
16532
16512
static void
16533
16513
ply_pixel_display_flush (ply_pixel_display_t *display)
16534
16514
{
16515
--- plymouth-0.8.2.orig/src/libply-splash-core/ply-pixel-display.h
16516
+++ plymouth-0.8.2/src/libply-splash-core/ply-pixel-display.h
16517
@@ -48,6 +48,7 @@ void ply_pixel_display_free (ply_pixel_d
16518
16519
unsigned long ply_pixel_display_get_width (ply_pixel_display_t *display);
16520
unsigned long ply_pixel_display_get_height (ply_pixel_display_t *display);
16521
+unsigned int ply_pixel_display_get_bits_per_pixel (ply_pixel_display_t *display);
16522
16523
void ply_pixel_display_set_draw_handler (ply_pixel_display_t *display,
16524
ply_pixel_display_draw_handler_t draw_handler,
16525
--- plymouth-0.8.2.orig/src/libply-splash-core/ply-renderer-plugin.h
16526
+++ plymouth-0.8.2/src/libply-splash-core/ply-renderer-plugin.h
16527
@@ -54,6 +54,8 @@ typedef struct
16528
16529
ply_pixel_buffer_t * (* get_buffer_for_head) (ply_renderer_backend_t *backend,
16530
ply_renderer_head_t *head);
16531
+ unsigned int (* get_bits_per_pixel_for_head) (ply_renderer_backend_t *backend,
16532
+ ply_renderer_head_t *head);
16533
16534
ply_renderer_input_source_t * (* get_input_source) (ply_renderer_backend_t *backend);
16535
bool (* open_input_source) (ply_renderer_backend_t *backend,
16536
--- plymouth-0.8.2.orig/src/libply-splash-core/ply-renderer.h
16537
+++ plymouth-0.8.2/src/libply-splash-core/ply-renderer.h
16538
@@ -50,6 +50,8 @@ void ply_renderer_deactivate (ply_render
16539
ply_list_t *ply_renderer_get_heads (ply_renderer_t *renderer);
16540
ply_pixel_buffer_t *ply_renderer_get_buffer_for_head (ply_renderer_t *renderer,
16541
ply_renderer_head_t *head);
16542
+unsigned int ply_renderer_get_bits_per_pixel_for_head (ply_renderer_t *renderer,
16543
+ ply_renderer_head_t *head);
16544
16545
void ply_renderer_flush_head (ply_renderer_t *renderer,
16546
ply_renderer_head_t *head);
16535
16547
--- plymouth-0.8.2.orig/src/libply-splash-core/ply-renderer.c
16536
16548
+++ plymouth-0.8.2/src/libply-splash-core/ply-renderer.c
16537
16549
@@ -231,6 +231,7 @@ ply_renderer_open (ply_renderer_t *rende
16564
16576
void
16565
16577
ply_renderer_flush_head (ply_renderer_t *renderer,
16566
16578
ply_renderer_head_t *head)
16567
--- plymouth-0.8.2.orig/src/libply-splash-core/ply-renderer-plugin.h
16568
+++ plymouth-0.8.2/src/libply-splash-core/ply-renderer-plugin.h
16569
@@ -54,6 +54,8 @@ typedef struct
16570
16571
ply_pixel_buffer_t * (* get_buffer_for_head) (ply_renderer_backend_t *backend,
16572
ply_renderer_head_t *head);
16573
+ unsigned int (* get_bits_per_pixel_for_head) (ply_renderer_backend_t *backend,
16574
+ ply_renderer_head_t *head);
16575
16576
ply_renderer_input_source_t * (* get_input_source) (ply_renderer_backend_t *backend);
16577
bool (* open_input_source) (ply_renderer_backend_t *backend,
16578
--- plymouth-0.8.2.orig/src/libply-splash-core/ply-renderer.h
16579
+++ plymouth-0.8.2/src/libply-splash-core/ply-renderer.h
16580
@@ -50,6 +50,8 @@ void ply_renderer_deactivate (ply_render
16581
ply_list_t *ply_renderer_get_heads (ply_renderer_t *renderer);
16582
ply_pixel_buffer_t *ply_renderer_get_buffer_for_head (ply_renderer_t *renderer,
16583
ply_renderer_head_t *head);
16584
+unsigned int ply_renderer_get_bits_per_pixel_for_head (ply_renderer_t *renderer,
16585
+ ply_renderer_head_t *head);
16586
16587
void ply_renderer_flush_head (ply_renderer_t *renderer,
16588
ply_renderer_head_t *head);
16589
--- plymouth-0.8.2.orig/scripts/Makefile.in
16590
+++ plymouth-0.8.2/scripts/Makefile.in
16591
@@ -144,6 +144,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
16592
PACKAGE_NAME = @PACKAGE_NAME@
16593
PACKAGE_STRING = @PACKAGE_STRING@
16594
PACKAGE_TARNAME = @PACKAGE_TARNAME@
16595
+PACKAGE_URL = @PACKAGE_URL@
16596
PACKAGE_VERSION = @PACKAGE_VERSION@
16597
PANGO_CFLAGS = @PANGO_CFLAGS@
16598
PANGO_LIBS = @PANGO_LIBS@
16599
--- plymouth-0.8.2.orig/images/Makefile.in
16600
+++ plymouth-0.8.2/images/Makefile.in
16601
@@ -138,6 +138,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
16602
PACKAGE_NAME = @PACKAGE_NAME@
16603
PACKAGE_STRING = @PACKAGE_STRING@
16604
PACKAGE_TARNAME = @PACKAGE_TARNAME@
16605
+PACKAGE_URL = @PACKAGE_URL@
16606
PACKAGE_VERSION = @PACKAGE_VERSION@
16607
PANGO_CFLAGS = @PANGO_CFLAGS@
16608
PANGO_LIBS = @PANGO_LIBS@
16579
--- plymouth-0.8.2.orig/src/libply-splash-core/Makefile.in
16580
+++ plymouth-0.8.2/src/libply-splash-core/Makefile.in
16581
@@ -185,6 +185,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
16582
PACKAGE_NAME = @PACKAGE_NAME@
16583
PACKAGE_STRING = @PACKAGE_STRING@
16584
PACKAGE_TARNAME = @PACKAGE_TARNAME@
16585
+PACKAGE_URL = @PACKAGE_URL@
16586
PACKAGE_VERSION = @PACKAGE_VERSION@
16587
PANGO_CFLAGS = @PANGO_CFLAGS@
16588
PANGO_LIBS = @PANGO_LIBS@
16589
--- plymouth-0.8.2.orig/src/libply-splash-graphics/Makefile.in
16590
+++ plymouth-0.8.2/src/libply-splash-graphics/Makefile.in
16591
@@ -186,6 +186,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
16592
PACKAGE_NAME = @PACKAGE_NAME@
16593
PACKAGE_STRING = @PACKAGE_STRING@
16594
PACKAGE_TARNAME = @PACKAGE_TARNAME@
16595
+PACKAGE_URL = @PACKAGE_URL@
16596
PACKAGE_VERSION = @PACKAGE_VERSION@
16597
PANGO_CFLAGS = @PANGO_CFLAGS@
16598
PANGO_LIBS = @PANGO_LIBS@
16599
--- plymouth-0.8.2.orig/src/viewer/Makefile.in
16600
+++ plymouth-0.8.2/src/viewer/Makefile.in
16601
@@ -215,6 +215,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
16602
PACKAGE_NAME = @PACKAGE_NAME@
16603
PACKAGE_STRING = @PACKAGE_STRING@
16604
PACKAGE_TARNAME = @PACKAGE_TARNAME@
16605
+PACKAGE_URL = @PACKAGE_URL@
16606
PACKAGE_VERSION = @PACKAGE_VERSION@
16607
PANGO_CFLAGS = @PANGO_CFLAGS@
16608
PANGO_LIBS = @PANGO_LIBS@
16609
--- plymouth-0.8.2.orig/build-tools/config.sub
16610
+++ plymouth-0.8.2/build-tools/config.sub
16611
@@ -4,7 +4,7 @@
16612
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
16613
# Free Software Foundation, Inc.
16614
16615
-timestamp='2009-11-20'
16616
+timestamp='2009-06-11'
16617
16618
# This file is (in principle) common to ALL GNU software.
16619
# The presence of a machine in this file suggests that SOME GNU software
16620
@@ -32,16 +32,13 @@ timestamp='2009-11-20'
16621
16622
16623
# Please send patches to <config-patches@gnu.org>. Submit a context
16624
-# diff and a properly formatted GNU ChangeLog entry.
16625
+# diff and a properly formatted ChangeLog entry.
16626
#
16627
# Configuration subroutine to validate and canonicalize a configuration type.
16628
# Supply the specified configuration type as an argument.
16629
# If it is invalid, we print an error message on stderr and exit with code 1.
16630
# Otherwise, we print the canonical config type on stdout and succeed.
16631
16632
-# You can get the latest version of this script from:
16633
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
16634
-
16635
# This file is supposed to be the same for all GNU packages
16636
# and recognize all the CPU types, system types and aliases
16637
# that are meaningful with *any* GNU software.
16638
@@ -152,7 +149,7 @@ case $os in
16639
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
16640
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
16641
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
16642
- -apple | -axis | -knuth | -cray | -microblaze)
16643
+ -apple | -axis | -knuth | -cray)
16644
os=
16645
basic_machine=$1
16646
;;
16647
@@ -287,7 +284,6 @@ case $basic_machine in
16648
| pdp10 | pdp11 | pj | pjl \
16649
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
16650
| pyramid \
16651
- | rx \
16652
| score \
16653
| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
16654
| sh64 | sh64le \
16655
@@ -295,14 +291,13 @@ case $basic_machine in
16656
| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
16657
| spu | strongarm \
16658
| tahoe | thumb | tic4x | tic80 | tron \
16659
- | ubicom32 \
16660
| v850 | v850e \
16661
| we32k \
16662
| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
16663
| z8k | z80)
16664
basic_machine=$basic_machine-unknown
16665
;;
16666
- m6811 | m68hc11 | m6812 | m68hc12 | picochip)
16667
+ m6811 | m68hc11 | m6812 | m68hc12)
16668
# Motorola 68HC11/12.
16669
basic_machine=$basic_machine-unknown
16670
os=-none
16671
@@ -345,7 +340,7 @@ case $basic_machine in
16672
| lm32-* \
16673
| m32c-* | m32r-* | m32rle-* \
16674
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
16675
- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
16676
+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
16677
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
16678
| mips16-* \
16679
| mips64-* | mips64el-* \
16680
@@ -373,7 +368,7 @@ case $basic_machine in
16681
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
16682
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
16683
| pyramid-* \
16684
- | romp-* | rs6000-* | rx-* \
16685
+ | romp-* | rs6000-* \
16686
| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
16687
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
16688
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
16689
@@ -382,7 +377,6 @@ case $basic_machine in
16690
| tahoe-* | thumb-* \
16691
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
16692
| tron-* \
16693
- | ubicom32-* \
16694
| v850-* | v850e-* | vax-* \
16695
| we32k-* \
16696
| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
16697
@@ -732,9 +726,6 @@ case $basic_machine in
16698
basic_machine=ns32k-utek
16699
os=-sysv
16700
;;
16701
- microblaze)
16702
- basic_machine=microblaze-xilinx
16703
- ;;
16704
mingw32)
16705
basic_machine=i386-pc
16706
os=-mingw32
16707
@@ -1256,9 +1247,6 @@ case $os in
16708
# First match some system type aliases
16709
# that might get confused with valid system types.
16710
# -solaris* is a basic system type, with this one exception.
16711
- -auroraux)
16712
- os=-auroraux
16713
- ;;
16714
-solaris1 | -solaris1.*)
16715
os=`echo $os | sed -e 's|solaris1|sunos4|'`
16716
;;
16717
@@ -1280,8 +1268,8 @@ case $os in
16718
# -sysv* is not here because it comes later, after sysvr4.
16719
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
16720
| -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
16721
- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
16722
- | -sym* | -kopensolaris* \
16723
+ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
16724
+ | -kopensolaris* \
16725
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
16726
| -aos* | -aros* \
16727
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
16728
@@ -1302,7 +1290,7 @@ case $os in
16729
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
16730
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
16731
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
16732
- | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
16733
+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
16734
# Remember, each alternative MUST END IN *, to match a version number.
16735
;;
16736
-qnx*)
16609
16737
--- plymouth-0.8.2.orig/build-tools/config.guess
16610
16738
+++ plymouth-0.8.2/build-tools/config.guess
16611
16739
@@ -4,7 +4,7 @@
16837
16965
unknown) UNAME_PROCESSOR=powerpc ;;
16838
16966
esac
16839
16967
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
16840
--- plymouth-0.8.2.orig/build-tools/config.sub
16841
+++ plymouth-0.8.2/build-tools/config.sub
16842
@@ -4,7 +4,7 @@
16843
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
16844
# Free Software Foundation, Inc.
16845
16846
-timestamp='2009-11-20'
16847
+timestamp='2009-06-11'
16848
16849
# This file is (in principle) common to ALL GNU software.
16850
# The presence of a machine in this file suggests that SOME GNU software
16851
@@ -32,16 +32,13 @@ timestamp='2009-11-20'
16852
16853
16854
# Please send patches to <config-patches@gnu.org>. Submit a context
16855
-# diff and a properly formatted GNU ChangeLog entry.
16856
+# diff and a properly formatted ChangeLog entry.
16857
#
16858
# Configuration subroutine to validate and canonicalize a configuration type.
16859
# Supply the specified configuration type as an argument.
16860
# If it is invalid, we print an error message on stderr and exit with code 1.
16861
# Otherwise, we print the canonical config type on stdout and succeed.
16862
16863
-# You can get the latest version of this script from:
16864
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
16865
-
16866
# This file is supposed to be the same for all GNU packages
16867
# and recognize all the CPU types, system types and aliases
16868
# that are meaningful with *any* GNU software.
16869
@@ -152,7 +149,7 @@ case $os in
16870
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
16871
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
16872
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
16873
- -apple | -axis | -knuth | -cray | -microblaze)
16874
+ -apple | -axis | -knuth | -cray)
16875
os=
16876
basic_machine=$1
16877
;;
16878
@@ -287,7 +284,6 @@ case $basic_machine in
16879
| pdp10 | pdp11 | pj | pjl \
16880
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
16881
| pyramid \
16882
- | rx \
16883
| score \
16884
| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
16885
| sh64 | sh64le \
16886
@@ -295,14 +291,13 @@ case $basic_machine in
16887
| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
16888
| spu | strongarm \
16889
| tahoe | thumb | tic4x | tic80 | tron \
16890
- | ubicom32 \
16891
| v850 | v850e \
16892
| we32k \
16893
| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
16894
| z8k | z80)
16895
basic_machine=$basic_machine-unknown
16896
;;
16897
- m6811 | m68hc11 | m6812 | m68hc12 | picochip)
16898
+ m6811 | m68hc11 | m6812 | m68hc12)
16899
# Motorola 68HC11/12.
16900
basic_machine=$basic_machine-unknown
16901
os=-none
16902
@@ -345,7 +340,7 @@ case $basic_machine in
16903
| lm32-* \
16904
| m32c-* | m32r-* | m32rle-* \
16905
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
16906
- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
16907
+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
16908
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
16909
| mips16-* \
16910
| mips64-* | mips64el-* \
16911
@@ -373,7 +368,7 @@ case $basic_machine in
16912
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
16913
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
16914
| pyramid-* \
16915
- | romp-* | rs6000-* | rx-* \
16916
+ | romp-* | rs6000-* \
16917
| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
16918
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
16919
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
16920
@@ -382,7 +377,6 @@ case $basic_machine in
16921
| tahoe-* | thumb-* \
16922
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
16923
| tron-* \
16924
- | ubicom32-* \
16925
| v850-* | v850e-* | vax-* \
16926
| we32k-* \
16927
| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
16928
@@ -732,9 +726,6 @@ case $basic_machine in
16929
basic_machine=ns32k-utek
16930
os=-sysv
16931
;;
16932
- microblaze)
16933
- basic_machine=microblaze-xilinx
16934
- ;;
16935
mingw32)
16936
basic_machine=i386-pc
16937
os=-mingw32
16938
@@ -1256,9 +1247,6 @@ case $os in
16939
# First match some system type aliases
16940
# that might get confused with valid system types.
16941
# -solaris* is a basic system type, with this one exception.
16942
- -auroraux)
16943
- os=-auroraux
16944
- ;;
16945
-solaris1 | -solaris1.*)
16946
os=`echo $os | sed -e 's|solaris1|sunos4|'`
16947
;;
16948
@@ -1280,8 +1268,8 @@ case $os in
16949
# -sysv* is not here because it comes later, after sysvr4.
16950
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
16951
| -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
16952
- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
16953
- | -sym* | -kopensolaris* \
16954
+ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
16955
+ | -kopensolaris* \
16956
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
16957
| -aos* | -aros* \
16958
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
16959
@@ -1302,7 +1290,7 @@ case $os in
16960
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
16961
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
16962
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
16963
- | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
16964
+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
16965
# Remember, each alternative MUST END IN *, to match a version number.
16966
;;
16967
-qnx*)
16968
16968
--- plymouth-0.8.2.orig/build-tools/ltmain.sh
16969
16969
+++ plymouth-0.8.2/build-tools/ltmain.sh
16970
16970
@@ -1,6 +1,6 @@
Loggerhead is a web-based interface for Breezy
Version: 2.0.1