r35286 - in /desktop/unstable/gdm3/debian: README.Debian TODO changelog control.in gdm3.init gdm3.install gdm3.links gdm3.postinst greeter.gconf-defaults greeter.gsettings rules
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Sat Jun 9 13:49:02 UTC 2012
Author: joss
Date: Sat Jun 9 13:49:01 2012
New Revision: 35286
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35286
Log:
* New upstream release.
* Move login manager defaults from gconf to gsettings.
* Add the metacity default to gsettings too.
* Require a metacity version which supports gsettings.
* Get rid of anything related to GConf.
Removed:
desktop/unstable/gdm3/debian/gdm3.links
desktop/unstable/gdm3/debian/greeter.gconf-defaults
Modified:
desktop/unstable/gdm3/debian/README.Debian
desktop/unstable/gdm3/debian/TODO
desktop/unstable/gdm3/debian/changelog
desktop/unstable/gdm3/debian/control.in
desktop/unstable/gdm3/debian/gdm3.init
desktop/unstable/gdm3/debian/gdm3.install
desktop/unstable/gdm3/debian/gdm3.postinst
desktop/unstable/gdm3/debian/greeter.gsettings
desktop/unstable/gdm3/debian/rules
Modified: desktop/unstable/gdm3/debian/README.Debian
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/README.Debian?rev=35286&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/README.Debian [utf-8] (original)
+++ desktop/unstable/gdm3/debian/README.Debian [utf-8] Sat Jun 9 13:49:01 2012
@@ -14,9 +14,8 @@
The greeter - which is the interface that welcomes you on the
computer - uses a minimal GNOME session to startup. Its settings are set
-through GSettings and GConf, but using a specific configuration.
- * You can force the GConf settings in /etc/gdm3/greeter.gconf-defaults.
- * You can force the GSettings ones in /etc/gdm3/greeter.gsettings.
+through GSettings, but using a specific configuration.
+ * You can force the GSettings settings in /etc/gdm3/greeter.gsettings.
* After changing any of the settings, you need to run “invoke-rc.d gdm3
reload” to take them into account.
Modified: desktop/unstable/gdm3/debian/TODO
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/TODO?rev=35286&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/TODO [utf-8] (original)
+++ desktop/unstable/gdm3/debian/TODO [utf-8] Sat Jun 9 13:49:01 2012
@@ -3,4 +3,3 @@
* Restore 11_xephyr_nested.patch
+ Don’t forget to add back the necessary code in
20_endsession_respawn.patch and 19_configure_xserver.patch
- * Get rid of gconf (provided the greeter does)
Modified: desktop/unstable/gdm3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/changelog?rev=35286&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/changelog [utf-8] (original)
+++ desktop/unstable/gdm3/debian/changelog [utf-8] Sat Jun 9 13:49:01 2012
@@ -1,4 +1,4 @@
-gdm3 (3.2.1.1-1) UNRELEASED; urgency=low
+gdm3 (3.4.1-1) UNRELEASED; urgency=low
[ Jordi Mallach ]
* Update po-up/ca.po.
@@ -70,6 +70,13 @@
[ Laurent Bigonville ]
* debian/gdm3.pam, debian/gdm3-autologin.pam: Call pam_selinux pam module
(Closes: #661289)
+
+ [ Josselin Mouette ]
+ * New upstream release.
+ * Move login manager defaults from gconf to gsettings.
+ * Add the metacity default to gsettings too.
+ * Require a metacity version which supports gsettings.
+ * Get rid of anything related to GConf.
-- Laurent Bigonville <bigon at debian.org> Fri, 23 Mar 2012 11:36:02 +0100
Modified: desktop/unstable/gdm3/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/control.in?rev=35286&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/control.in [utf-8] (original)
+++ desktop/unstable/gdm3/debian/control.in [utf-8] Sat Jun 9 13:49:01 2012
@@ -13,7 +13,6 @@
libglib2.0-dev (>= 2.29.3),
libgtk-3-dev (>= 2.91.1),
libpango1.0-dev (>= 1.3.0),
- libgconf2-dev (>= 2.31.3),
libxklavier-dev (>= 4.0),
libcanberra-gtk3-dev (>= 0.4),
libfontconfig1-dev (>= 2.5.0),
@@ -53,13 +52,12 @@
libpam-runtime (>= 0.76-13.1),
gnome-session-bin (>= 3.2),
gnome-settings-daemon (>= 3.2),
- metacity,
+ metacity (>= 1:2.34.2),
policykit-1-gnome,
upower,
gnome-session | x-session-manager | x-window-manager | x-terminal-emulator,
lsb-base (>= 3.2-14),
librsvg2-common,
- gconf2 (>= 2.26.2-3),
accountsservice (>= 0.6.12),
gsettings-desktop-schemas,
libglib2.0-bin (>= 2.26),
Modified: desktop/unstable/gdm3/debian/gdm3.init
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/gdm3.init?rev=35286&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/gdm3.init [utf-8] (original)
+++ desktop/unstable/gdm3/debian/gdm3.init [utf-8] Sat Jun 9 13:49:01 2012
@@ -32,19 +32,7 @@
DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager
gen_config() {
- # GConf part is generated with update-gconf-defaults
- if [ -d /var/lib/gdm3/.gconf.mandatory ]; then
- update-gconf-defaults \
- --source=/usr/share/gdm/greeter-config \
- --destination=/var/lib/gdm3/.gconf.mandatory \
- --no-signal \
- --only-if-changed
- fi
- if [ -f /var/lib/gdm3/.gconf.mandatory/%gconf-tree.xml ]; then
- chown Debian-gdm:Debian-gdm /var/lib/gdm3/.gconf.mandatory/%gconf-tree.xml
- fi
-
- # GSettings part uses dconf update to generate a gdm profile
+ # GSettings configuration uses dconf update to generate a gdm profile
if [ -d /var/lib/gdm3 ]; then
needed=no
if [ -f /var/lib/gdm3/dconf/db/gdm ]; then
@@ -107,8 +95,6 @@
gen_config
start-stop-daemon --stop --signal USR1 --quiet --pidfile \
/var/run/gdm3.pid --name gdm3
- start-stop-daemon --stop --signal HUP --quiet --name gconfd-2 \
- --user Debian-gdm --oknodo
start-stop-daemon --stop --signal HUP --quiet --name dconf-service \
--user Debian-gdm --oknodo
set -e
Modified: desktop/unstable/gdm3/debian/gdm3.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/gdm3.install?rev=35286&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/gdm3.install [utf-8] (original)
+++ desktop/unstable/gdm3/debian/gdm3.install [utf-8] Sat Jun 9 13:49:01 2012
@@ -1,6 +1,4 @@
debian/Xsession etc/gdm3
-debian/greeter.gconf-defaults etc/gdm3
debian/greeter.gsettings etc/gdm3
debian/default.desktop usr/share/gdm/BuiltInSessions
-data/session-setup.entries usr/share/gdm/greeter-config
debian/insserv.conf.d etc
Modified: desktop/unstable/gdm3/debian/gdm3.postinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/gdm3.postinst?rev=35286&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/gdm3.postinst [utf-8] (original)
+++ desktop/unstable/gdm3/debian/gdm3.postinst [utf-8] Sat Jun 9 13:49:01 2012
@@ -50,17 +50,15 @@
rm -f /var/lib/gdm3/gschemas.compiled
fi
-mkdir -p /var/lib/gdm3/.gconf.mandatory
-cat > /var/lib/gdm3/.gconf.path << "EOF"
-# System-wide settings set in /usr/share/gdm/greeter-config
-# and auto-generated by the init script
-xml:readonly:$(HOME)/.gconf.mandatory
-EOF
-chmod 0750 /var/lib/gdm3
-update-gconf-defaults \
- --source=/usr/share/gdm/greeter-config \
- --destination=/var/lib/gdm3/.gconf.mandatory \
- --no-signal
+if [ "$1" = configure ] && dpkg --compare-versions "$2" lt-nl "3.4" \
+ && [ -d /var/lib/gdm3 ]; then
+ # Remove anything GConf related
+ (
+ cd /var/lib/gdm3
+ rm -rf .gconf .gconf.mandatory .gconf.path .gconfd
+ )
+fi
+
chown -R Debian-gdm:Debian-gdm /var/lib/gdm3
#DEBHELPER#
Modified: desktop/unstable/gdm3/debian/greeter.gsettings
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/greeter.gsettings?rev=35286&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/greeter.gsettings [utf-8] (original)
+++ desktop/unstable/gdm3/debian/greeter.gsettings [utf-8] Sat Jun 9 13:49:01 2012
@@ -4,24 +4,40 @@
# Theming options
+# ===============
# - Change the GTK+ theme
-#[org.gnome.desktop.interface]
-#gtk-theme='Adwaita'
+# [org.gnome.desktop.interface]
+# gtk-theme='Adwaita'
# - Use another background
-#[org.gnome.desktop.background]
-#picture-uri='file:///usr/share/themes/Adwaita/backgrounds/stripes.jpg'
-#picture-options='zoom'
+# [org.gnome.desktop.background]
+# picture-uri='file:///usr/share/themes/Adwaita/backgrounds/stripes.jpg'
+# picture-options='zoom'
# - Or no background at all
-#[org.gnome.desktop.background]
-#picture-options='none'
-#primary-color='#000000'
+# [org.gnome.desktop.background]
+# picture-options='none'
+# primary-color='#000000'
# Greeter session choice
+# ======================
# Use 'gdm-shell' for the GNOME Shell version.
# Never use anything not starting with 'gdm-'.
[org.gnome.desktop.session]
session-name='gdm-fallback'
-#session-name='gdm-shell'
+# session-name='gdm-shell'
+
+# Login manager options
+# =====================
+[org.gnome.login-screen]
+logo=debian-swirl
+fallback-logo=debian-swirl
+
+# - Disable user list
+# disable-user-list=true
+# - Disable restart buttons
+# disable-restart-buttons=true
+# - Show a login welcome message
+# banner-message-enable=true
+# banner-message-text='Welcome'
# Prevent the power management icon from showing up
[org.gnome.power-manager]
@@ -30,3 +46,8 @@
# Disabling sound in the greeter
#[org.gnome.desktop.sound]
#event-sounds=false
+
+# The metacity compositor doesn’t go well with the greeter
+# so just to be sure
+[org.gnome.metacity]
+compositing-manager=false
Modified: desktop/unstable/gdm3/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/rules?rev=35286&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/rules [utf-8] (original)
+++ desktop/unstable/gdm3/debian/rules [utf-8] Sat Jun 9 13:49:01 2012
@@ -68,8 +68,6 @@
rm -f debian/gdm3/usr/share/gdm/autostart/LoginWindow/gnome-session-check-accelerated.desktop
cd debian/gdm3/usr/lib/gdm && \
rm -f lib*.a lib*.la lib*.so
- cd debian/gdm3/usr/share/gdm/greeter-config && \
- mv session-setup.entries 10_upstream.entries
INFILES := $(wildcard debian/*.desktop.in)
OUTFILES := $(INFILES:.desktop.in=.desktop)
More information about the pkg-gnome-commits
mailing list