r32220 - in /desktop/unstable/gdm3/debian: changelog control control.in greeter.gconf-defaults rules
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Mon Dec 19 01:47:50 UTC 2011
Author: joss
Date: Mon Dec 19 01:47:49 2011
New Revision: 32220
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=32220
Log:
* greeter.gconf-defaults:
+ Drop the g-p-m setting.
+ Remove the associated PAM files.
+ Disable dh_makeshlibs.
* Break gnome-shell < 3.2 for correct shell support.
* Suggest gnome-shell.
* Require g-s-d and metacity, they are no longer optional.
Modified:
desktop/unstable/gdm3/debian/changelog
desktop/unstable/gdm3/debian/control
desktop/unstable/gdm3/debian/control.in
desktop/unstable/gdm3/debian/greeter.gconf-defaults
desktop/unstable/gdm3/debian/rules
Modified: desktop/unstable/gdm3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/changelog?rev=32220&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/changelog [utf-8] (original)
+++ desktop/unstable/gdm3/debian/changelog [utf-8] Mon Dec 19 01:47:49 2011
@@ -28,6 +28,8 @@
* 93_xdg_data_dirs.patch: dropped, similar functionality merged
upstream.
* Drop the dconf-gsettings-backend dependency.
+ * greeter.gconf-defaults:
+ + Drop the g-p-m setting.
* greeter.gsettings:
+ Force gdm-fallback as the default session.
+ Document how to use gdm-shell.
@@ -41,10 +43,15 @@
packages start using this library.)
+ Explicitly disable split authentication, it will not work properly
with the Debianized PAM stack.
+ + Remove the associated PAM files.
+ + Disable dh_makeshlibs.
* gdm3.install:
+ Stop installing MIME files by hand.
* 93_private_lib.patch: new patch. Install the shared library in a
private directory.
+ * Break gnome-shell < 3.2 for correct shell support.
+ * Suggest gnome-shell.
+ * Require g-s-d and metacity, they are no longer optional.
-- Josselin Mouette <joss at debian.org> Thu, 24 Nov 2011 22:29:47 +0100
Modified: desktop/unstable/gdm3/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/control?rev=32220&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/control [utf-8] (original)
+++ desktop/unstable/gdm3/debian/control [utf-8] Mon Dec 19 01:47:49 2011
@@ -56,7 +56,9 @@
adduser,
libpam-modules (>= 0.72-1),
libpam-runtime (>= 0.76-13.1),
- gnome-session-bin (>= 3.0),
+ gnome-session-bin (>= 3.2),
+ gnome-settings-daemon (>= 3.2),
+ metacity,
policykit-1-gnome,
upower,
gnome-session | x-session-manager | x-window-manager | x-terminal-emulator,
@@ -72,21 +74,20 @@
x11-xkb-utils,
xserver-xorg,
at-spi,
- gnome-power-manager (>= 2.28),
- gnome-settings-daemon,
gnome-icon-theme,
desktop-base (>= 6)
Suggests: libpam-gnome-keyring,
- metacity,
gnome-mag,
gnome-orca,
- gok
+ gok,
+ gnome-shell
Provides: x-display-manager
Conflicts: gdm
Breaks: gnome-panel (<< 3.0),
gnome-screensaver (<< 2.17.7),
gnome-orca (<< 2.30.0-2),
- gnome-control-center (<< 3.0)
+ gnome-control-center (<< 3.0),
+ gnome-shell (<< 3.2)
Description: Next generation GNOME Display Manager
GDM provides the equivalent of a "login:" prompt for X displays: it
asks for a login and starts X sessions.
Modified: desktop/unstable/gdm3/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/control.in?rev=32220&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/control.in [utf-8] (original)
+++ desktop/unstable/gdm3/debian/control.in [utf-8] Mon Dec 19 01:47:49 2011
@@ -51,7 +51,9 @@
adduser,
libpam-modules (>= 0.72-1),
libpam-runtime (>= 0.76-13.1),
- gnome-session-bin (>= 3.0),
+ gnome-session-bin (>= 3.2),
+ gnome-settings-daemon (>= 3.2),
+ metacity,
policykit-1-gnome,
upower,
gnome-session | x-session-manager | x-window-manager | x-terminal-emulator,
@@ -67,21 +69,20 @@
x11-xkb-utils,
xserver-xorg,
at-spi,
- gnome-power-manager (>= 2.28),
- gnome-settings-daemon,
gnome-icon-theme,
desktop-base (>= 6)
Suggests: libpam-gnome-keyring,
- metacity,
gnome-mag,
gnome-orca,
- gok
+ gok,
+ gnome-shell
Provides: x-display-manager
Conflicts: gdm
Breaks: gnome-panel (<< 3.0),
gnome-screensaver (<< 2.17.7),
gnome-orca (<< 2.30.0-2),
- gnome-control-center (<< 3.0)
+ gnome-control-center (<< 3.0),
+ gnome-shell (<< 3.2)
Description: Next generation GNOME Display Manager
GDM provides the equivalent of a "login:" prompt for X displays: it
asks for a login and starts X sessions.
Modified: desktop/unstable/gdm3/debian/greeter.gconf-defaults
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/greeter.gconf-defaults?rev=32220&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/greeter.gconf-defaults [utf-8] (original)
+++ desktop/unstable/gdm3/debian/greeter.gconf-defaults [utf-8] Mon Dec 19 01:47:49 2011
@@ -17,6 +17,3 @@
# The lower panel doesn't work with the compositor
/apps/metacity/general/compositing_manager false
-
-# Prevent the power management icon from showing up
-/apps/gnome-power-manager/ui/icon_policy never
Modified: desktop/unstable/gdm3/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/rules?rev=32220&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/rules [utf-8] (original)
+++ desktop/unstable/gdm3/debian/rules [utf-8] Mon Dec 19 01:47:49 2011
@@ -46,11 +46,13 @@
DEB_DH_INSTALLINIT_ARGS := --noscripts
+DEB_DH_MAKESHLIBS_ARGS_gdm3 := --no-act
binary-install/gdm3::
mv debian/gdm3/usr/sbin/gdm-binary debian/gdm3/usr/sbin/gdm3
cd debian/gdm3/usr/sbin && rm -f gdm-restart gdm-stop gdm-safe-restart
chmod 755 debian/gdm3/etc/gdm3/Xsession
+ rm -f debian/gdm3/etc/pam.d/gdm-*
dh_installpam -pgdm3 --name=gdm3-autologin
rm -rf debian/gdm3/var/lib/gdm3/.[cgl]*
rm -rf debian/gdm3/var/run
More information about the pkg-gnome-commits
mailing list