[Pkg-xfce-commits] r8405 - in /goodies/trunk/lightdm: ./ debian/ debian/patches/

Yves-Alexis Perez corsac at moszumanska.debian.org
Tue Apr 22 21:33:00 UTC 2014 

Author: corsac
Date: Tue Apr 22 21:33:00 2014
New Revision: 8405

URL: http://svn.debian.org/wsvn/pkg-xfce/?sc=1&rev=8405
Log:
merge changes from experimental

Added:
    goodies/trunk/lightdm/debian/liblightdm-gobject-1-0.symbols
      - copied unchanged from r8401, goodies/branches/experimental/lightdm/debian/liblightdm-gobject-1-0.symbols
    goodies/trunk/lightdm/debian/liblightdm-qt-3-0.symbols
      - copied unchanged from r8401, goodies/branches/experimental/lightdm/debian/liblightdm-qt-3-0.symbols
Removed:
    goodies/trunk/lightdm/debian/patches/04_dont-add-pkglibexecdir-path.patch
Modified:
    goodies/trunk/lightdm/   (props changed)
    goodies/trunk/lightdm/debian/changelog
    goodies/trunk/lightdm/debian/lightdm.install
    goodies/trunk/lightdm/debian/patches/01_set-default-path.patch
    goodies/trunk/lightdm/debian/patches/06_allow_libpamsystemd_and_ck_together.patch
    goodies/trunk/lightdm/debian/patches/series
    goodies/trunk/lightdm/debian/rules
    goodies/trunk/lightdm/debian/watch

Propchange: goodies/trunk/lightdm/
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Tue Apr 22 21:33:00 2014
@@ -1 +1 @@
-/goodies/branches/experimental/lightdm:7168-7370
+/goodies/branches/experimental/lightdm:7168-7370,8116-8401

Modified: goodies/trunk/lightdm/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/lightdm/debian/changelog?rev=8405&op=diff
==============================================================================
--- goodies/trunk/lightdm/debian/changelog	(original)
+++ goodies/trunk/lightdm/debian/changelog	Tue Apr 22 21:33:00 2014
@@ -1,3 +1,65 @@
+lightdm (1.10.0-1) experimental; urgency=medium
+
+  * New upstream stable release.
+  * debian/watch updated to track 1.10 branch.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Tue, 08 Apr 2014 22:54:47 +0200
+
+lightdm (1.9.13-1) experimental; urgency=medium
+
+  * New upstream development release.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Tue, 25 Mar 2014 22:04:52 +0100
+
+lightdm (1.9.11-1) experimental; urgency=medium
+
+  * New upstream development release.
+  * debian/watch updated to track versions over 10.
+  * debian/patches:
+    - 02_fix-build-glib-before-2.40 removed, included upstream.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Thu, 13 Mar 2014 09:19:21 +0100
+
+lightdm (1.9.9-1) experimental; urgency=medium
+
+  * New upstream development release.
+  * debian/liblightdm-gobject-1-0.symbols, debian/liblightdm-qt-3-0.symbols:
+    - add a symbol file to handle library dependencies more carefully.
+  * debian/patches:
+    - 02_fix-build-glib-before-2.40 added, fix FTBFS with glib before 2.40.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Wed, 12 Mar 2014 11:00:42 +0100
+
+lightdm (1.9.8-1) experimental; urgency=medium
+
+  * New upstream development release.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Fri, 21 Feb 2014 22:05:10 +0100
+
+lightdm (1.9.6-1) experimental; urgency=medium
+
+  * New upstream development release.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Wed, 22 Jan 2014 21:18:16 +0100
+
+lightdm (1.9.5-1) experimental; urgency=medium
+
+  * New upstream development release.
+  * debian/watch updated to track 1.9 branch.
+  * debian/patches:
+    - 04_dont-add-pkglibexecdir-path dropped, gdm-flexiserver script has been
+      dropped from LightDM so the PATH addition was dropped as well.
+    - 01_set-default-path and 06_allow_libpamsystemd_and_ck_together
+      refreshed.
+  * debian/rules:
+    - stop removing gdmflexiserver since it doesn't exist anymore.
+    - configure libexecdir to be /u/l/*/lightdm.
+  * debian/lightdm.install:
+    - drop install of lightdm-set-defaults.
+    - rename lightdm-guest-session-wrapper to lightdm-guest-session.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 29 Dec 2013 22:28:33 +0100
+
 lightdm (1.8.8-1) unstable; urgency=medium
 
   * New upstream release.

Modified: goodies/trunk/lightdm/debian/lightdm.install
URL: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/lightdm/debian/lightdm.install?rev=8405&op=diff
==============================================================================
--- goodies/trunk/lightdm/debian/lightdm.install	(original)
+++ goodies/trunk/lightdm/debian/lightdm.install	Tue Apr 22 21:33:00 2014
@@ -13,5 +13,4 @@
 etc/pam.d
 debian/lightdm-xsession.desktop /usr/share/xsessions
 debian/01_debian.conf /usr/share/lightdm/lightdm.conf.d
-usr/lib/*/lightdm/lightdm-set-defaults
-usr/lib/*/lightdm/lightdm-guest-session-wrapper
+usr/lib/*/lightdm/lightdm-guest-session

Modified: goodies/trunk/lightdm/debian/patches/01_set-default-path.patch
URL: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/lightdm/debian/patches/01_set-default-path.patch?rev=8405&op=diff
==============================================================================
--- goodies/trunk/lightdm/debian/patches/01_set-default-path.patch	(original)
+++ goodies/trunk/lightdm/debian/patches/01_set-default-path.patch	Tue Apr 22 21:33:00 2014
@@ -4,7 +4,7 @@
 Description: Fix default PATH environment variable
 --- a/src/seat.c
 +++ b/src/seat.c
-@@ -267,7 +267,10 @@ run_script (Seat *seat, DisplayServer *d
+@@ -274,7 +274,10 @@ run_script (Seat *seat, DisplayServer *d
          process_set_env (script, "PATH", g_getenv ("PATH"));
      }
      else
@@ -18,7 +18,7 @@
      {
 --- a/src/session-child.c
 +++ b/src/session-child.c
-@@ -355,7 +355,10 @@ session_child_run (int argc, char **argv
+@@ -354,7 +354,10 @@ session_child_run (int argc, char **argv
          else
          {
              /* Set POSIX variables */

Modified: goodies/trunk/lightdm/debian/patches/06_allow_libpamsystemd_and_ck_together.patch
URL: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/lightdm/debian/patches/06_allow_libpamsystemd_and_ck_together.patch?rev=8405&op=diff
==============================================================================
--- goodies/trunk/lightdm/debian/patches/06_allow_libpamsystemd_and_ck_together.patch	(original)
+++ goodies/trunk/lightdm/debian/patches/06_allow_libpamsystemd_and_ck_together.patch	Tue Apr 22 21:33:00 2014
@@ -1,6 +1,6 @@
---- a/src/session.c	2013-10-30 21:41:46.000000000 +0100
-+++ b/src/session.c	2013-11-28 19:59:37.218510065 +0100
-@@ -766,8 +766,8 @@
+--- a/src/session.c
++++ b/src/session.c
+@@ -781,8 +781,8 @@ session_real_run (Session *session)
  
      if (login1_is_running ())
          session->priv->login1_session = read_string_from_child (session);
@@ -11,7 +11,7 @@
  }
  
  void
-@@ -778,7 +778,7 @@
+@@ -793,7 +793,7 @@ session_lock (Session *session)
      {
          if (session->priv->login1_session)
              login1_lock_session (session->priv->login1_session);
@@ -20,7 +20,7 @@
              ck_lock_session (session->priv->console_kit_cookie);
      }
  }
-@@ -791,7 +791,7 @@
+@@ -806,7 +806,7 @@ session_unlock (Session *session)
      {
          if (session->priv->login1_session)
              login1_unlock_session (session->priv->login1_session);
@@ -29,9 +29,9 @@
              ck_unlock_session (session->priv->console_kit_cookie);
      }
  }
---- a/src/session-child.c	2013-11-28 20:24:07.000000000 +0100
-+++ b/src/session-child.c	2013-11-28 20:01:55.738515458 +0100
-@@ -476,8 +476,8 @@
+--- a/src/session-child.c
++++ b/src/session-child.c
+@@ -476,8 +476,8 @@ session_child_run (int argc, char **argv
          write_string (login1_session);
      }
  
@@ -42,7 +42,7 @@
          /* Open a Console Kit session */
          g_variant_builder_init (&ck_parameters, G_VARIANT_TYPE ("(a(sv))"));
          g_variant_builder_open (&ck_parameters, G_VARIANT_TYPE ("a(sv)"));
-@@ -506,7 +506,7 @@
+@@ -506,7 +506,7 @@ session_child_run (int argc, char **argv
              pam_putenv (pam_handle, value);
              g_free (value);
          }

Modified: goodies/trunk/lightdm/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/lightdm/debian/patches/series?rev=8405&op=diff
==============================================================================
--- goodies/trunk/lightdm/debian/patches/series	(original)
+++ goodies/trunk/lightdm/debian/patches/series	Tue Apr 22 21:33:00 2014
@@ -1,5 +1,3 @@
 01_set-default-path.patch
-02_fix-apparmor-profile.patch
-04_dont-add-pkglibexecdir-path.patch
 05_debianize-pam-files.patch
 06_allow_libpamsystemd_and_ck_together.patch

Modified: goodies/trunk/lightdm/debian/rules
URL: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/lightdm/debian/rules?rev=8405&op=diff
==============================================================================
--- goodies/trunk/lightdm/debian/rules	(original)
+++ goodies/trunk/lightdm/debian/rules	Tue Apr 22 21:33:00 2014
@@ -1,12 +1,13 @@
 #!/usr/bin/make -f
+
+include /usr/share/dpkg/pkg-info.mk
+include /usr/share/dpkg/architecture.mk
 
 export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed -Wl,-O1
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-
 override_dh_auto_configure:
-	dh_auto_configure -- --with-greeter-user=lightdm --with-user-session=lightdm-xsession --enable-introspection=yes --disable-silent-rules
+	dh_auto_configure -- --with-greeter-user=lightdm --with-user-session=lightdm-xsession --enable-introspection=yes --disable-silent-rules --libexecdir=/usr/lib/$(DEB_HOST_MULTIARCH)/$(DEB_SOURCE)/
 
 override_dh_installchangelogs:
 	dh_installchangelogs -- NEWS
@@ -16,7 +17,6 @@
 
 override_dh_install:
 	find debian/tmp -name '*.la' -delete
-	find debian/tmp/usr/lib/ -name gdmflexiserver -delete
 	find debian/tmp/etc/apparmor.d -type f -exec chmod 0644 '{}' \;
 	dh_install --fail-missing -X etc/init/lightdm.conf
 

Modified: goodies/trunk/lightdm/debian/watch
URL: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/lightdm/debian/watch?rev=8405&op=diff
==============================================================================
--- goodies/trunk/lightdm/debian/watch	(original)
+++ goodies/trunk/lightdm/debian/watch	Tue Apr 22 21:33:00 2014
@@ -1,3 +1,3 @@
 version=3
-https://launchpad.net/lightdm/1.8 \
-https://launchpad.net/lightdm/.*/lightdm-(\d\.\d\.\d)\.tar\.(?:gz|bz2|xz)
+https://launchpad.net/lightdm/1.10 \
+https://launchpad.net/lightdm/.*/lightdm-(\d\.\d+\.\d+)\.tar\.(?:gz|bz2|xz)

More information about the Pkg-xfce-commits mailing list