From f04dc7c872c018d61b27bd43d6608b4820d67ae3 Mon Sep 17 00:00:00 2001 From: Julien Lavergne Date: Sun, 28 Feb 2010 13:38:01 +0100 Subject: [PATCH 1/9] Add custom defaults.list for applications by default. --- debian/changelog | 1 + etc/xdg/lubuntu/applications/defaults.list | 177 +++++++++++++++++++++ 2 files changed, 178 insertions(+) create mode 100644 etc/xdg/lubuntu/applications/defaults.list diff --git a/debian/changelog b/debian/changelog index 3688e3e..c66425c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ lubuntu-default-settings (0.6) UNRELEASED; urgency=low * Set iconsize to 22 and panel height to 24 for panel settings. It displays correct icons size for panel icons. Thanks Leszek Lesner. + * Add custom defaults.list for applications by default. -- Julien Lavergne Fri, 19 Feb 2010 22:28:28 +0100 diff --git a/etc/xdg/lubuntu/applications/defaults.list b/etc/xdg/lubuntu/applications/defaults.list new file mode 100644 index 0000000..0b9bc8c --- /dev/null +++ b/etc/xdg/lubuntu/applications/defaults.list @@ -0,0 +1,177 @@ +[Default Applications] +application/csv=gnumeric.desktop +application/excel=gnumeric.desktop +application/msexcel=gnumeric.desktop +application/msword=abiword.desktop +application/ogg=aqualung.desktop +application/pdf=epdfview.desktop +application/postscript=epdfview.desktop +application/rtf=abiword.desktop +application/tab-separated-values=gnumeric.desktop +application/vnd.lotus-1-2-3=gnumeric.desktop +application/vnd.ms-excel=gnumeric.desktop +application/vnd.ms-word=abiword.desktop +application/vnd.rn-realmedia=gnome-mplayer.desktop +application/vnd.sun.xml.calc=gnumeric.desktop +application/vnd.sun.xml.calc.template=gnumeric.desktop +application/vnd.sun.xml.draw=ooo2-impress.desktop +application/vnd.sun.xml.draw.template=ooo2-impress.desktop +application/vnd.sun.xml.math=ooo2-math.desktop +application/vnd.sun.xml.writer=abiword.desktop +application/vnd.sun.xml.writer.template=abiword.desktop +application/vnd.sun.xml.writer.global=abiword.desktop +application/vnd.oasis.opendocument.formula=ooo2-math.desktop +application/vnd.oasis.opendocument.graphics=ooo2-draw.desktop +application/vnd.oasis.opendocument.graphics-template=ooo2-draw.desktop +application/vnd.oasis.opendocument.presentation=ooo2-impress.desktop +application/vnd.oasis.opendocument.presentation-template=ooo2-impress.desktop +application/vnd.oasis.opendocument.spreadsheet=gnumeric.desktop +application/vnd.oasis.opendocument.spreadsheet-template=gnumeric.desktop +application/vnd.oasis.opendocument.text=abiword.desktop +application/vnd.oasis.opendocument.text-template=abiword.desktop +application/vnd.oasis.opendocument.text-web=abiword.desktop +application/vnd.oasis.opendocument.text-master=abiword.desktop +application/vnd.sun.xml.impress=ooo2-impress.desktop +application/vnd.sun.xml.impress.template=ooo2-impress.desktop +application/vnd.stardivision.calc=gnumeric.desktop +application/vnd.stardivision.draw=ooo2-draw.desktop +application/vnd.stardivision.impress=ooo2-impress.desktop +application/vnd.stardivision.math=ooo2-math.desktop +application/vnd.stardivision.writer=abiword.desktop +application/mspowerpoint=ooo2-impress.desktop +application/vnd.ms-powerpoint=ooo2-impress.desktop +application/vnd.wordperfect=abiword.desktop +application/wordperfect=abiword.desktop +application/x-123=gnumeric.desktop +application/x-abiword=abiword.desktop +application/x-applix-spreadsheet=gnumeric.desktop +application/x-ar=xarchiver.desktop +application/x-arj=xarchiver.desktop +application/x-bzip-compressed-tar=xarchiver.desktop +application/x-bzip=xarchiver.desktop +application/x-cd-image=xarchiver.desktop +application/x-compressed-tar=xarchiver.desktop +application/x-compress=xarchiver.desktop +application/x-deb=gdebi.desktop +application/x-debian-package=gdebi.desktop +application/x-dos_ms_excel=gnumeric.desktop +application/x-ear=xarchiver.desktop +application/x-excel=gnumeric.desktop +application/x-extension-m4a=gnome-mplayer.desktop +application/x-extension-mp4=gnome-mplayer.desktop +application/x-flac=aqualung.desktop +application/x-glade=glade-2.desktop +application/x-gnumeric=gnumeric.desktop +application/x-gtar=xarchiver.desktop +application/x-gzip=xarchiver.desktop +application/x-gzpostscript=epdfview.desktop +application/xhtml+xml=chromium-browser.desktop +application/x-jar=xarchiver.desktop +application/x-java-archive=xarchiver.desktop +application/x-lha=xarchiver.desktop +application/x-lhz=xarchiver.desktop +application/xls=gnumeric.desktop +application/x-lzop=xarchiver.desktop +application/x-matroska=gnome-mplayer.desktop +application/x-mps=gnumeric.desktop +application/x-ms-excel=gnumeric.desktop +application/x-msexcel=gnumeric.desktop +application/x-ogg=aqualung.desktop +application/x-oleo=gnumeric.desktop +application/x-perl=leafpad.desktop +application/x-planperfect=gnumeric.desktop +application/x-quattropro=gnumeric.desktop +application/x-rar-compressed=xarchiver.desktop +application/x-rar=xarchiver.desktop +application/x-rpm=xarchiver.desktop +application/x-sc=gnumeric.desktop +application/x-shockwave-flash=gnome-mplayer.desktop +application/x-sylk=gnumeric.desktop +application/x-tar=xarchiver.desktop +application/x-war=xarchiver.desktop +application/x-xbase=gnumeric.desktop +application/x-xls=gnumeric.desktop +application/x-zip-compressed=xarchiver.desktop +application/x-zip=xarchiver.desktop +application/x-zoo=xarchiver.desktop +application/zip=xarchiver.desktop +audio/mpeg=aqualung.desktop +audio/mpegurl=aqualung.desktop +audio/vnd.rn-realaudio=aqualung.desktop +audio/x-flac=aqualung.desktop +audio/x-m4a=aqualung.desktop +audio/x-mp3=aqualung.desktop +audio/x-mpeg=aqualung.desktop +audio/x-mpegurl=aqualung.desktop +audio/x-ms-asf=aqualung.desktop +audio/x-ms-asx=aqualung.desktop +audio/x-ms-wax=aqualung.desktop +audio/x-pn-aiff=aqualung.desktop +audio/x-pn-au=aqualung.desktop +audio/x-pn-realaudio-plugin=aqualung.desktop +audio/x-pn-realaudio=aqualung.desktop +audio/x-pn-wav=aqualung.desktop +audio/x-pn-windows-acm=aqualung.desktop +audio/x-real-audio=aqualung.desktop +audio/x-scpls=aqualung.desktop +audio/x-wav=aqualung.desktop +image/bmp=gpicview.desktop +image/gif=gpicview.desktop +image/jpeg=gpicview.desktop +image/jpg=gpicview.desktop +image/pjpeg=gpicview.desktop +image/png=gpicview.desktop +image/svg+xml=gpicview.desktop +image/tiff=gpicview.desktop +image/vnd.rn-realpix=gnome-mplayer.desktop +image/x-bmp=gpicview.desktop +image/x-gray=gpicview.desktop +image/x-icb=gpicview.desktop +image/x-ico=gpicview.desktop +image/x-png=gpicview.desktop +image/x-portable-anymap=gpicview.desktop +image/x-portable-bitmap=gpicview.desktop +image/x-portable-graymap=gpicview.desktop +image/x-portable-pixmap=gpicview.desktop +image/x-psd=gpicview.desktop +image/x-xbitmap=gpicview.desktop +image/x-xpixmap=gpicview.desktop +inode/directory=pcmanfm.desktop +misc/ultravox=totem.desktop +multipart/x-zip=xarchiver.desktop +text/abiword=abiword.desktop +text/comma-separated-values=gnumeric.desktop +text/csv=gnumeric.desktop +text/html=chromium-browser.desktop +text/plain=leafpad.desktop +text/richtext=abiword.desktop +text/rtf=abiword.desktop +text/spreadsheet=gnumeric.desktop +text/tab-separated-values=gnumeric.desktop +text/x-comma-separated-values=gnumeric.desktop +text/x-chdr=leafpad.desktop +text/x-csrc=leafpad.desktop +text/x-dtd=leafpad.desktop +text/x-java=leafpad.desktop +text/mathml=leafpad.desktop +text/x-python=leafpad.desktop +text/x-sql=leafpad.desktop +text/xml=chromium-browser.desktop +video/dv=gnome-mplayer.desktop +video/mp4=gnome-mplayer.desktop +video/mpeg=gnome-mplayer.desktop +video/msvideo=gnome-mplayer.desktop +video/quicktime=gnome-mplayer.desktop +video/vnd.rn-realvideo=gnome-mplayer.desktop +video/ogv=gnome-mplayer.desktop +video/x-anim=gnome-mplayer.desktop +video/x-avi=gnome-mplayer.desktop +video/x-flc=gnome-mplayer.desktop +video/x-fli=gnome-mplayer.desktop +video/x-mpeg=gnome-mplayer.desktop +video/x-ms-asf=gnome-mplayer.desktop +video/x-msvideo=gnome-mplayer.desktop +video/x-ms-wmv=gnome-mplayer.desktop +video/x-nsv=gnome-mplayer.desktop +x-directory/normal=pcmanfm.desktop +zz-application/zz-winassoc-xls=gnumeric.desktop From b5a814ecc8d8f896e612a7ef52230bd935c47205 Mon Sep 17 00:00:00 2001 From: Julien Lavergne Date: Sun, 28 Feb 2010 13:39:24 +0100 Subject: [PATCH 2/9] * usr/bin/start* : From LXDE upstream, make sure dbus is launched when it's necessary. --- debian/changelog | 2 ++ usr/bin/startlubuntu | 5 +++++ usr/bin/startlubuntu-netbook | 5 +++++ 3 files changed, 12 insertions(+) diff --git a/debian/changelog b/debian/changelog index c66425c..a9af2fa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ lubuntu-default-settings (0.6) UNRELEASED; urgency=low * Set iconsize to 22 and panel height to 24 for panel settings. It displays correct icons size for panel icons. Thanks Leszek Lesner. + * usr/bin/start* : + - From LXDE upstream, make sure dbus is launched when it's necessary. * Add custom defaults.list for applications by default. -- Julien Lavergne Fri, 19 Feb 2010 22:28:28 +0100 diff --git a/usr/bin/startlubuntu b/usr/bin/startlubuntu index 98cae6c..0627bad 100644 --- a/usr/bin/startlubuntu +++ b/usr/bin/startlubuntu @@ -47,5 +47,10 @@ xprop -root -remove _NET_NUMBER_OF_DESKTOPS -remove _NET_DESKTOP_NAMES -remove _ # Enable GTK+2 integration for OpenOffice.org, if available. export SAL_USE_VCLPLUGIN=gtk +# Launch DBus if needed +if which dbus-launch >/dev/null && test -z "$DBUS_SESSION_BUS_ADDRESS"; then + eval "$(dbus-launch --sh-syntax --exit-with-session)" +fi + # Start the LXDE session exec /usr/bin/lxsession -s Lubuntu -e LXDE diff --git a/usr/bin/startlubuntu-netbook b/usr/bin/startlubuntu-netbook index 5d99b4b..2bbb1ed 100644 --- a/usr/bin/startlubuntu-netbook +++ b/usr/bin/startlubuntu-netbook @@ -47,5 +47,10 @@ xprop -root -remove _NET_NUMBER_OF_DESKTOPS -remove _NET_DESKTOP_NAMES -remove _ # Enable GTK+2 integration for OpenOffice.org, if available. export SAL_USE_VCLPLUGIN=gtk +# Launch DBus if needed +if which dbus-launch >/dev/null && test -z "$DBUS_SESSION_BUS_ADDRESS"; then + eval "$(dbus-launch --sh-syntax --exit-with-session)" +fi + # Start the LXDE session exec /usr/bin/lxsession -s Lubuntu-Netbook -e LXDE From 976dc355e2ac766e131d2f715e98acdca827a12c Mon Sep 17 00:00:00 2001 From: Julien Lavergne Date: Sun, 28 Feb 2010 13:41:35 +0100 Subject: [PATCH 3/9] Add polkit-gnome-authentification-agent-1 --- debian/changelog | 1 + etc/xdg/lxsession/Lubuntu-Netbook/autostart | 1 + etc/xdg/lxsession/Lubuntu/autostart | 1 + 3 files changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index a9af2fa..0567c81 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ lubuntu-default-settings (0.6) UNRELEASED; urgency=low correct icons size for panel icons. Thanks Leszek Lesner. * usr/bin/start* : - From LXDE upstream, make sure dbus is launched when it's necessary. + - Add polkit-gnome-authentification-agent-1 * Add custom defaults.list for applications by default. -- Julien Lavergne Fri, 19 Feb 2010 22:28:28 +0100 diff --git a/etc/xdg/lxsession/Lubuntu-Netbook/autostart b/etc/xdg/lxsession/Lubuntu-Netbook/autostart index 2a0bb0f..4fbce44 100644 --- a/etc/xdg/lxsession/Lubuntu-Netbook/autostart +++ b/etc/xdg/lxsession/Lubuntu-Netbook/autostart @@ -4,3 +4,4 @@ @xscreensaver -no-splash @gnome-power-manager @pcmanfm -d +@/usr/lib/policykit-1-gnome/polkit-gnome-authentication-agent-1 diff --git a/etc/xdg/lxsession/Lubuntu/autostart b/etc/xdg/lxsession/Lubuntu/autostart index 99c1d1b..7a997cd 100644 --- a/etc/xdg/lxsession/Lubuntu/autostart +++ b/etc/xdg/lxsession/Lubuntu/autostart @@ -3,3 +3,4 @@ @xscreensaver -no-splash @gnome-power-manager @pcmanfm -d +@/usr/lib/policykit-1-gnome/polkit-gnome-authentication-agent-1 From 389887db9d775404dbb0b943b2ae30b436668eae Mon Sep 17 00:00:00 2001 From: Julien Lavergne Date: Sun, 28 Feb 2010 13:42:13 +0100 Subject: [PATCH 4/9] dirs: Add /etc/lxdm, to be sure the directory exit (LP: #527482) --- debian/changelog | 1 + debian/dirs | 1 + 2 files changed, 2 insertions(+) create mode 100644 debian/dirs diff --git a/debian/changelog b/debian/changelog index 0567c81..39a73ed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ lubuntu-default-settings (0.6) UNRELEASED; urgency=low - From LXDE upstream, make sure dbus is launched when it's necessary. - Add polkit-gnome-authentification-agent-1 * Add custom defaults.list for applications by default. + * dirs: Add /etc/lxdm, to be sure the directory exit (LP: #527482) -- Julien Lavergne Fri, 19 Feb 2010 22:28:28 +0100 diff --git a/debian/dirs b/debian/dirs new file mode 100644 index 0000000..cc94349 --- /dev/null +++ b/debian/dirs @@ -0,0 +1 @@ +/etc/lxdm From e5e2224202fe3c54b26ddc5869eb951017d14aed Mon Sep 17 00:00:00 2001 From: Julien Lavergne Date: Sun, 28 Feb 2010 13:45:40 +0100 Subject: [PATCH 5/9] Verbose changelog entry --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 39a73ed..7b58cb4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,7 +4,7 @@ lubuntu-default-settings (0.6) UNRELEASED; urgency=low correct icons size for panel icons. Thanks Leszek Lesner. * usr/bin/start* : - From LXDE upstream, make sure dbus is launched when it's necessary. - - Add polkit-gnome-authentification-agent-1 + - Add polkit-gnome-authentification-agent-1 to make polkit working again. * Add custom defaults.list for applications by default. * dirs: Add /etc/lxdm, to be sure the directory exit (LP: #527482) From 8289d04d994bb01c341fe48ce4d0b50cfd993e9f Mon Sep 17 00:00:00 2001 From: Julien Lavergne Date: Sun, 28 Feb 2010 17:40:21 +0100 Subject: [PATCH 6/9] Format changelog --- debian/changelog | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7b58cb4..3725a99 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -lubuntu-default-settings (0.6) UNRELEASED; urgency=low +lubuntu-default-settings (0.6) lucid; urgency=low * Set iconsize to 22 and panel height to 24 for panel settings. It displays correct icons size for panel icons. Thanks Leszek Lesner. @@ -6,9 +6,9 @@ lubuntu-default-settings (0.6) UNRELEASED; urgency=low - From LXDE upstream, make sure dbus is launched when it's necessary. - Add polkit-gnome-authentification-agent-1 to make polkit working again. * Add custom defaults.list for applications by default. - * dirs: Add /etc/lxdm, to be sure the directory exit (LP: #527482) + * debian/dirs: Add /etc/lxdm, to be sure the directory exit (LP: #527482). - -- Julien Lavergne Fri, 19 Feb 2010 22:28:28 +0100 + -- Julien Lavergne Sun, 28 Feb 2010 17:38:45 +0100 lubuntu-default-settings (0.5) lucid; urgency=low From 618cd69b9946bab1e97320980086d9c65920f8ef Mon Sep 17 00:00:00 2001 From: Julien Lavergne Date: Sun, 28 Feb 2010 18:23:49 +0100 Subject: [PATCH 7/9] Fix detection of ogv videos --- etc/xdg/lubuntu/applications/defaults.list | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/xdg/lubuntu/applications/defaults.list b/etc/xdg/lubuntu/applications/defaults.list index 0b9bc8c..6c99ccd 100644 --- a/etc/xdg/lubuntu/applications/defaults.list +++ b/etc/xdg/lubuntu/applications/defaults.list @@ -163,7 +163,7 @@ video/mpeg=gnome-mplayer.desktop video/msvideo=gnome-mplayer.desktop video/quicktime=gnome-mplayer.desktop video/vnd.rn-realvideo=gnome-mplayer.desktop -video/ogv=gnome-mplayer.desktop +video/ogg=gnome-mplayer.desktop video/x-anim=gnome-mplayer.desktop video/x-avi=gnome-mplayer.desktop video/x-flc=gnome-mplayer.desktop From a2e71cdb9d77e27d630902025c41ab608b92de43 Mon Sep 17 00:00:00 2001 From: Julien Lavergne Date: Mon, 1 Mar 2010 00:35:34 +0100 Subject: [PATCH 8/9] releasing version 0.6 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 3725a99..87fea7f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,7 +8,7 @@ lubuntu-default-settings (0.6) lucid; urgency=low * Add custom defaults.list for applications by default. * debian/dirs: Add /etc/lxdm, to be sure the directory exit (LP: #527482). - -- Julien Lavergne Sun, 28 Feb 2010 17:38:45 +0100 + -- Julien Lavergne Mon, 01 Mar 2010 00:35:26 +0100 lubuntu-default-settings (0.5) lucid; urgency=low From ba130c99bc0e726220a1d1037c5886b9fc9e7469 Mon Sep 17 00:00:00 2001 From: Julien Lavergne Date: Mon, 1 Mar 2010 00:38:52 +0100 Subject: [PATCH 9/9] Post release version bump --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 87fea7f..083b840 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +lubuntu-default-settings (0.7) UNRELEASED; urgency=low + + * + + -- Julien Lavergne Mon, 01 Mar 2010 00:38:35 +0100 + lubuntu-default-settings (0.6) lucid; urgency=low * Set iconsize to 22 and panel height to 24 for panel settings. It displays