Import patches-unapplied version 2.308 to ubuntu/wily-proposed

Imported using git-ubuntu import.

Changelog parent: 123b33de50658a03ee97dbe50f26f4922e4ec44b

New changelog entries:
  * Copy desktop-next hooks in the configuration
This commit is contained in:
Sebastien Bacher 2015-06-05 15:06:07 +02:00 committed by usd-importer
parent 123b33de50
commit 81c1d20b74
2 changed files with 7 additions and 1 deletions

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
livecd-rootfs (2.308) wily; urgency=medium
* Copy desktop-next hooks in the configuration
-- Sebastien Bacher <seb128@ubuntu.com> Fri, 05 Jun 2015 15:06:07 +0200
livecd-rootfs (2.307) wily; urgency=medium
* Remove duplicated code leftover in the previous desktop-next changeset

View File

@ -665,7 +665,7 @@ EOF
fi
;;
ubuntu-touch:*|ubuntu-core:system-image|ubuntu-cpc:*)
ubuntu-touch:*|ubuntu-core:system-image|ubuntu-desktop-next:system-image|ubuntu-cpc:*)
cp -af /usr/share/livecd-rootfs/live-build/${PROJECT}/* \
config/
;;