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

[joss at users.alioth.debian.org]

Author: joss
Date: Thu Mar 19 22:12:43 2009
New Revision: 19138

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=19138
Log:
Merge changes from unstable.

Added:
    desktop/experimental/gnome-session/debian/defaults.list
      - copied unchanged from r19137, desktop/unstable/gnome-session/debian/defaults.list
    desktop/experimental/gnome-session/debian/gnome-session.links
      - copied unchanged from r19137, desktop/unstable/gnome-session/debian/gnome-session.links
Modified:
    desktop/experimental/gnome-session/debian/55gnome-session_gnomerc
    desktop/experimental/gnome-session/debian/changelog
    desktop/experimental/gnome-session/debian/control
    desktop/experimental/gnome-session/debian/control.in
    desktop/experimental/gnome-session/debian/gnome-session.install

Modified: desktop/experimental/gnome-session/debian/55gnome-session_gnomerc
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-session/debian/55gnome-session_gnomerc?rev=19138&op=diff
==============================================================================
--- desktop/experimental/gnome-session/debian/55gnome-session_gnomerc (original)
+++ desktop/experimental/gnome-session/debian/55gnome-session_gnomerc Thu Mar 19 22:12:43 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/experimental/gnome-session/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-session/debian/changelog?rev=19138&op=diff
==============================================================================
--- desktop/experimental/gnome-session/debian/changelog (original)
+++ desktop/experimental/gnome-session/debian/changelog Thu Mar 19 22:12:43 2009
@@ -29,6 +29,19 @@
     a warning when missing.
 
  -- Josselin Mouette <joss at debian.org>  Sat, 27 Dec 2008 13:06:01 +0100
+
+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
 

Modified: desktop/experimental/gnome-session/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-session/debian/control?rev=19138&op=diff
==============================================================================
--- desktop/experimental/gnome-session/debian/control (original)
+++ desktop/experimental/gnome-session/debian/control Thu Mar 19 22:12:43 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,
                debhelper (>= 5.0.13),
@@ -36,7 +36,9 @@
 Recommends: gnome-panel,
             nautilus,
             metacity | compiz-gnome | sawfish
-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/experimental/gnome-session/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-session/debian/control.in?rev=19138&op=diff
==============================================================================
--- desktop/experimental/gnome-session/debian/control.in (original)
+++ desktop/experimental/gnome-session/debian/control.in Thu Mar 19 22:12:43 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,
                debhelper (>= 5.0.13),
@@ -36,7 +36,9 @@
 Recommends: gnome-panel,
             nautilus,
             metacity | compiz-gnome | sawfish
-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/experimental/gnome-session/debian/gnome-session.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-session/debian/gnome-session.install?rev=19138&op=diff
==============================================================================
--- desktop/experimental/gnome-session/debian/gnome-session.install (original)
+++ desktop/experimental/gnome-session/debian/gnome-session.install Thu Mar 19 22:12:43 2009
@@ -1,2 +1,3 @@
 debian/55gnome-session_gnomerc etc/X11/Xsession.d
 debian/gnome-debian-splash.png usr/share/pixmaps/splash
+debian/defaults.list etc/gnome