* New upstream release.

* debian/watch updated to only track stable releases.
* debian/patches:
  - 01_set-default-path and 05_dont-add-pkglibexecdir-path refreshed for new
    upstream release.
  - 06_move-lightdm-set-defaults-to-pkglibexecdir renamed to
    06_move-progs-to-pkglibexecdir, use the same patch to move
    lightdm-guest-session-wrapper to pkglibexecdir and refresh the original
    patch for new upstream.
* debian/lightdm.install:
  - install lightdm-guest-session-wrapper.

git-svn-id: svn://anonscm.debian.org/pkg-xfce/goodies/trunk/lightdm@6106 0c9b3bff-18ee-0310-b944-d1aa2700132f

diff --git a/debian/changelog b/debian/changelog
index 12c47090cff864f7b618b68ad7af4eddaec7b736..dd6913268a2de5a26f869ea90716bbefab84a68a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+lightdm (1.0.3-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * debian/watch updated to only track stable releases.
+  * debian/patches:
+    - 01_set-default-path and 05_dont-add-pkglibexecdir-path refreshed for new
+      upstream release.
+    - 06_move-lightdm-set-defaults-to-pkglibexecdir renamed to
+      06_move-progs-to-pkglibexecdir, use the same patch to move
+      lightdm-guest-session-wrapper to pkglibexecdir and refresh the original
+      patch for new upstream.
+  * debian/lightdm.install:
+    - install lightdm-guest-session-wrapper.
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Sat, 08 Oct 2011 13:21:56 +0200
+
 lightdm (1.0.2-1) unstable; urgency=low
 
   * New upstream release.

diff --git a/debian/lightdm.install b/debian/lightdm.install
index 1fc28887e3f918901979924a4aca2c82ed880e26..1624e6134694abcc8b4a15b7b1b3cb33f23dfb6c 100644 (file)
--- a/debian/lightdm.install
+++ b/debian/lightdm.install
@@ -10,3 +10,4 @@ etc/lightdm/keys.conf
 etc/apparmor.d/lightdm-guest-session
 debian/lightdm-xsession.desktop /usr/share/xsessions
 usr/lib/*/lightdm/lightdm-set-defaults
+usr/lib/*/lightdm/lightdm-guest-session-wrapper

diff --git a/debian/patches/01_set-default-path.patch b/debian/patches/01_set-default-path.patch
index 7ad88e54ba290d629dc9e57cd02c4bc43ddb6004..0057492a48dad5c6cd9099f3b130119ec827e01e 100644 (file)
--- a/debian/patches/01_set-default-path.patch
+++ b/debian/patches/01_set-default-path.patch
@@ -2,11 +2,11 @@ Author: Yves-Alexis Perez <corsac@debian.org>
 Author: Lionel Le Folgoc <mrpouit@gmail.com>
 Bug: https://bugs.launchpad.net/ubuntu/+source/lightdm/+bug/798277
 Description: Fix default PATH environment variable
-Index: lightdm-1.0.1/src/session.c
+Index: lightdm-1.0.3/src/session.c
 ===================================================================
---- lightdm-1.0.1.orig/src/session.c   2011-10-04 08:53:53.000000000 +0200
-+++ lightdm-1.0.1/src/session.c        2011-10-05 22:15:10.864382047 +0200
-@@ -282,7 +282,10 @@
+--- lightdm-1.0.3.orig/src/session.c   2011-10-08 00:56:51.000000000 +0200
++++ lightdm-1.0.3/src/session.c        2011-10-08 13:29:42.102575779 +0200
+@@ -249,7 +249,10 @@
      g_debug ("Launching session");
  
      user = pam_session_get_user (session->priv->authentication);

diff --git a/debian/patches/05_dont-add-pkglibexecdir-path.patch b/debian/patches/05_dont-add-pkglibexecdir-path.patch
index dfa99d842f4576452a699154399b9e9b739e2645..8b1cbf60b305a201b1b6f7c2418065b0244fcf33 100644 (file)
--- a/debian/patches/05_dont-add-pkglibexecdir-path.patch
+++ b/debian/patches/05_dont-add-pkglibexecdir-path.patch
@@ -1,8 +1,8 @@
-Index: lightdm-1.0.2/src/session.c
+Index: lightdm-1.0.3/src/session.c
 ===================================================================
---- lightdm-1.0.2.orig/src/session.c   2011-10-06 07:28:51.660678486 +0200
-+++ lightdm-1.0.2/src/session.c        2011-10-06 07:28:58.712733068 +0200
-@@ -216,26 +216,6 @@
+--- lightdm-1.0.3.orig/src/session.c   2011-10-08 13:29:42.102575779 +0200
++++ lightdm-1.0.3/src/session.c        2011-10-08 13:29:55.526679659 +0200
+@@ -217,26 +217,6 @@
      }
  }
  
@@ -29,7 +29,7 @@ Index: lightdm-1.0.2/src/session.c
  gboolean
  session_start (Session *session)
  {
-@@ -435,7 +415,6 @@
+@@ -436,7 +416,6 @@
      pam_session_setup (session->priv->authentication);
      set_env_from_authentication (session, session->priv->authentication);
      set_locale (session);

diff --git a/debian/patches/06_move-lightdm-set-defaults-to-pkglibexecdir.patch b/debian/patches/06_move-lightdm-set-defaults-to-pkglibexecdir.patch
deleted file mode 100644 (file)
index 85ce02c..0000000
--- a/debian/patches/06_move-lightdm-set-defaults-to-pkglibexecdir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-Index: lightdm-1.0.1/utils/Makefile.am
-===================================================================
---- lightdm-1.0.1.orig/utils/Makefile.am       2011-09-28 09:11:35.000000000 +0200
-+++ lightdm-1.0.1/utils/Makefile.am    2011-10-05 22:15:24.740648080 +0200
-@@ -1,5 +1,5 @@
- bin_PROGRAMS = dm-tool
--libexec_PROGRAMS = lightdm-set-defaults
-+pkglibexec_PROGRAMS = lightdm-set-defaults
- dist_pkglibexec_SCRIPTS = gdmflexiserver
- 
- dm_tool_SOURCES = \

diff --git a/debian/patches/06_move-progs-to-pkglibexecdir.patch b/debian/patches/06_move-progs-to-pkglibexecdir.patch
new file mode 100644 (file)
index 0000000..0b5ef0d
--- /dev/null
+++ b/debian/patches/06_move-progs-to-pkglibexecdir.patch
@@ -0,0 +1,24 @@
+Index: lightdm-1.0.3/utils/Makefile.am
+===================================================================
+--- lightdm-1.0.3.orig/utils/Makefile.am       2011-10-06 03:16:14.000000000 +0200
++++ lightdm-1.0.3/utils/Makefile.am    2011-10-08 13:30:03.382740381 +0200
+@@ -1,5 +1,5 @@
+ bin_PROGRAMS = dm-tool
+-libexec_PROGRAMS = lightdm-set-defaults
++pkglibexec_PROGRAMS = lightdm-set-defaults
+ dist_pkglibexec_SCRIPTS = gdmflexiserver
+ 
+ dm_tool_SOURCES = \
+Index: lightdm-1.0.3/src/Makefile.am
+===================================================================
+--- lightdm-1.0.3.orig/src/Makefile.am 2011-10-08 01:04:12.000000000 +0200
++++ lightdm-1.0.3/src/Makefile.am      2011-10-08 13:31:00.779184624 +0200
+@@ -93,7 +93,7 @@
+       $(LIGHTDM_LIBS) \
+       -lpam
+ 
+-libexec_PROGRAMS = lightdm-guest-session-wrapper
++pkglibexec_PROGRAMS = lightdm-guest-session-wrapper
+ 
+ lightdm_guest_session_wrapper_SOURCES = lightdm-guest-session-wrapper.c
+ 

diff --git a/debian/patches/series b/debian/patches/series
index d437db1f72082561642c90586d47f7d2388515b6..0ff9d1ab497963cda564fab630c0325ef879e7b5 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,4 @@
 03_quit-plymouth.patch
 04_default-gtk-greeter-config.patch
 05_dont-add-pkglibexecdir-path.patch
-06_move-lightdm-set-defaults-to-pkglibexecdir.patch
+06_move-progs-to-pkglibexecdir.patch

diff --git a/debian/watch b/debian/watch
index 4712720065c2cef55565dae5d453c473a5811684..7e9b89e594ad0abb4081722ea29b8c59b6af4565 100644 (file)
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
 http://people.ubuntu.com/~robert-ancell/lightdm/releases/ \
-       lightdm-([\d\.]+)\.tar\.(?:gz|bz2)
+       lightdm-(\d\.[02468]\.\d)\.tar\.(?:gz|bz2)