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

@@ -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; \

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 <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
 
   * src/usr/share/icons:

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.

debian/copyright

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

debian/plymouth-theme-lubuntu-logo.install

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

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

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

debian/plymouth-theme-lubuntu-text.install

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

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

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

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