r40100 - in /desktop/experimental/gdm3/debian: changelog control control.in rules
bigon at users.alioth.debian.org
bigon at users.alioth.debian.org
Thu Oct 24 23:20:07 UTC 2013
Author: bigon
Date: Thu Oct 24 23:20:06 2013
New Revision: 40100
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=40100
Log:
Merge recent changes in unstable branch
Modified:
desktop/experimental/gdm3/debian/changelog
desktop/experimental/gdm3/debian/control
desktop/experimental/gdm3/debian/control.in
desktop/experimental/gdm3/debian/rules
Modified: desktop/experimental/gdm3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/changelog?rev=40100&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/changelog [utf-8] (original)
+++ desktop/experimental/gdm3/debian/changelog [utf-8] Thu Oct 24 23:20:06 2013
@@ -2,7 +2,11 @@
[ Michael Biebl ]
* Drop Depends on policykit-1-gnome, with the gdm-fallback session gone,
- this dependency is no longer required.
+ this dependency is no longer required. Also remove
+ polkit-gnome-authentication-agent-1.desktop along with it.
+ * Use a versioned Depends on gnome-shell (>= 3.6) rather then an unversioned
+ Depends + a versioned Breaks. There is no real reason to do the latter and
+ it seems to confuse APT and break upgrades.
[ Sjoerd Simons ]
* New upstream release (3.10.0.1)
@@ -10,7 +14,13 @@
gnome-shell 3.10 unlocking fails with consolekit...
* debian/patches/*: Refreshed
- -- Sjoerd Simons <sjoerd at debian.org> Wed, 23 Oct 2013 22:04:24 +0200
+ [ Laurent Bigonville ]
+ * debian/rules: Also drop gdm-simple-greeter.desktop, simple-greeter is
+ definitely gone
+ * debian/rules: Cleanup the list of obsolete files being removed during
+ build, most of them are gone from upstream tarball now
+
+ -- Laurent Bigonville <bigon at debian.org> Fri, 25 Oct 2013 01:01:25 +0200
gdm3 (3.8.4-2) unstable; urgency=low
Modified: desktop/experimental/gdm3/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/control?rev=40100&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/control [utf-8] (original)
+++ desktop/experimental/gdm3/debian/control [utf-8] Thu Oct 24 23:20:06 2013
@@ -46,7 +46,9 @@
iso-codes,
libaudit-dev [linux-any],
docbook-xml,
- gsettings-desktop-schemas
+ gsettings-desktop-schemas,
+ libsystemd-login-dev (>= 186),
+ libsystemd-daemon-dev (>= 186)
Standards-Version: 3.9.4
Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gdm3/
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gdm3/
@@ -63,7 +65,7 @@
libpam-runtime (>= 0.76-13.1),
gnome-session-bin (>= 3.6),
gnome-settings-daemon (>= 3.2),
- gnome-shell,
+ gnome-shell (>= 3.6),
upower,
gnome-session | x-session-manager | x-window-manager | x-terminal-emulator,
lsb-base (>= 3.2-14),
@@ -89,8 +91,7 @@
Breaks: gnome-panel (<< 3.0),
gnome-screensaver (<< 2.17.7),
gnome-orca (<< 2.30.0-2),
- gnome-control-center (<< 3.0),
- gnome-shell (<< 3.5)
+ gnome-control-center (<< 3.0)
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.
@@ -134,7 +135,7 @@
Pre-Depends: ${misc:Pre-Depends}
Depends: libgdm1 (= ${binary:Version}),
gir1.2-gdm3 (= ${binary:Version}),
- ${shlibs:Depends},
+ ${shlibs:Depends},
${misc:Depends},
${gir:Depends}
Description: Next generation GNOME Display Manager (development files)
Modified: desktop/experimental/gdm3/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/control.in?rev=40100&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/control.in [utf-8] (original)
+++ desktop/experimental/gdm3/debian/control.in [utf-8] Thu Oct 24 23:20:06 2013
@@ -60,7 +60,7 @@
libpam-runtime (>= 0.76-13.1),
gnome-session-bin (>= 3.6),
gnome-settings-daemon (>= 3.2),
- gnome-shell,
+ gnome-shell (>= 3.6),
upower,
gnome-session | x-session-manager | x-window-manager | x-terminal-emulator,
lsb-base (>= 3.2-14),
@@ -86,8 +86,7 @@
Breaks: gnome-panel (<< 3.0),
gnome-screensaver (<< 2.17.7),
gnome-orca (<< 2.30.0-2),
- gnome-control-center (<< 3.0),
- gnome-shell (<< 3.5)
+ gnome-control-center (<< 3.0)
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.
@@ -131,7 +130,7 @@
Pre-Depends: ${misc:Pre-Depends}
Depends: libgdm1 (= ${binary:Version}),
gir1.2-gdm3 (= ${binary:Version}),
- ${shlibs:Depends},
+ ${shlibs:Depends},
${misc:Depends},
${gir:Depends}
Description: Next generation GNOME Display Manager (development files)
Modified: desktop/experimental/gdm3/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/rules?rev=40100&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/rules [utf-8] (original)
+++ desktop/experimental/gdm3/debian/rules [utf-8] Thu Oct 24 23:20:06 2013
@@ -75,11 +75,9 @@
rm -f debian/gdm3/etc/pam.d/gdm
rm -f debian/gdm3/etc/pam.d/gdm-autologin
rm -f debian/gdm3/usr/share/gdm/autostart/LoginWindow/gnome-session-check-accelerated.desktop
-# gdm-simple-greeter is built even if the --disable-fallback-greeter flag is passed to the configure
- rm -f debian/gdm3/usr/lib/gdm3/gdm-simple-greeter
- rm -f debian/gdm3/usr/share/gdm/gdm-greeter-login-window.ui
- rm -f debian/gdm3/usr/share/gnome-session/sessions/gdm-fallback.session
- rm -f debian/gdm3/usr/share/gdm/simple-greeter/extensions/unified/page.ui
+# Not sure why the following files are still shipped (https://bugzilla.gnome.org/show_bug.cgi?id=710847)
+ rm -f debian/gdm3/usr/share/gdm/greeter/applications/gdm-simple-greeter.desktop
+ rm -f debian/gdm3/usr/share/gdm/greeter/applications/polkit-gnome-authentication-agent-1.desktop
INFILES := $(wildcard debian/*.desktop.in)
OUTFILES := $(INFILES:.desktop.in=.desktop)
More information about the pkg-gnome-commits
mailing list