Lubuntu/artwork
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge lubuntu-artwork 0.57

Browse Source 
* Transition with new plymouth from /usr/share to /lib:
  - replace /lib instances by /usr/share
  - move src/lib/plymouth to src/usr/share/plymouth and adapt Makefile
  - breaks against older plymouth.
  - ensure we can transition the alternatives to the new version
This commit is contained in:
Julien Lavergne 2015-12-09 20:33:41 +01:00
parent 373a9ac136
commit 7dbdbbee86
13 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -6,7 +6,7 @@ all: install
install: install:
mkdir -pv $(DESTDIR) mkdir -pv $(DESTDIR)
cp -a src/usr src/lib $(DESTDIR)/. cp -a src/usr $(DESTDIR)/.
# po generation # po generation
for i in $(SUBDIRS); do \ for i in $(SUBDIRS); do \
make -C $(DESTDIR)/$$i; \ make -C $(DESTDIR)/$$i; \

12
debian/changelog vendored
View File

@ -1,4 +1,4 @@
lubuntu-artwork (0.57) UNRELEASED; urgency=medium lubuntu-artwork (0.58) UNRELEASED; urgency=medium
* src/usr/share/icons: * src/usr/share/icons:
- Update icons - Update icons
@ -10,6 +10,16 @@ lubuntu-artwork (0.57) UNRELEASED; urgency=medium
-- Julien Lavergne <gilir@ubuntu.com> Sun, 06 Dec 2015 21:19:23 +0100 -- Julien Lavergne <gilir@ubuntu.com> Sun, 06 Dec 2015 21:19:23 +0100
lubuntu-artwork (0.57) xenial; urgency=medium
* Transition with new plymouth from /usr/share to /lib:
- replace /lib instances by /usr/share
- move src/lib/plymouth to src/usr/share/plymouth and adapt Makefile
- breaks against older plymouth.
- ensure we can transition the alternatives to the new version
-- Didier Roche <didrocks@ubuntu.com> Wed, 09 Dec 2015 08:35:36 +0100
lubuntu-artwork (0.56) wily; urgency=medium lubuntu-artwork (0.56) wily; urgency=medium
* src/usr/share/icons: * src/usr/share/icons:

2
debian/control vendored
View File

@ -180,6 +180,7 @@ Provides: plymouth-theme
Replaces: lubuntu-plymouth-theme, Replaces: lubuntu-plymouth-theme,
plymouth (<< 0.8.1-1~) plymouth (<< 0.8.1-1~)
Conflicts: lubuntu-plymouth-theme Conflicts: lubuntu-plymouth-theme
Breaks: plymouth (<< 0.9.2-3ubuntu1~),
Description: plymouth theme for Lubuntu Description: plymouth theme for Lubuntu
This package contain a specific Lubuntu theme for plymouth. This package contain a specific Lubuntu theme for plymouth.
@ -192,6 +193,7 @@ Depends: plymouth,
${shlibs:Depends} ${shlibs:Depends}
Provides: plymouth-theme Provides: plymouth-theme
Replaces: plymouth (<< 0.8.1-1~) Replaces: plymouth (<< 0.8.1-1~)
Breaks: plymouth (<< 0.9.2-3ubuntu1~),
Description: plymouth text theme for Lubuntu Description: plymouth text theme for Lubuntu
This package contain a specific Lubuntu theme for plymouth, which display a This package contain a specific Lubuntu theme for plymouth, which display a
simple text. simple text.

2
debian/copyright vendored
View File

@ -2,7 +2,7 @@ Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
Upstream-Name: Lubuntu Artwork Upstream-Name: Lubuntu Artwork
Upstream-Maintainer: Lubuntu Team <lubuntu-desktop@lists.launchpad.net> Upstream-Maintainer: Lubuntu Team <lubuntu-desktop@lists.launchpad.net>
Files: lib/ Files: usr/share/plymouth/*
Copyright: Copyright (C) 2009 Canonical Ltd. Copyright: Copyright (C) 2009 Canonical Ltd.
Copyright (C) 2010 Rafael Laguna <rafaellaguna@gmail.com> Copyright (C) 2010 Rafael Laguna <rafaellaguna@gmail.com>
License: GPL-2+ License: GPL-2+

2
debian/plymouth-theme-lubuntu-logo.install vendored
View File

@ -1 +1 @@
lib/plymouth/themes/lubuntu-logo/ usr/share/plymouth/themes/lubuntu-logo/

4
debian/plymouth-theme-lubuntu-logo.postinst vendored
View File

@ -19,8 +19,8 @@
case "$1" in case "$1" in
configure) configure)
update-alternatives \ update-alternatives \
--install /lib/plymouth/themes/default.plymouth default.plymouth \ --install /usr/share/plymouth/themes/default.plymouth default.plymouth \
/lib/plymouth/themes/lubuntu-logo/lubuntu-logo.plymouth 150 /usr/share/plymouth/themes/lubuntu-logo/lubuntu-logo.plymouth 150
if which update-initramfs >/dev/null 2>&1 if which update-initramfs >/dev/null 2>&1
then then

2
debian/plymouth-theme-lubuntu-logo.prerm vendored
View File

@ -30,7 +30,7 @@
case "$1" in case "$1" in
remove) remove)
update-alternatives \ update-alternatives \
--remove default.plymouth /lib/plymouth/themes/lubuntu-logo/lubuntu-logo.plymouth --remove default.plymouth /usr/share/plymouth/themes/lubuntu-logo/lubuntu-logo.plymouth
if which update-initramfs >/dev/null 2>&1 if which update-initramfs >/dev/null 2>&1
then then

2
debian/plymouth-theme-lubuntu-text.install vendored
View File

@ -1 +1 @@
lib/plymouth/themes/lubuntu-text/ usr/share/plymouth/themes/lubuntu-text/

4
debian/plymouth-theme-lubuntu-text.postinst vendored
View File

@ -19,8 +19,8 @@
case "$1" in case "$1" in
configure) configure)
update-alternatives \ update-alternatives \
--install /lib/plymouth/themes/text.plymouth text.plymouth \ --install /usr/share/plymouth/themes/text.plymouth text.plymouth \
/lib/plymouth/themes/lubuntu-text/lubuntu-text.plymouth 150 /usr/share/plymouth/themes/lubuntu-text/lubuntu-text.plymouth 150
if which update-initramfs >/dev/null 2>&1 if which update-initramfs >/dev/null 2>&1
then then

2
debian/plymouth-theme-lubuntu-text.prerm vendored
View File

@ -30,7 +30,7 @@
case "$1" in case "$1" in
remove) remove)
update-alternatives \ update-alternatives \
--remove text.plymouth /lib/plymouth/themes/lubuntu-text/lubuntu-text.plymouth --remove text.plymouth /usr/share/plymouth/themes/lubuntu-text/lubuntu-text.plymouth
if which update-initramfs >/dev/null 2>&1 if which update-initramfs >/dev/null 2>&1
then then

4
src/lib/plymouth/themes/lubuntu-logo/lubuntu-logo.plymouth → src/usr/share/plymouth/themes/lubuntu-logo/lubuntu-logo.plymouth
View File

@ -4,5 +4,5 @@ Description=A theme that features a blank background with a logo.
ModuleName=script ModuleName=script
[script] [script]
ImageDir=/lib/plymouth/themes/lubuntu-logo ImageDir=/usr/share/plymouth/themes/lubuntu-logo
ScriptFile=/lib/plymouth/themes/lubuntu-logo/lubuntu-logo.script ScriptFile=/usr/share/plymouth/themes/lubuntu-logo/lubuntu-logo.script

0
src/lib/plymouth/themes/lubuntu-logo/lubuntu-logo.script → src/usr/share/plymouth/themes/lubuntu-logo/lubuntu-logo.script
View File

0
src/lib/plymouth/themes/lubuntu-text/lubuntu-text.plymouth → src/usr/share/plymouth/themes/lubuntu-text/lubuntu-text.plymouth
View File