summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatarUnit 193 <unit193@ubuntu.com>2015-05-14 17:01:01 -0400
committerLibravatarUnit 193 <unit193@ubuntu.com>2015-05-14 17:01:01 -0400
commitacbb1067d92e9dab2db57d5aaa5861fbf0b1beae (patch)
treeae383507b8106784328fea72b5cf314ee7e1ced2
parent3f33d458be0bf0ef1c6f9a3001106f9d6ff30e5b (diff)
downloadicebox-default-settings-acbb1067d92e9dab2db57d5aaa5861fbf0b1beae.tar.bz2
icebox-default-settings-acbb1067d92e9dab2db57d5aaa5861fbf0b1beae.tar.xz
icebox-default-settings-acbb1067d92e9dab2db57d5aaa5861fbf0b1beae.tar.zst
Transition from Openbox Desktop to Icebox.
-rw-r--r--debian/control21
-rw-r--r--debian/copyright2
-rw-r--r--debian/icebox-default-settings.gsettings-override (renamed from debian/openbox-desktop-settings.gsettings-override)2
-rw-r--r--debian/icebox-default-settings.install (renamed from debian/openbox-desktop-settings.install)0
-rw-r--r--debian/icebox-default-settings.maintscript19
-rw-r--r--debian/icebox-default-settings.postinst (renamed from debian/openbox-desktop-settings.postinst)2
-rw-r--r--debian/icebox-default-settings.prerm (renamed from debian/openbox-desktop-settings.prerm)2
-rw-r--r--debian/openbox-desktop-settings.maintscript5
-rw-r--r--debian/openbox-desktop-settings.preinst7
-rw-r--r--etc/xdg/xdg-icebox/autostart/nitrogen.desktop (renamed from etc/xdg/xdg-openbox/autostart/nitrogen.desktop)0
-rw-r--r--etc/xdg/xdg-icebox/autostart/tint2.desktop (renamed from etc/xdg/xdg-openbox/autostart/tint2.desktop)0
-rw-r--r--etc/xdg/xdg-icebox/autostart/volumeicon.desktop (renamed from etc/xdg/xdg-openbox/autostart/volumeicon.desktop)0
-rw-r--r--etc/xdg/xdg-icebox/autostart/xsettingsd.desktop (renamed from etc/xdg/xdg-openbox/autostart/xsettingsd.desktop)0
-rw-r--r--etc/xdg/xdg-icebox/gsimplecal/config (renamed from etc/xdg/xdg-openbox/gsimplecal/config)0
-rw-r--r--etc/xdg/xdg-icebox/lightdm/lightdm-gtk-greeter.conf (renamed from etc/xdg/xdg-openbox/lightdm/lightdm-gtk-greeter.conf)2
-rw-r--r--etc/xdg/xdg-icebox/nitrogen/bg-saved.cfg4
-rw-r--r--etc/xdg/xdg-icebox/nitrogen/nitrogen.cfg (renamed from etc/xdg/xdg-openbox/nitrogen/nitrogen.cfg)0
-rw-r--r--etc/xdg/xdg-icebox/openbox/menu.xml (renamed from etc/xdg/xdg-openbox/openbox/menu.xml)0
-rw-r--r--etc/xdg/xdg-icebox/openbox/rc.xml (renamed from etc/xdg/xdg-openbox/openbox/rc.xml)0
-rw-r--r--etc/xdg/xdg-icebox/tint2/tint2rc (renamed from etc/xdg/xdg-openbox/tint2/tint2rc)0
-rw-r--r--etc/xdg/xdg-icebox/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml (renamed from etc/xdg/xdg-openbox/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml)0
-rw-r--r--etc/xdg/xdg-icebox/xsettingsd/xsettingsd.conf (renamed from etc/xdg/xdg-openbox/xsettingsd/xsettingsd.conf)0
-rw-r--r--etc/xdg/xdg-openbox/nitrogen/bg-saved.cfg4
-rw-r--r--usr/share/lightdm/lightdm.conf.d/60-icebox.conf2
-rw-r--r--usr/share/lightdm/lightdm.conf.d/60-openbox.conf2
-rw-r--r--usr/share/xsessions/icebox.desktop7
26 files changed, 60 insertions, 21 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#
diff --git a/etc/xdg/xdg-openbox/autostart/nitrogen.desktop b/etc/xdg/xdg-icebox/autostart/nitrogen.desktop
index 18df46f..18df46f 100644
--- a/etc/xdg/xdg-openbox/autostart/nitrogen.desktop
+++ b/etc/xdg/xdg-icebox/autostart/nitrogen.desktop
diff --git a/etc/xdg/xdg-openbox/autostart/tint2.desktop b/etc/xdg/xdg-icebox/autostart/tint2.desktop
index 9b9a986..9b9a986 100644
--- a/etc/xdg/xdg-openbox/autostart/tint2.desktop
+++ b/etc/xdg/xdg-icebox/autostart/tint2.desktop
diff --git a/etc/xdg/xdg-openbox/autostart/volumeicon.desktop b/etc/xdg/xdg-icebox/autostart/volumeicon.desktop
index d3a4b53..d3a4b53 100644
--- a/etc/xdg/xdg-openbox/autostart/volumeicon.desktop
+++ b/etc/xdg/xdg-icebox/autostart/volumeicon.desktop
diff --git a/etc/xdg/xdg-openbox/autostart/xsettingsd.desktop b/etc/xdg/xdg-icebox/autostart/xsettingsd.desktop
index d44fd8c..d44fd8c 100644
--- a/etc/xdg/xdg-openbox/autostart/xsettingsd.desktop
+++ b/etc/xdg/xdg-icebox/autostart/xsettingsd.desktop
diff --git a/etc/xdg/xdg-openbox/gsimplecal/config b/etc/xdg/xdg-icebox/gsimplecal/config
index db628e8..db628e8 100644
--- a/etc/xdg/xdg-openbox/gsimplecal/config
+++ b/etc/xdg/xdg-icebox/gsimplecal/config
diff --git a/etc/xdg/xdg-openbox/lightdm/lightdm-gtk-greeter.conf b/etc/xdg/xdg-icebox/lightdm/lightdm-gtk-greeter.conf
index 12b1442..f7c88ee 100644
--- a/etc/xdg/xdg-openbox/lightdm/lightdm-gtk-greeter.conf
+++ b/etc/xdg/xdg-icebox/lightdm/lightdm-gtk-greeter.conf
@@ -27,7 +27,7 @@
# laptop = true|false, false by default. Marks monitor as laptop display.
#
[greeter]
-background=/usr/share/backgrounds/openbox-desktop.jpg
+background=/usr/share/backgrounds/icebox.jpg
theme-name=Numix
icon-theme-name=elementary-xfce-dark
font-name=Droid Sans 10
diff --git a/etc/xdg/xdg-icebox/nitrogen/bg-saved.cfg b/etc/xdg/xdg-icebox/nitrogen/bg-saved.cfg
new file mode 100644
index 0000000..8350f8a
--- /dev/null
+++ b/etc/xdg/xdg-icebox/nitrogen/bg-saved.cfg
@@ -0,0 +1,4 @@
+[:0.0]
+file=/usr/share/backgrounds/icebox.jpg
+mode=5
+bgcolor=#000000
diff --git a/etc/xdg/xdg-openbox/nitrogen/nitrogen.cfg b/etc/xdg/xdg-icebox/nitrogen/nitrogen.cfg
index 862056d..862056d 100644
--- a/etc/xdg/xdg-openbox/nitrogen/nitrogen.cfg
+++ b/etc/xdg/xdg-icebox/nitrogen/nitrogen.cfg
diff --git a/etc/xdg/xdg-openbox/openbox/menu.xml b/etc/xdg/xdg-icebox/openbox/menu.xml
index 3d039c4..3d039c4 100644
--- a/etc/xdg/xdg-openbox/openbox/menu.xml
+++ b/etc/xdg/xdg-icebox/openbox/menu.xml
diff --git a/etc/xdg/xdg-openbox/openbox/rc.xml b/etc/xdg/xdg-icebox/openbox/rc.xml
index 5dae227..5dae227 100644
--- a/etc/xdg/xdg-openbox/openbox/rc.xml
+++ b/etc/xdg/xdg-icebox/openbox/rc.xml
diff --git a/etc/xdg/xdg-openbox/tint2/tint2rc b/etc/xdg/xdg-icebox/tint2/tint2rc
index b82560b..b82560b 100644
--- a/etc/xdg/xdg-openbox/tint2/tint2rc
+++ b/etc/xdg/xdg-icebox/tint2/tint2rc
diff --git a/etc/xdg/xdg-openbox/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml b/etc/xdg/xdg-icebox/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml
index b0b58d8..b0b58d8 100644
--- a/etc/xdg/xdg-openbox/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml
+++ b/etc/xdg/xdg-icebox/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml
diff --git a/etc/xdg/xdg-openbox/xsettingsd/xsettingsd.conf b/etc/xdg/xdg-icebox/xsettingsd/xsettingsd.conf
index ebec515..ebec515 100644
--- a/etc/xdg/xdg-openbox/xsettingsd/xsettingsd.conf
+++ b/etc/xdg/xdg-icebox/xsettingsd/xsettingsd.conf
diff --git a/etc/xdg/xdg-openbox/nitrogen/bg-saved.cfg b/etc/xdg/xdg-openbox/nitrogen/bg-saved.cfg
deleted file mode 100644
index 4e81be1..0000000
--- a/etc/xdg/xdg-openbox/nitrogen/bg-saved.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-[:0.0]
-file=/usr/share/backgrounds/openbox-desktop.jpg
-mode=5
-bgcolor=#000000
diff --git a/usr/share/lightdm/lightdm.conf.d/60-icebox.conf b/usr/share/lightdm/lightdm.conf.d/60-icebox.conf
new file mode 100644
index 0000000..e2c7a5b
--- /dev/null
+++ b/usr/share/lightdm/lightdm.conf.d/60-icebox.conf
@@ -0,0 +1,2 @@
+[SeatDefaults]
+user-session=icebox
diff --git a/usr/share/lightdm/lightdm.conf.d/60-openbox.conf b/usr/share/lightdm/lightdm.conf.d/60-openbox.conf
deleted file mode 100644
index a0e380d..0000000
--- a/usr/share/lightdm/lightdm.conf.d/60-openbox.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[SeatDefaults]
-user-session=openbox
diff --git a/usr/share/xsessions/icebox.desktop b/usr/share/xsessions/icebox.desktop
new file mode 100644
index 0000000..fa28c99
--- /dev/null
+++ b/usr/share/xsessions/icebox.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=Icebox
+Comment=This session logs you into Icebox
+Exec=openbox-session
+TryExec=openbox-session
+Icon=
+Type=Application