[Pkg-xfce-commits] r6500 - in goodies/trunk/lightdm-gtk-greeter/debian: . patches

Yves-Alexis Perez corsac at alioth.debian.org
Tue Mar 27 07:11:22 UTC 2012


Author: corsac
Date: 2012-03-27 19:11:21 +0000 (Tue, 27 Mar 2012)
New Revision: 6500

Removed:
   goodies/trunk/lightdm-gtk-greeter/debian/lightdm-gtk-greeter.config
   goodies/trunk/lightdm-gtk-greeter/debian/lightdm-gtk-greeter.templates
   goodies/trunk/lightdm-gtk-greeter/debian/patches/01_fix-configfile-path.patch
   goodies/trunk/lightdm-gtk-greeter/debian/po/
Modified:
   goodies/trunk/lightdm-gtk-greeter/debian/changelog
   goodies/trunk/lightdm-gtk-greeter/debian/lightdm-gtk-greeter.postinst
   goodies/trunk/lightdm-gtk-greeter/debian/lightdm-gtk-greeter.prerm
   goodies/trunk/lightdm-gtk-greeter/debian/patches/series
Log:
new upstream release + various changes:

* don't handle greeters through debconf but rather use alternatives
* drop config file patch, included upstream


Modified: goodies/trunk/lightdm-gtk-greeter/debian/changelog
===================================================================
--- goodies/trunk/lightdm-gtk-greeter/debian/changelog	2012-03-27 19:09:59 UTC (rev 6499)
+++ goodies/trunk/lightdm-gtk-greeter/debian/changelog	2012-03-27 19:11:21 UTC (rev 6500)
@@ -1,4 +1,4 @@
-lightdm-gtk-greeter (1.1.3-1) UNRELEASED; urgency=low
+lightdm-gtk-greeter (1.1.4-1) UNRELEASED; urgency=low
 
   * Initial release.
 

Deleted: goodies/trunk/lightdm-gtk-greeter/debian/lightdm-gtk-greeter.config
===================================================================
--- goodies/trunk/lightdm-gtk-greeter/debian/lightdm-gtk-greeter.config	2012-03-27 19:09:59 UTC (rev 6499)
+++ goodies/trunk/lightdm-gtk-greeter/debian/lightdm-gtk-greeter.config	2012-03-27 19:11:21 UTC (rev 6500)
@@ -1,31 +0,0 @@
-#!/bin/sh
-# Debian lightdm package configuration script
-# based on xdm script
-# Copyright 2000-2001 Branden Robinson.
-# Licensed under the GNU General Public License, version 2.  See the file
-# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
-
-set -e
-
-LIGHTDM_CONF=/etc/lightdm/lightdm.conf
-
-# source debconf library
-. /usr/share/debconf/confmodule
-
-OWNERS=
-if db_metaget shared/lightdm-greeter owners; then
-  OWNERS="$RET"
-fi
-
-CHOICES=
-if db_metaget shared/lightdm-greeter choices; then
-  CHOICES="$RET"
-fi
-
-if [ "$OWNERS" != "$CHOICES" ]; then
-  db_subst shared/lightdm-greeter choices "$OWNERS" || :
-  db_fset shared/lightdm-greeter seen false || :
-fi
-
-db_input high shared/lightdm-greeter || :
-db_go || :

Modified: goodies/trunk/lightdm-gtk-greeter/debian/lightdm-gtk-greeter.postinst
===================================================================
--- goodies/trunk/lightdm-gtk-greeter/debian/lightdm-gtk-greeter.postinst	2012-03-27 19:09:59 UTC (rev 6499)
+++ goodies/trunk/lightdm-gtk-greeter/debian/lightdm-gtk-greeter.postinst	2012-03-27 19:11:21 UTC (rev 6500)
@@ -2,24 +2,11 @@
 
 set -e
 
-. /usr/share/debconf/confmodule
-
-# using this greeter?
-GREETER=
-if db_get shared/lightdm-greeter; then
-  GREETER="$RET"
+if [ "$1" = "configure" ]; then
+  update-alternatives --install /usr/share/xgreeters/lightdm-greeter.desktop \
+  lightdm-greeter /usr/share/xgreeters/lightdm-gtk-greeter.desktop 60 --slave
 fi
 
-if [ -n "${GREETER}" ];
-then
-  LIGHTDM_SET_DEFAULTS=/usr/lib/*/lightdm/lightdm-set-defaults
-  if [ -x "${LIGHTDM_SET_DEFAULTS}" ];
-  then
-    "${LIGHTDM_SET_DEFAULTS}" --greeter "${GREETER}"
-  fi
-fi
-db_stop || true
-
 #DEBHELPER#
 
 exit 0

Modified: goodies/trunk/lightdm-gtk-greeter/debian/lightdm-gtk-greeter.prerm
===================================================================
--- goodies/trunk/lightdm-gtk-greeter/debian/lightdm-gtk-greeter.prerm	2012-03-27 19:09:59 UTC (rev 6499)
+++ goodies/trunk/lightdm-gtk-greeter/debian/lightdm-gtk-greeter.prerm	2012-03-27 19:11:21 UTC (rev 6500)
@@ -1,44 +1,9 @@
 #!/bin/bash
-# Debian lightdm package pre-removal script
-# © 2010 Yves-Alexis Perez, using lightdm script which is
-# Copyright 2001 Branden Robinson.
-# Licensed under the GNU General Public License, version 2.  See the file
-# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
-# Acknowlegements to Stephen Early, Mark Eichin, and Manoj Srivastava.
 
 set -e
 
-THIS_PACKAGE="lightdm-gtk-greeter"
-LIGHTDM_SET_DEFAULTS=/usr/lib/*/lightdm/lightdm-set-defaults
-
-if [ "$1" = "remove" -o "$1" = "deconfigure" ]; then
-  if [ -e /usr/share/debconf/confmodule ]; then
-    . /usr/share/debconf/confmodule
-    # disown this question
-    db_unregister shared/lightdm-greeter || true
-    # does the question still exist?
-    if db_get shared/lightdm-greeter; then
-      db_metaget shared/lightdm-greeter owners
-      db_subst shared/lightdm-greeter choices "$RET"
-      db_get shared/lightdm-greeter
-      # are we removing the currently selected lightdm greeter?
-      if [ "$THIS_PACKAGE" = "$RET" ]; then
-        # ask the user to choose a new default
-        db_fset shared/lightdm-greeter seen false
-        db_input critical shared/lightdm-greeter || true
-        db_go
-
-        GREETER=
-        if db_get shared/lightdm-greeter; then
-          GREETER="$RET"
-        fi
-        if [ -n "${GREETER}" ] && [ -x "${LIGHTDM_SET_DEFAULTS}" ];
-        then
-            "${LIGHTDM_SET_DEFAULTS}" --greeter "${GREETER}"
-        fi
-      fi
-    fi
-  fi
+if [ "$1" = "remove" ]; then
+  update-alternatives --remove lightdm-greeter /usr/share/xgreeters/lightdm-gtk-greeter.desktop
 fi
 
 #DEBHELPER#

Deleted: goodies/trunk/lightdm-gtk-greeter/debian/lightdm-gtk-greeter.templates
===================================================================
--- goodies/trunk/lightdm-gtk-greeter/debian/lightdm-gtk-greeter.templates	2012-03-27 19:09:59 UTC (rev 6499)
+++ goodies/trunk/lightdm-gtk-greeter/debian/lightdm-gtk-greeter.templates	2012-03-27 19:11:21 UTC (rev 6500)
@@ -1,11 +0,0 @@
-Template: lightdm-gtk-greeter/lightdm-greeter
-Type: string
-Default: lightdm-gtk-greeter
-Description: for internal use only
-
-Template: shared/lightdm-greeter
-Type: select
-Choices: ${choices}
-_Description: Default LightDM greeter
- LightDM can use multiple greeter fitting more or less with various Desktop
- environments. Select the one which fits best with your install.

Deleted: goodies/trunk/lightdm-gtk-greeter/debian/patches/01_fix-configfile-path.patch
===================================================================
--- goodies/trunk/lightdm-gtk-greeter/debian/patches/01_fix-configfile-path.patch	2012-03-27 19:09:59 UTC (rev 6499)
+++ goodies/trunk/lightdm-gtk-greeter/debian/patches/01_fix-configfile-path.patch	2012-03-27 19:11:21 UTC (rev 6500)
@@ -1,24 +0,0 @@
-Index: lightdm-gtk-greeter-1.1.3/src/Makefile.am
-===================================================================
---- lightdm-gtk-greeter-1.1.3.orig/src/Makefile.am	2012-01-31 23:11:40.000000000 +0100
-+++ lightdm-gtk-greeter-1.1.3/src/Makefile.am	2012-02-07 08:03:04.563165608 +0100
-@@ -1,5 +1,7 @@
- sbin_PROGRAMS = lightdm-gtk-greeter
- 
-+configdir = $(sysconfdir)/lightdm
-+
- lightdm_gtk_greeter_SOURCES = \
- 	lightdm-gtk-greeter.c
- 
-Index: lightdm-gtk-greeter-1.1.3/src/Makefile.in
-===================================================================
---- lightdm-gtk-greeter-1.1.3.orig/src/Makefile.in	2012-01-31 23:15:15.000000000 +0100
-+++ lightdm-gtk-greeter-1.1.3/src/Makefile.in	2012-02-07 08:04:51.731992523 +0100
-@@ -231,6 +231,7 @@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
-+configdir = $(sysconfdir)/lightdm
- lightdm_gtk_greeter_SOURCES = \
- 	lightdm-gtk-greeter.c
- 

Modified: goodies/trunk/lightdm-gtk-greeter/debian/patches/series
===================================================================
--- goodies/trunk/lightdm-gtk-greeter/debian/patches/series	2012-03-27 19:09:59 UTC (rev 6499)
+++ goodies/trunk/lightdm-gtk-greeter/debian/patches/series	2012-03-27 19:11:21 UTC (rev 6500)
@@ -1,2 +1 @@
-01_fix-configfile-path.patch
 04_default-gtk-greeter-config.patch




More information about the Pkg-xfce-commits mailing list