Accpeting a patch from Jonathan Carter, thanks!
This commit is contained in:
4
Makefile
4
Makefile
@@ -12,10 +12,6 @@ all:
|
||||
clean:
|
||||
|
||||
install:
|
||||
# splashy themes
|
||||
mkdir -p $(DESTDIR)/usr/share/splashy/themes/spacefun
|
||||
$(INSTALL) $(wildcard splashy/spacefun/*) $(DESTDIR)/usr/share/splashy/themes/spacefun
|
||||
|
||||
# background files
|
||||
mkdir -p $(DESTDIR)/usr/share/images/desktop-base
|
||||
$(INSTALL) $(BACKGROUNDS) $(DESTDIR)/usr/share/images/desktop-base
|
||||
|
||||
6
debian/changelog
vendored
6
debian/changelog
vendored
@@ -1,5 +1,6 @@
|
||||
desktop-base (7.0.0~exp1) UNRELEASED; urgency=low
|
||||
|
||||
[ Paul Tagliamonte ]
|
||||
* Adding myself as a maintainer
|
||||
* We've got a new theme -- `joy' by Adrien Aubourg. Thanks, Adrien!
|
||||
- Theme added to backgrounds.
|
||||
@@ -11,7 +12,10 @@ desktop-base (7.0.0~exp1) UNRELEASED; urgency=low
|
||||
* Pre-Dependency added for dpkg (>= 1.15.7.2~), since we use dpkg helpers
|
||||
in our preinst.
|
||||
|
||||
-- Paul Tagliamonte <paultag@ubuntu.com> Wed, 20 Jun 2012 20:41:04 -0400
|
||||
[ Jonathan Carter ]
|
||||
* Remove splashy theme since it's no longer available in archives
|
||||
|
||||
-- Jonathan Carter <jonathan@ubuntu.com> Thu, 21 Jun 2012 20:54:20 -0400
|
||||
|
||||
desktop-base (6.0.7) unstable; urgency=low
|
||||
|
||||
|
||||
5
debian/postinst
vendored
5
debian/postinst
vendored
@@ -86,11 +86,6 @@ if [ "$1" = "configure" -o "$1" = "abort-upgrade" ]; then
|
||||
update-grub2 || true
|
||||
fi
|
||||
|
||||
# Splashy
|
||||
if [ -x /sbin/splashy_config ] && [ -w /etc/splashy/config.xml ]; then
|
||||
splashy_config --set-theme spacefun
|
||||
fi
|
||||
|
||||
# Plymouth
|
||||
#if [ -x /usr/sbin/plymouth-set-default-theme ];
|
||||
#then
|
||||
|
||||
36
debian/preinst
vendored
36
debian/preinst
vendored
@@ -34,42 +34,6 @@ same_conffile() {
|
||||
|
||||
case "$1" in
|
||||
install|upgrade)
|
||||
if dpkg --compare-versions "$2" lt "5.0.2"; then
|
||||
# if the folder is a symlink (installed by splashy), modified files
|
||||
# need to be copied (from /usr/share/splashy/themes) before beeing
|
||||
# replaced. If it's not, they need to be moved (from
|
||||
# /etc/splashy/themes)
|
||||
# not modified files need to be removed if no symlink, and not
|
||||
# touched in case of a symlink
|
||||
THEME_FOLDER="/etc/splashy/themes/moreblue-orbit"
|
||||
THEME_FOLDER_BAK="/etc/splashy.dpkg-old/themes/moreblue-orbit"
|
||||
FILES="background-bw.png background-color.png VeraSans.ttf theme.xml"
|
||||
|
||||
if [ -h /etc/splashy/themes ]; then
|
||||
# symlink
|
||||
for FILE in ${FILES}; do
|
||||
[ -f ${THEME_FOLDER}/${FILE} ] || break
|
||||
if ! same_conffile "${THEME_FOLDER}/${FILE}"; then
|
||||
# symlink and changed file, copy it in a safe place
|
||||
[ -d $THEME_FOLDER_BAK ] || mkdir -p $THEME_FOLDER_BAK
|
||||
cp ${THEME_FOLDER}/${FILE} ${THEME_FOLDER_BAK}/
|
||||
fi
|
||||
done
|
||||
else
|
||||
# real folder
|
||||
for FILE in ${FILES}; do
|
||||
[ -f ${THEME_FOLDER}/${FILE} ] || break
|
||||
if ! same_conffile "${THEME_FOLDER}/${FILE}"; then
|
||||
# real folder and changed file, move it in a safe place
|
||||
[ -d $THEME_FOLDER_BAK ] || mkdir -p $THEME_FOLDER_BAK
|
||||
mv ${THEME_FOLDER}/${FILE} ${THEME_FOLDER_BAK}/
|
||||
else
|
||||
# real folder but unchanged file, just remove it
|
||||
rm ${THEME_FOLDER}/${FILE}
|
||||
fi
|
||||
done
|
||||
fi
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
||||
|
||||
Reference in New Issue
Block a user