xubuntu-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 300
committer: Lionel Le Folgoc <mrpouit@xxxxxxxxxx>
branch nick: xubuntu-default-settings
timestamp: Sun 2011-06-19 18:43:15 +0200
message:
  * usr/share/xubuntu/session.sh: export the correct XDG_CONFIG_DIRS.
  * usr/share/xubuntu/applications/defaults.list: updated for the latest seed
    changes.
removed:
  usr/share/xubuntu/applications/xfprint-manager.desktop
  usr/share/xubuntu/applications/xfprint-settings.desktop
  usr/share/xubuntu/applications/xfprint.desktop
modified:
  debian/changelog
  usr/share/xubuntu/applications/defaults.list
  usr/share/xubuntu/session.sh


--
lp:xubuntu-default-settings
https://code.launchpad.net/~xubuntu-dev/xubuntu-default-settings/trunk

Your team Xubuntu Team is subscribed to branch lp:xubuntu-default-settings.
To unsubscribe from this branch go to https://code.launchpad.net/~xubuntu-dev/xubuntu-default-settings/trunk/+edit-subscription

=== modified file 'debian/changelog'
--- debian/changelog	2011-05-29 12:39:07 +0000
+++ debian/changelog	2011-06-19 16:43:15 +0000
@@ -1,7 +1,8 @@
 xubuntu-default-settings (11.10.0) UNRELEASED; urgency=low
 
-  * usr/share/xubuntu/applications/xfprint*desktop: added, to hide xfprint
-    from the menus (were previously in xfprint4, now the delta can be dropped).
+  * usr/share/xubuntu/session.sh: export the correct XDG_CONFIG_DIRS.
+  * usr/share/xubuntu/applications/defaults.list: updated for the latest seed
+    changes.
 
  -- Lionel Le Folgoc <mrpouit@xxxxxxxxxx>  Sun, 29 May 2011 14:37:16 +0200
 

=== modified file 'usr/share/xubuntu/applications/defaults.list'
--- usr/share/xubuntu/applications/defaults.list	2011-02-11 23:51:44 +0000
+++ usr/share/xubuntu/applications/defaults.list	2011-06-19 16:43:15 +0000
@@ -4,8 +4,8 @@
 application/msexcel=gnumeric.desktop
 application/msword=abiword.desktop
 application/ogg=parole.desktop
-application/pdf=evince.desktop
-application/postscript=evince.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
@@ -45,33 +45,33 @@
 application/x-123=gnumeric.desktop
 application/x-abiword=abiword.desktop
 application/x-applix-spreadsheet=gnumeric.desktop
-application/x-ar=file-roller.desktop
-application/x-arj=file-roller.desktop
-application/x-bzip-compressed-tar=file-roller.desktop
-application/x-bzip=file-roller.desktop
-application/x-cd-image=file-roller.desktop
-application/x-compressed-tar=file-roller.desktop
-application/x-compress=file-roller.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=ubuntu-software-center.desktop
 application/x-debian-package=ubuntu-software-center.desktop
 application/x-dos_ms_excel=gnumeric.desktop
-application/x-ear=file-roller.desktop
+application/x-ear=xarchiver.desktop
 application/x-excel=gnumeric.desktop
 application/x-extension-m4a=parole.desktop
 application/x-extension-mp4=parole.desktop
 application/x-flac=parole.desktop
 application/x-glade=glade-2.desktop
 application/x-gnumeric=gnumeric.desktop
-application/x-gtar=file-roller.desktop
-application/x-gzip=file-roller.desktop
-application/x-gzpostscript=evince.desktop
+application/x-gtar=xarchiver.desktop
+application/x-gzip=xarchiver.desktop
+application/x-gzpostscript=epdfview.desktop
 application/xhtml+xml=firefox.desktop
-application/x-jar=file-roller.desktop
-application/x-java-archive=file-roller.desktop
-application/x-lha=file-roller.desktop
-application/x-lhz=file-roller.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=file-roller.desktop
+application/x-lzop=xarchiver.desktop
 application/x-matroska=parole.desktop
 application/x-mps=gnumeric.desktop
 application/x-ms-excel=gnumeric.desktop
@@ -81,20 +81,20 @@
 application/x-perl=mousepad.desktop
 application/x-planperfect=gnumeric.desktop
 application/x-quattropro=gnumeric.desktop
-application/x-rar-compressed=file-roller.desktop
-application/x-rar=file-roller.desktop
-application/x-rpm=file-roller.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=parole.desktop
 application/x-sylk=gnumeric.desktop
-application/x-tar=file-roller.desktop
-application/x-war=file-roller.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=file-roller.desktop
-application/x-zip=file-roller.desktop
-application/x-zoo=file-roller.desktop
-application/zip=file-roller.desktop
+application/x-zip-compressed=xarchiver.desktop
+application/x-zip=xarchiver.desktop
+application/x-zoo=xarchiver.desktop
+application/zip=xarchiver.desktop
 audio/mpeg=exaile.desktop
 audio/mpegurl=exaile.desktop
 audio/vnd.rn-realaudio=parole.desktop
@@ -138,7 +138,7 @@
 image/x-xpixmap=ristretto.desktop
 inode/directory=Thunar.desktop
 misc/ultravox=parole.desktop
-multipart/x-zip=file-roller.desktop
+multipart/x-zip=xarchiver.desktop
 text/abiword=abiword.desktop
 text/comma-separated-values=gnumeric.desktop
 text/csv=gnumeric.desktop

=== removed file 'usr/share/xubuntu/applications/xfprint-manager.desktop'
--- usr/share/xubuntu/applications/xfprint-manager.desktop	2011-05-29 12:39:07 +0000
+++ usr/share/xubuntu/applications/xfprint-manager.desktop	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-[Desktop Entry]
-NoDisplay=true

=== removed file 'usr/share/xubuntu/applications/xfprint-settings.desktop'
--- usr/share/xubuntu/applications/xfprint-settings.desktop	2011-05-29 12:39:07 +0000
+++ usr/share/xubuntu/applications/xfprint-settings.desktop	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-[Desktop Entry]
-NoDisplay=true
-X-XfceSettingsManagerHidden=true

=== removed file 'usr/share/xubuntu/applications/xfprint.desktop'
--- usr/share/xubuntu/applications/xfprint.desktop	2011-05-29 12:39:07 +0000
+++ usr/share/xubuntu/applications/xfprint.desktop	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-[Desktop Entry]
-NoDisplay=true

=== modified file 'usr/share/xubuntu/session.sh'
--- usr/share/xubuntu/session.sh	2010-09-25 16:15:54 +0000
+++ usr/share/xubuntu/session.sh	2011-06-19 16:43:15 +0000
@@ -1,5 +1,11 @@
 #!/bin/sh
-# Copyright © 2010 Lionel Le Folgoc <mrpouit@xxxxxxxxxx>
+# Copyright © 2010-2011 Lionel Le Folgoc <mrpouit@xxxxxxxxxx>
+
+# Add the default XDG config dir, as it's not done automatically by lightdm yet
+if [ -z "$XDG_CONFIG_DIRS" ]; then
+  XDG_CONFIG_DIRS="/etc/xdg/xdg-xubuntu"
+fi
+export XDG_CONFIG_DIRS="/etc/xdg/xdg-xubuntu:$XDG_CONFIG_DIRS"
 
 # Readd /usr/local/share, as startxfce4 adds it only if $XDG_DATA_DIRS is empty
 if [ -z "$XDG_DATA_DIRS" ]; then