Transition from Openbox Desktop to Icebox.

9 files changed, 46 insertions, 14 deletions

diff --git a/debian/control b/debian/control
index 540ecf1..26d7758 100644
--- a/debian/control
+++ b/debian/control
@@ -1,15 +1,26 @@
-Source: openbox-desktop-settings
+Source: icebox-default-settings
 Section: x11
 Priority: optional
 Maintainer: Unit 193 <unit193@ubuntu.com>
 Build-Depends: debhelper (>= 9), intltool
 Standards-Version: 3.9.6
 
-Package: openbox-desktop-settings
+Package: icebox-default-settings
 Architecture: all
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, numix-gtk-theme, fonts-droid,
 Enhances: lightdm-gtk-greeter
-Description: default settings for the Openbox desktop
- This package contains some default settings for
- an openbox desktop system
+Breaks: openbox-desktop-settings (<< 15.10.0~)
+Replaces: openbox-desktop-settings (<< 15.10.0~)
+Description: default settings for the Icebox desktop
+ This package contains the default settings used by Icebox,
+ a desktop using the Openbox window manager.
+
+Package: openbox-desktop-settings
+Section: oldlibs
+Priority: extra
+Architecture: all
+Depends: ${misc:Depends}, icebox-default-settings
+Description: transitional dummy package for icebox-default-settings
+ This is a transitional package to ease upgrades to icebox-default-settings.
+ It can be safely removed.
diff --git a/debian/copyright b/debian/copyright
index 3704e9b..c8a58ca 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,5 +1,5 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: openbox-desktop-settings
+Upstream-Name: icebox-default-settings
 
 Files: *
 Copyright: 2013-2015, Unit 193 <unit193@ubuntu.com>
diff --git a/debian/openbox-desktop-settings.gsettings-override b/debian/icebox-default-settings.gsettings-override
index 545e520..4fce569 100644
--- a/debian/openbox-desktop-settings.gsettings-override
+++ b/debian/icebox-default-settings.gsettings-override
@@ -3,4 +3,4 @@ gtk-theme='Numix'
 icon-theme='elementary-xfce-dark'
 
 [org.gnome.desktop.background]
-picture-uri='file:///usr/share/backgrounds/openbox-desktop.jpg'
+picture-uri='file:///usr/share/backgrounds/icebox.jpg'
diff --git a/debian/openbox-desktop-settings.install b/debian/icebox-default-settings.install
index 7c0337f..7c0337f 100644
--- a/debian/openbox-desktop-settings.install
+++ b/debian/icebox-default-settings.install
diff --git a/debian/icebox-default-settings.maintscript b/debian/icebox-default-settings.maintscript
new file mode 100644
index 0000000..9601fee
--- /dev/null
+++ b/debian/icebox-default-settings.maintscript
@@ -0,0 +1,19 @@
+rm_conffile /etc/lightdm/lightdm.conf.d/10-openbox.conf 14.10.0~
+rm_conffile /etc/skel/.gtkrc-2.0 15.04.1~
+rm_conffile /etc/skel/.config/gtk-3.0/settings.ini 15.04.1~
+mv_conffile /etc/skel/.config/nitrogen/bg-saved.cfg /etc/xdg/xdg-openbox/nitrogen/bg-saved.cfg 15.04.1~
+mv_conffile /etc/skel/.config/nitrogen/nitrogen.cfg /etc/xdg/xdg-openbox/nitrogen/nitrogen.cfg 15.04.1~
+
+mv_conffile /etc/xdg/xdg-openbox/autostart/tint2.desktop /etc/xdg/xdg-icebox/autostart/tint2.desktop 15.10.0~
+mv_conffile /etc/xdg/xdg-openbox/autostart/xsettingsd.desktop /etc/xdg/xdg-icebox/autostart/xsettingsd.desktop 15.10.0~
+mv_conffile /etc/xdg/xdg-openbox/autostart/volumeicon.desktop /etc/xdg/xdg-icebox/autostart/volumeicon.desktop 15.10.0~
+mv_conffile /etc/xdg/xdg-openbox/autostart/nitrogen.desktop /etc/xdg/xdg-icebox/autostart/nitrogen.desktop 15.10.0~
+mv_conffile /etc/xdg/xdg-openbox/lightdm/lightdm-gtk-greeter.conf /etc/xdg/xdg-icebox/lightdm/lightdm-gtk-greeter.conf 15.10.0~
+mv_conffile /etc/xdg/xdg-openbox/openbox/menu.xml /etc/xdg/xdg-icebox/openbox/menu.xml 15.10.0~
+mv_conffile /etc/xdg/xdg-openbox/openbox/rc.xml /etc/xdg/xdg-icebox/openbox/rc.xml 15.10.0~
+mv_conffile /etc/xdg/xdg-openbox/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml /etc/xdg/xdg-icebox/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml 15.10.0~
+mv_conffile /etc/xdg/xdg-openbox/xsettingsd/xsettingsd.conf /etc/xdg/xdg-icebox/xsettingsd/xsettingsd.conf 15.10.0~
+mv_conffile /etc/xdg/xdg-openbox/tint2/tint2rc /etc/xdg/xdg-icebox/tint2/tint2rc 15.10.0~
+mv_conffile /etc/xdg/xdg-openbox/nitrogen/bg-saved.cfg /etc/xdg/xdg-icebox/nitrogen/bg-saved.cfg 15.10.0~
+mv_conffile /etc/xdg/xdg-openbox/nitrogen/nitrogen.cfg /etc/xdg/xdg-icebox/nitrogen/nitrogen.cfg 15.10.0~
+mv_conffile /etc/xdg/xdg-openbox/gsimplecal/config /etc/xdg/xdg-icebox/gsimplecal/config 15.10.0~
diff --git a/debian/openbox-desktop-settings.postinst b/debian/icebox-default-settings.postinst
index 562e7b7..546fbcf 100644
--- a/debian/openbox-desktop-settings.postinst
+++ b/debian/icebox-default-settings.postinst
@@ -5,7 +5,7 @@ set -e
 if [ "$1" = "configure" ] ; then
   update-alternatives --install /etc/lightdm/lightdm-gtk-greeter.conf \
     lightdm-gtk-greeter-config-derivative \
-    /etc/xdg/xdg-openbox/lightdm/lightdm-gtk-greeter.conf 30
+    /etc/xdg/xdg-icebox/lightdm/lightdm-gtk-greeter.conf 30
 fi
 
 #DEBHELPER#
diff --git a/debian/openbox-desktop-settings.prerm b/debian/icebox-default-settings.prerm
index 68e548c..c413e56 100644
--- a/debian/openbox-desktop-settings.prerm
+++ b/debian/icebox-default-settings.prerm
@@ -4,7 +4,7 @@ set -e
 
 if [ "$1" = "remove" ] ; then
   update-alternatives --remove lightdm-gtk-greeter-config-derivative \
-    /etc/xdg/xdg-openbox/lightdm/lightdm-gtk-greeter.conf
+    /etc/xdg/xdg-icebox/lightdm/lightdm-gtk-greeter.conf
 fi
 
 #DEBHELPER#
diff --git a/debian/openbox-desktop-settings.maintscript b/debian/openbox-desktop-settings.maintscript
deleted file mode 100644
index 5777493..0000000
--- a/debian/openbox-desktop-settings.maintscript
+++ /dev/null
@@ -1,5 +0,0 @@
-rm_conffile /etc/lightdm/lightdm.conf.d/10-openbox.conf 14.10.0~
-rm_conffile /etc/skel/.gtkrc-2.0 15.04.1~
-rm_conffile /etc/skel/.config/gtk-3.0/settings.ini 15.04.1~
-mv_conffile /etc/skel/.config/nitrogen/bg-saved.cfg /etc/xdg/xdg-openbox/nitrogen/bg-saved.cfg 15.04.1~
-mv_conffile /etc/skel/.config/nitrogen/nitrogen.cfg /etc/xdg/xdg-openbox/nitrogen/nitrogen.cfg 15.04.1~
diff --git a/debian/openbox-desktop-settings.preinst b/debian/openbox-desktop-settings.preinst
new file mode 100644
index 0000000..3913ed3
--- /dev/null
+++ b/debian/openbox-desktop-settings.preinst
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+if dpkg --compare-versions "$2" lt-nl "15.10.0~"; then
+  update-alternatives --remove lightdm-gtk-greeter-config-derivative \
+    /etc/xdg/xdg-openbox/lightdm/lightdm-gtk-greeter.conf
+
+#DEBHELPER#