From 7dbdbbee86ba7833c7514502288c41709ca4f5c7 Mon Sep 17 00:00:00 2001 From: Julien Lavergne Date: Wed, 9 Dec 2015 20:33:41 +0100 Subject: [PATCH] Merge lubuntu-artwork 0.57 * 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 --- Makefile | 2 +- debian/changelog | 12 +++++++++++- debian/control | 2 ++ debian/copyright | 2 +- debian/plymouth-theme-lubuntu-logo.install | 2 +- debian/plymouth-theme-lubuntu-logo.postinst | 4 ++-- debian/plymouth-theme-lubuntu-logo.prerm | 2 +- debian/plymouth-theme-lubuntu-text.install | 2 +- debian/plymouth-theme-lubuntu-text.postinst | 4 ++-- debian/plymouth-theme-lubuntu-text.prerm | 2 +- .../themes/lubuntu-logo/lubuntu-logo.plymouth | 4 ++-- .../plymouth/themes/lubuntu-logo/lubuntu-logo.script | 0 .../themes/lubuntu-text/lubuntu-text.plymouth | 0 13 files changed, 25 insertions(+), 13 deletions(-) rename src/{lib => usr/share}/plymouth/themes/lubuntu-logo/lubuntu-logo.plymouth (51%) rename src/{lib => usr/share}/plymouth/themes/lubuntu-logo/lubuntu-logo.script (100%) rename src/{lib => usr/share}/plymouth/themes/lubuntu-text/lubuntu-text.plymouth (100%) diff --git a/Makefile b/Makefile index 878ba03..3b95bd0 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ all: install install: mkdir -pv $(DESTDIR) - cp -a src/usr src/lib $(DESTDIR)/. + cp -a src/usr $(DESTDIR)/. # po generation for i in $(SUBDIRS); do \ make -C $(DESTDIR)/$$i; \ diff --git a/debian/changelog b/debian/changelog index 802255e..2f6e427 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -lubuntu-artwork (0.57) UNRELEASED; urgency=medium +lubuntu-artwork (0.58) UNRELEASED; urgency=medium * src/usr/share/icons: - Update icons @@ -10,6 +10,16 @@ lubuntu-artwork (0.57) UNRELEASED; urgency=medium -- Julien Lavergne 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 Wed, 09 Dec 2015 08:35:36 +0100 + lubuntu-artwork (0.56) wily; urgency=medium * src/usr/share/icons: diff --git a/debian/control b/debian/control index 058594e..38283eb 100644 --- a/debian/control +++ b/debian/control @@ -180,6 +180,7 @@ Provides: plymouth-theme Replaces: lubuntu-plymouth-theme, plymouth (<< 0.8.1-1~) Conflicts: lubuntu-plymouth-theme +Breaks: plymouth (<< 0.9.2-3ubuntu1~), Description: plymouth theme for Lubuntu This package contain a specific Lubuntu theme for plymouth. @@ -192,6 +193,7 @@ Depends: plymouth, ${shlibs:Depends} Provides: plymouth-theme Replaces: plymouth (<< 0.8.1-1~) +Breaks: plymouth (<< 0.9.2-3ubuntu1~), Description: plymouth text theme for Lubuntu This package contain a specific Lubuntu theme for plymouth, which display a simple text. diff --git a/debian/copyright b/debian/copyright index c665816..100dbca 100644 --- a/debian/copyright +++ b/debian/copyright @@ -2,7 +2,7 @@ Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat Upstream-Name: Lubuntu Artwork Upstream-Maintainer: Lubuntu Team -Files: lib/ +Files: usr/share/plymouth/* Copyright: Copyright (C) 2009 Canonical Ltd. Copyright (C) 2010 Rafael Laguna License: GPL-2+ diff --git a/debian/plymouth-theme-lubuntu-logo.install b/debian/plymouth-theme-lubuntu-logo.install index ec9acd3..63a3c64 100644 --- a/debian/plymouth-theme-lubuntu-logo.install +++ b/debian/plymouth-theme-lubuntu-logo.install @@ -1 +1 @@ -lib/plymouth/themes/lubuntu-logo/ +usr/share/plymouth/themes/lubuntu-logo/ diff --git a/debian/plymouth-theme-lubuntu-logo.postinst b/debian/plymouth-theme-lubuntu-logo.postinst index dfc40c3..ca689fb 100644 --- a/debian/plymouth-theme-lubuntu-logo.postinst +++ b/debian/plymouth-theme-lubuntu-logo.postinst @@ -19,8 +19,8 @@ case "$1" in configure) update-alternatives \ - --install /lib/plymouth/themes/default.plymouth default.plymouth \ - /lib/plymouth/themes/lubuntu-logo/lubuntu-logo.plymouth 150 + --install /usr/share/plymouth/themes/default.plymouth default.plymouth \ + /usr/share/plymouth/themes/lubuntu-logo/lubuntu-logo.plymouth 150 if which update-initramfs >/dev/null 2>&1 then diff --git a/debian/plymouth-theme-lubuntu-logo.prerm b/debian/plymouth-theme-lubuntu-logo.prerm index 3c8a812..ddadb0b 100644 --- a/debian/plymouth-theme-lubuntu-logo.prerm +++ b/debian/plymouth-theme-lubuntu-logo.prerm @@ -30,7 +30,7 @@ case "$1" in remove) 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 then diff --git a/debian/plymouth-theme-lubuntu-text.install b/debian/plymouth-theme-lubuntu-text.install index 0b8e708..4a6a31d 100644 --- a/debian/plymouth-theme-lubuntu-text.install +++ b/debian/plymouth-theme-lubuntu-text.install @@ -1 +1 @@ -lib/plymouth/themes/lubuntu-text/ +usr/share/plymouth/themes/lubuntu-text/ diff --git a/debian/plymouth-theme-lubuntu-text.postinst b/debian/plymouth-theme-lubuntu-text.postinst index c62825d..3388e7c 100644 --- a/debian/plymouth-theme-lubuntu-text.postinst +++ b/debian/plymouth-theme-lubuntu-text.postinst @@ -19,8 +19,8 @@ case "$1" in configure) update-alternatives \ - --install /lib/plymouth/themes/text.plymouth text.plymouth \ - /lib/plymouth/themes/lubuntu-text/lubuntu-text.plymouth 150 + --install /usr/share/plymouth/themes/text.plymouth text.plymouth \ + /usr/share/plymouth/themes/lubuntu-text/lubuntu-text.plymouth 150 if which update-initramfs >/dev/null 2>&1 then diff --git a/debian/plymouth-theme-lubuntu-text.prerm b/debian/plymouth-theme-lubuntu-text.prerm index 3de304f..71a4683 100644 --- a/debian/plymouth-theme-lubuntu-text.prerm +++ b/debian/plymouth-theme-lubuntu-text.prerm @@ -30,7 +30,7 @@ case "$1" in remove) 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 then diff --git a/src/lib/plymouth/themes/lubuntu-logo/lubuntu-logo.plymouth b/src/usr/share/plymouth/themes/lubuntu-logo/lubuntu-logo.plymouth similarity index 51% rename from src/lib/plymouth/themes/lubuntu-logo/lubuntu-logo.plymouth rename to src/usr/share/plymouth/themes/lubuntu-logo/lubuntu-logo.plymouth index 8b6ea44..a6d2131 100644 --- a/src/lib/plymouth/themes/lubuntu-logo/lubuntu-logo.plymouth +++ b/src/usr/share/plymouth/themes/lubuntu-logo/lubuntu-logo.plymouth @@ -4,5 +4,5 @@ Description=A theme that features a blank background with a logo. ModuleName=script [script] -ImageDir=/lib/plymouth/themes/lubuntu-logo -ScriptFile=/lib/plymouth/themes/lubuntu-logo/lubuntu-logo.script +ImageDir=/usr/share/plymouth/themes/lubuntu-logo +ScriptFile=/usr/share/plymouth/themes/lubuntu-logo/lubuntu-logo.script diff --git a/src/lib/plymouth/themes/lubuntu-logo/lubuntu-logo.script b/src/usr/share/plymouth/themes/lubuntu-logo/lubuntu-logo.script similarity index 100% rename from src/lib/plymouth/themes/lubuntu-logo/lubuntu-logo.script rename to src/usr/share/plymouth/themes/lubuntu-logo/lubuntu-logo.script diff --git a/src/lib/plymouth/themes/lubuntu-text/lubuntu-text.plymouth b/src/usr/share/plymouth/themes/lubuntu-text/lubuntu-text.plymouth similarity index 100% rename from src/lib/plymouth/themes/lubuntu-text/lubuntu-text.plymouth rename to src/usr/share/plymouth/themes/lubuntu-text/lubuntu-text.plymouth