r19131 - in /desktop/unstable/gnome-session/debian: 55gnome-session_gnomerc changelog control control.in defaults.list gnome-session.install gnome-session.links

joss at users.alioth.debian.org joss at users.alioth.debian.org
Thu Mar 19 21:27:22 UTC 2009 

Author: joss
Date: Thu Mar 19 21:27:22 2009
New Revision: 19131

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=19131
Log:
* 55gnome-session_gnomerc: change XDG_DATA_DIRS to include 
  /usr/share/gnome when gnome-session is being launched.
* defaults.list: move the defaults from gnome-vfs.
  + Add some subtypes of text/plain to gedit defaults.
* gnome-session.install: install it in /etc/gnome.
* gnome-session.links: link it from /usr/share/gnome/applications.
* Standards version is 3.8.1.
* Conflict and replace with the older libgnomevfs2-common versions.

Added:
    desktop/unstable/gnome-session/debian/defaults.list   (contents, props changed)
      - copied, changed from r18894, desktop/unstable/gnome-vfs/debian/defaults.list
    desktop/unstable/gnome-session/debian/gnome-session.links
Modified:
    desktop/unstable/gnome-session/debian/55gnome-session_gnomerc
    desktop/unstable/gnome-session/debian/changelog
    desktop/unstable/gnome-session/debian/control
    desktop/unstable/gnome-session/debian/control.in
    desktop/unstable/gnome-session/debian/gnome-session.install

Modified: desktop/unstable/gnome-session/debian/55gnome-session_gnomerc
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/55gnome-session_gnomerc?rev=19131&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/55gnome-session_gnomerc (original)
+++ desktop/unstable/gnome-session/debian/55gnome-session_gnomerc Thu Mar 19 21:27:22 2009
@@ -9,4 +9,12 @@
   if [ -r "$GNOMERC" ]; then
     . "$GNOMERC"
   fi
+  # We prepend /usr/share/gnome since it actually points to /etc so
+  # it is configurable.
+  if [ -z "$XDG_DATA_DIRS" ]; then
+    XDG_DATA_DIRS=/usr/share/gnome:/usr/local/share/:/usr/share/
+  else
+    XDG_DATA_DIRS=/usr/share/gnome:"$XDG_DATA_DIRS"
+  fi
+  export XDG_DATA_DIRS
 fi

Modified: desktop/unstable/gnome-session/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/changelog?rev=19131&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/changelog (original)
+++ desktop/unstable/gnome-session/debian/changelog Thu Mar 19 21:27:22 2009
@@ -1,3 +1,16 @@
+gnome-session (2.22.3-3) unstable; urgency=low
+
+  * 55gnome-session_gnomerc: change XDG_DATA_DIRS to include 
+    /usr/share/gnome when gnome-session is being launched.
+  * defaults.list: move the defaults from gnome-vfs.
+    + Add some subtypes of text/plain to gedit defaults.
+  * gnome-session.install: install it in /etc/gnome.
+  * gnome-session.links: link it from /usr/share/gnome/applications.
+  * Standards version is 3.8.1.
+  * Conflict and replace with the older libgnomevfs2-common versions.
+
+ -- Josselin Mouette <joss at debian.org>  Thu, 19 Mar 2009 22:25:42 +0100
+
 gnome-session (2.22.3-2) unstable; urgency=low
 
   * Recommend dbus-x11 instead of dbus for the availability of 

Modified: desktop/unstable/gnome-session/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/control?rev=19131&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/control (original)
+++ desktop/unstable/gnome-session/debian/control Thu Mar 19 21:27:22 2009
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Josselin Mouette <joss at debian.org>
 Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Sebastian Dröge <slomo at debian.org>
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
 Build-Depends: cdbs (>= 0.4.41),
                quilt,
                liborbit2-dev (>= 2.10.2-1.1),
@@ -43,7 +43,9 @@
             nautilus,
             metacity | sawfish,
             dbus-x11
-Conflicts: bug-buddy (<< 2.20)
+Replaces: libgnomevfs2-common (<< 1:2.24.0-3)
+Conflicts: bug-buddy (<< 2.20),
+           libgnomevfs2-common (<< 1:2.24.0-3)
 Provides: x-session-manager
 Suggests: gnome-user-guide | gnome2-user-guide,
           desktop-base

Modified: desktop/unstable/gnome-session/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/control.in?rev=19131&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/control.in (original)
+++ desktop/unstable/gnome-session/debian/control.in Thu Mar 19 21:27:22 2009
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Josselin Mouette <joss at debian.org>
 Uploaders: @GNOME_TEAM@
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
 Build-Depends: cdbs (>= 0.4.41),
                quilt,
                liborbit2-dev (>= 2.10.2-1.1),
@@ -43,7 +43,9 @@
             nautilus,
             metacity | sawfish,
             dbus-x11
-Conflicts: bug-buddy (<< 2.20)
+Replaces: libgnomevfs2-common (<< 1:2.24.0-3)
+Conflicts: bug-buddy (<< 2.20),
+           libgnomevfs2-common (<< 1:2.24.0-3)
 Provides: x-session-manager
 Suggests: gnome-user-guide | gnome2-user-guide,
           desktop-base

Copied: desktop/unstable/gnome-session/debian/defaults.list (from r18894, desktop/unstable/gnome-vfs/debian/defaults.list)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/defaults.list?rev=19131&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs/debian/defaults.list (original)
+++ desktop/unstable/gnome-session/debian/defaults.list Thu Mar 19 21:27:22 2009
@@ -85,6 +85,19 @@
 application/zip=file-roller.desktop
 multipart/x-zip=file-roller.desktop
 text/plain=gedit.desktop
+text/css=gedit.desktop
+text/html=gedit.desktop
+text/mathml=gedit.desktop
+text/x-csrc=gedit.desktop
+text/x-chdr=gedit.desktop
+text/x-python=gedit.destkop
+text/x-sql=gedit.desktop
+application/javascript=gedit.destkop
+application/x-perl=gedit.desktop
+application/x-php=gedit.desktop
+application/xhtml+xml=gedit.desktop
+application/xml=gedit.desktop
+application/xml-dtd=gedit.desktop
 application/x-font-ttf=gnome-font-viewer.desktop
 application/x-font-pcf=gnome-font-viewer.desktop
 application/x-font-type1=gnome-font-viewer.desktop

Propchange: desktop/unstable/gnome-session/debian/defaults.list
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: desktop/unstable/gnome-session/debian/gnome-session.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/gnome-session.install?rev=19131&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/gnome-session.install (original)
+++ desktop/unstable/gnome-session/debian/gnome-session.install Thu Mar 19 21:27:22 2009
@@ -3,3 +3,4 @@
 debian/gnome.desktop usr/share/xsessions
 debian/55gnome-session_gnomerc etc/X11/Xsession.d
 debian/gnome-debian-splash.png usr/share/pixmaps/splash
+debian/defaults.list etc/gnome

Added: desktop/unstable/gnome-session/debian/gnome-session.links
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/gnome-session.links?rev=19131&op=file
==============================================================================
--- desktop/unstable/gnome-session/debian/gnome-session.links (added)
+++ desktop/unstable/gnome-session/debian/gnome-session.links Thu Mar 19 21:27:22 2009
@@ -1,0 +1,1 @@
+etc/gnome/defaults.list usr/share/gnome/applications/defaults.list

More information about the pkg-gnome-commits mailing list