r20199 - /desktop/unstable/gnome-session/debian/

joss at users.alioth.debian.org joss at users.alioth.debian.org
Sun May 31 17:02:19 UTC 2009


Author: joss
Date: Sun May 31 17:02:19 2009
New Revision: 20199

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=20199
Log:
* Split the package between gnome-session-bin, which contains the 
  minimal runtime needed to actually run the gnome-session binary, and 
  gnome-session, which contains all the startup scripts and has much 
  larger dependencies, including the components which are required by 
  default. This prepares us for GDM 2.26.
* Update the list of copyright holders.

Added:
    desktop/unstable/gnome-session/debian/gnome-session-bin.gconf-defaults
      - copied unchanged from r20197, desktop/unstable/gnome-session/debian/gconf-defaults
    desktop/unstable/gnome-session/debian/gnome-session-bin.install
    desktop/unstable/gnome-session/debian/gnome-session.dirs
      - copied unchanged from r20155, desktop/unstable/gnome-session/debian/dirs
    desktop/unstable/gnome-session/debian/gnome-session.postinst
      - copied unchanged from r20155, desktop/unstable/gnome-session/debian/postinst
    desktop/unstable/gnome-session/debian/gnome-session.prerm
      - copied unchanged from r20155, desktop/unstable/gnome-session/debian/prerm
Removed:
    desktop/unstable/gnome-session/debian/dirs
    desktop/unstable/gnome-session/debian/gconf-defaults
    desktop/unstable/gnome-session/debian/postinst
    desktop/unstable/gnome-session/debian/prerm
Modified:
    desktop/unstable/gnome-session/debian/changelog
    desktop/unstable/gnome-session/debian/control
    desktop/unstable/gnome-session/debian/control.in
    desktop/unstable/gnome-session/debian/copyright
    desktop/unstable/gnome-session/debian/gnome-session.install
    desktop/unstable/gnome-session/debian/rules

Modified: desktop/unstable/gnome-session/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/changelog?rev=20199&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/changelog (original)
+++ desktop/unstable/gnome-session/debian/changelog Sun May 31 17:02:19 2009
@@ -1,4 +1,4 @@
-gnome-session (2.26.1-5) UNRELEASED; urgency=low
+gnome-session (2.26.1-5) unstable; urgency=low
 
   * 01_gnome-wm.patch:
     + Actually install gnome-wm.desktop, it’s pretty useless otherwise.
@@ -11,8 +11,14 @@
   * README.Debian: document how programs are started and how to 
     configure the different kinds of startups.
   * 90_relibtoolize.patch: updated.
-
- -- Josselin Mouette <joss at debian.org>  Sun, 31 May 2009 16:27:06 +0200
+  * Split the package between gnome-session-bin, which contains the 
+    minimal runtime needed to actually run the gnome-session binary, and 
+    gnome-session, which contains all the startup scripts and has much 
+    larger dependencies, including the components which are required by 
+    default. This prepares us for GDM 2.26.
+  * Update the list of copyright holders.
+
+ -- Josselin Mouette <joss at debian.org>  Sun, 31 May 2009 18:18:06 +0200
 
 gnome-session (2.26.1-4) unstable; urgency=low
 

Modified: desktop/unstable/gnome-session/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/control?rev=20199&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/control (original)
+++ desktop/unstable/gnome-session/debian/control Sun May 31 17:02:19 2009
@@ -29,15 +29,13 @@
                xsltproc
 
 Package: gnome-session
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
+Architecture: all
+Depends: ${misc:Depends},
          gnome-settings-daemon (>= 2.26),
-         dbus-x11,
-         policykit-gnome (>= 0.7)
-Recommends: gnome-panel,
-            nautilus,
-            metacity | compiz-gnome | sawfish
+         gnome-panel,
+         metacity | compiz-gnome | sawfish,
+         gnome-session-bin (>= ${gnome:Version}),
+         gnome-session-bin (<< ${gnome:NextVersion})
 Replaces: libgnomevfs2-common (<< 1:2.24.0-3)
 Conflicts: bug-buddy (<< 2.20),
            libgnomevfs2-common (<< 1:2.24.0-3)
@@ -53,3 +51,16 @@
  with GNOME extensions. When you log out, the session manager will save the
  state of all your GNOME apps. When you log back in, the session manager
  will restore your session.
+
+Package: gnome-session-bin
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         dbus-x11,
+         policykit-gnome (>= 0.7)
+Conflicts: gnome-session (<< 2.26.1-5)
+Description: The GNOME Session Manager - Minimal runtime
+ This package contains the binaries for the GNOME Session Manager, but 
+ no startup scripts. It is meant for those willing to start 
+ gnome-session by hand with the components of their choice, and for 
+ applications such as GDM that use gnome-session internally.

Modified: desktop/unstable/gnome-session/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/control.in?rev=20199&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/control.in (original)
+++ desktop/unstable/gnome-session/debian/control.in Sun May 31 17:02:19 2009
@@ -29,15 +29,13 @@
                xsltproc
 
 Package: gnome-session
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
+Architecture: all
+Depends: ${misc:Depends},
          gnome-settings-daemon (>= 2.26),
-         dbus-x11,
-         policykit-gnome (>= 0.7)
-Recommends: gnome-panel,
-            nautilus,
-            metacity | compiz-gnome | sawfish
+         gnome-panel,
+         metacity | compiz-gnome | sawfish,
+         gnome-session-bin (>= ${gnome:Version}),
+         gnome-session-bin (<< ${gnome:NextVersion})
 Replaces: libgnomevfs2-common (<< 1:2.24.0-3)
 Conflicts: bug-buddy (<< 2.20),
            libgnomevfs2-common (<< 1:2.24.0-3)
@@ -53,3 +51,16 @@
  with GNOME extensions. When you log out, the session manager will save the
  state of all your GNOME apps. When you log back in, the session manager
  will restore your session.
+
+Package: gnome-session-bin
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         dbus-x11,
+         policykit-gnome (>= 0.7)
+Conflicts: gnome-session (<< 2.26.1-5)
+Description: The GNOME Session Manager - Minimal runtime
+ This package contains the binaries for the GNOME Session Manager, but 
+ no startup scripts. It is meant for those willing to start 
+ gnome-session by hand with the components of their choice, and for 
+ applications such as GDM that use gnome-session internally.

Modified: desktop/unstable/gnome-session/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/copyright?rev=20199&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/copyright (original)
+++ desktop/unstable/gnome-session/debian/copyright Sun May 31 17:02:19 2009
@@ -5,7 +5,7 @@
 
 It was downloaded from <http://ftp.gnome.org/pub/GNOME/sources/gnome-session/>.
 
-Upstream Authors and Copyright Holders:
+Upstream Authors:
 
     Dan Winship <danw at gnome.org>
     Lucas Rocha <lucasr at gnome.org>
@@ -14,6 +14,22 @@
     Tom Tromey <tromey at cygnus.com>
     Felix Bellaby <felix at pooh.u-net.com>
     Ralph Mor, X Consortium
+
+Copyright:
+
+    Copyright © 1999-2009  Red Hat, Inc.
+    Copyright © 1999-2007  Novell, Inc.
+    Copyright © 2001-2003  George Lebl
+    Copyright © 2001       Queen of England
+    Copyright © 2007-2008  William Jon McCann
+    Copyright © 2006       Ray Strode
+    Copyright © 2008       Lucas Rocha
+    Copyright © 2005       Raffaele Sandrini
+    Copyright © 2006-2007  Vincent Untz
+    Copyright © 1998       Tom Tromey
+    Copyright © 1999       Free Software Foundation, Inc.
+    Copyright © 2003       Sun Microsystems, Inc.
+    
 
 License:
 

Added: desktop/unstable/gnome-session/debian/gnome-session-bin.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/gnome-session-bin.install?rev=20199&op=file
==============================================================================
--- desktop/unstable/gnome-session/debian/gnome-session-bin.install (added)
+++ desktop/unstable/gnome-session/debian/gnome-session-bin.install Sun May 31 17:02:19 2009
@@ -1,0 +1,5 @@
+debian/tmp/etc/gconf
+debian/tmp/usr/bin/gnome-session*
+debian/tmp/usr/lib/gnome-session
+debian/tmp/usr/share/gnome-session
+debian/tmp/usr/share/man/man1/gnome-session*

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=20199&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/gnome-session.install (original)
+++ desktop/unstable/gnome-session/debian/gnome-session.install Sun May 31 17:02:19 2009
@@ -1,3 +1,13 @@
+debian/tmp/etc/xdg/autostart usr/share/gnome
+debian/tmp/usr/bin/gnome-wm
+debian/tmp/usr/share/applications
+debian/tmp/usr/share/doc
+debian/tmp/usr/share/gnome/autostart
+debian/tmp/usr/share/icons
+debian/tmp/usr/share/locale
+debian/tmp/usr/share/man/man1/gnome-wm*
+debian/tmp/usr/share/pixmaps
+debian/tmp/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

Modified: desktop/unstable/gnome-session/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/rules?rev=20199&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/rules (original)
+++ desktop/unstable/gnome-session/debian/rules Sun May 31 17:02:19 2009
@@ -24,7 +24,3 @@
 
 clean::
 	rm -vf $(SPLASH)
-
-binary-install/gnome-session::
-	mv debian/gnome-session/etc/xdg/autostart/* debian/gnome-session/usr/share/gnome/autostart/
-	rm -rf debian/gnome-session/etc/xdg




More information about the pkg-gnome-commits mailing list