[Pkg-xfce-commits] r6078 - in goodies/tags/lightdm: . 1.0.0-2/debian 1.0.0-2/debian/patches
Yves-Alexis Perez
corsac at alioth.debian.org
Thu Sep 29 11:19:05 UTC 2011
Author: corsac
Date: 2011-09-29 11:19:05 +0000 (Thu, 29 Sep 2011)
New Revision: 6078
Added:
goodies/tags/lightdm/1.0.0-2/
goodies/tags/lightdm/1.0.0-2/debian/changelog
goodies/tags/lightdm/1.0.0-2/debian/compat
goodies/tags/lightdm/1.0.0-2/debian/control
goodies/tags/lightdm/1.0.0-2/debian/liblightdm-gobject-1-0.install
goodies/tags/lightdm/1.0.0-2/debian/liblightdm-gobject-dev.install
goodies/tags/lightdm/1.0.0-2/debian/liblightdm-qt-1-0.install
goodies/tags/lightdm/1.0.0-2/debian/liblightdm-qt-dev.install
goodies/tags/lightdm/1.0.0-2/debian/lightdm-gtk-greeter.postinst
goodies/tags/lightdm/1.0.0-2/debian/lightdm-gtk-greeter.prerm
goodies/tags/lightdm/1.0.0-2/debian/lightdm-qt-greeter.postinst
goodies/tags/lightdm/1.0.0-2/debian/lightdm-qt-greeter.prerm
goodies/tags/lightdm/1.0.0-2/debian/lightdm.install
goodies/tags/lightdm/1.0.0-2/debian/lightdm.postinst
goodies/tags/lightdm/1.0.0-2/debian/patches/01_set-default-path.patch
goodies/tags/lightdm/1.0.0-2/debian/patches/02_default-config.patch
goodies/tags/lightdm/1.0.0-2/debian/patches/03_quit-plymouth.patch
goodies/tags/lightdm/1.0.0-2/debian/patches/04_default-gtk-greeter-config.patch
goodies/tags/lightdm/1.0.0-2/debian/patches/05_dont-add-pkglibexecdir-path.patch
goodies/tags/lightdm/1.0.0-2/debian/patches/06_move-lightdm-set-defaults-to-pkglibexecdir.patch
goodies/tags/lightdm/1.0.0-2/debian/patches/series
goodies/tags/lightdm/1.0.0-2/debian/rules
Removed:
goodies/tags/lightdm/1.0.0-2/debian/changelog
goodies/tags/lightdm/1.0.0-2/debian/compat
goodies/tags/lightdm/1.0.0-2/debian/control
goodies/tags/lightdm/1.0.0-2/debian/liblightdm-gobject-1-0.install
goodies/tags/lightdm/1.0.0-2/debian/liblightdm-gobject-dev.install
goodies/tags/lightdm/1.0.0-2/debian/liblightdm-qt-1-0.install
goodies/tags/lightdm/1.0.0-2/debian/liblightdm-qt-dev.install
goodies/tags/lightdm/1.0.0-2/debian/lightdm-gtk-greeter.postinst
goodies/tags/lightdm/1.0.0-2/debian/lightdm-gtk-greeter.prerm
goodies/tags/lightdm/1.0.0-2/debian/lightdm-qt-greeter.postinst
goodies/tags/lightdm/1.0.0-2/debian/lightdm-qt-greeter.prerm
goodies/tags/lightdm/1.0.0-2/debian/lightdm.install
goodies/tags/lightdm/1.0.0-2/debian/lightdm.postinst
goodies/tags/lightdm/1.0.0-2/debian/patches/01_set-default-path.patch
goodies/tags/lightdm/1.0.0-2/debian/patches/02_default-config.patch
goodies/tags/lightdm/1.0.0-2/debian/patches/03_quit-plymouth.patch
goodies/tags/lightdm/1.0.0-2/debian/patches/04_default-gtk-greeter-config.patch
goodies/tags/lightdm/1.0.0-2/debian/patches/05_dont-add-pkglibexecdir-path.patch
goodies/tags/lightdm/1.0.0-2/debian/patches/series
goodies/tags/lightdm/1.0.0-2/debian/rules
Log:
[svn-buildpackage] Tagging lightdm 1.0.0-2
Deleted: goodies/tags/lightdm/1.0.0-2/debian/changelog
===================================================================
--- goodies/trunk/lightdm/debian/changelog 2011-09-26 18:39:14 UTC (rev 6054)
+++ goodies/tags/lightdm/1.0.0-2/debian/changelog 2011-09-29 11:19:05 UTC (rev 6078)
@@ -1,75 +0,0 @@
-lightdm (0.9.7-1) unstable; urgency=low
-
- * New upstream release.
- - fix consolekit session issues.
-
- -- Yves-Alexis Perez <corsac at debian.org> Fri, 16 Sep 2011 08:01:12 +0200
-
-lightdm (0.9.6-1) unstable; urgency=low
-
- * New upstream release:
- - don't write user files as root to prevent symlinks attacks
- [CVE-2011-3349] closes: #639151
- * debian/patches:
- - 01_set-default-path, 02_default-config, 03_quit-plymouth,
- 04_default-gtk-greeter-config refreshed.
- - 05_always-export-XAUTHORITY dropped, included upstream.
- - 05_dont-add-pkglibexecdir-path added, don't add /usr/lib/lightdm/lightdm
- to the PATH, it's ugly.
- * debian/rules:
- - don't install gdmflexiserver script for now until the PATH issue is
- solved.
- * debian/lightdm.install
- - install lightdm-set-default and dm-tool there.
- * debian/lightdm-{gtk,qt}-greeter.{config,templates,postinst,prerm}:
- - provide a way to select the current greeter through debconf. Other
- packages providing a greeter use the same templates/config to register
- themselves in debconf.
- * debian/control:
- - add suggests on accountsservice.
-
- -- Yves-Alexis Perez <corsac at debian.org> Thu, 15 Sep 2011 11:36:21 +0200
-
-lightdm (0.9.2-3) unstable; urgency=low
-
- * debian/patches:
- - 05_always-export-XAUTHORITY added, always export path to xauth file.
- * debian/lightdm-xsession.desktop:
- - provide a default xsession desktop file. closes: #636111
-
- -- Yves-Alexis Perez <corsac at debian.org> Sat, 06 Aug 2011 11:34:57 +0200
-
-lightdm (0.9.2-2) unstable; urgency=low
-
- * debian/control;
- - use real package name in greeter dependency. closes: #636020
- - recommends desktop-base (for default background) and
- gnome-theme-standards (for Adwaita GTK+ 3 theme) in GTK+ greeter.
- * debian/patches:
- - 04_default-gtk-greeter-config added, tune GTK+ greeter config to match
- Debian themes.
-
- -- Yves-Alexis Perez <corsac at debian.org> Sat, 30 Jul 2011 20:03:59 +0200
-
-lightdm (0.9.2-1) unstable; urgency=low
-
- * New upstream release.
- * debian/lightdm.install:
- - install locale files in lightdm package.
- * debian/rules:
- - set greeter user at build time.
- * debian/control:
- - rename the greeter packages to fit what's in Ubuntu.
- - lightdm-vala doesn't provide a greeter anymore.
- * debian/lightdm{,-gtk-greeter}.install:
- - ship GTK+ greeter config file in the lightdm-gtk-greeter package.
- * debian/lightdm.{config,templates} and debian/po debconf files added from
- Ubuntu package.
-
- -- Yves-Alexis Perez <corsac at debian.org> Fri, 29 Jul 2011 20:32:36 +0200
-
-lightdm (0.9.0-1) unstable; urgency=low
-
- * Initial release. closes: #615591
-
- -- Yves-Alexis Perez <corsac at debian.org> Thu, 28 Jul 2011 22:39:44 +0200
Copied: goodies/tags/lightdm/1.0.0-2/debian/changelog (from rev 6076, goodies/trunk/lightdm/debian/changelog)
===================================================================
--- goodies/tags/lightdm/1.0.0-2/debian/changelog (rev 0)
+++ goodies/tags/lightdm/1.0.0-2/debian/changelog 2011-09-29 11:19:05 UTC (rev 6078)
@@ -0,0 +1,124 @@
+lightdm (1.0.0-2) unstable; urgency=low
+
+ * debian/rules:
+ - correctly enable pie and bindnow.
+ - use a variable for multi-arch path instead of *.
+ - use autoreconf dh addon
+ * debian/control:
+ - add build-dep on dh-autoreconf and gtk-doc-tools
+ * debian/patches:
+ - 06_move-lightdm-set-defaults-to-pkglibexecdir added, move
+ lightdm-set-defaults to pkglibexecdir instead of libexecdir.
+ * debian/lightdm-{gtk,qt}-greeter.{postinst,prerm}:
+ - use variable for multi-arch path instead of *.
+ - update lightdm-set-defaults path to re-add lightdm folder.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Thu, 29 Sep 2011 12:09:35 +0200
+
+lightdm (1.0.0-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/patches:
+ - all patches refreshed
+ - 02_default-config: explicitly disable tcp listen.
+ * debian/rules:
+ - drop all hardening rules now done by dh in compat mode 9, but manually
+ add pie and bindnow.
+ - add -Wl,--as-needed -Wl,-O1 to LDFLAGS.
+ - update gdmflexiserver path for multi-arch paths.
+ * debian/compat bumped to 9.
+ * debian/control:
+ - added build-deb on dpkg-dev (>= 1.16.1) for hardening support.
+ - dropped hardening-includes from build-depends, now superseded
+ - update debhelper build-dep to 8.9.4 for compat mode v9.
+ - add Pre-Depends: ${misc:Pre-Depends} to the lib packages.
+ - add Recommends: on gnome-icon-theme to gtk greeter. closes: #643291
+ * debian/liblightdm-gobject-1-0.install,
+ debian/liblightdm-gobject-dev.install, debian/liblightdm-qt-1-0.install,
+ debian/liblightdm-qt-dev.install, debian/lightdm.install:
+ - update to use multi-arch folders.
+ * debian/lightdm.install:
+ - in v9 compat mode, libexecdir doesn't have the package name added so
+ update in consequence
+ * debian/liblightdm*.{postinst,prerm}:
+ - update path to lightdm-set-defaults.
+ * debian/lightdm.postinst:
+ - don't fail if one can't reload dbus, like in a chroot. closes: #642295
+
+ -- Yves-Alexis Perez <corsac at debian.org> Thu, 29 Sep 2011 07:39:18 +0200
+
+lightdm (0.9.7-1) unstable; urgency=low
+
+ * New upstream release.
+ - fix consolekit session issues.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Fri, 16 Sep 2011 08:01:12 +0200
+
+lightdm (0.9.6-1) unstable; urgency=low
+
+ * New upstream release:
+ - don't write user files as root to prevent symlinks attacks
+ [CVE-2011-3349] closes: #639151
+ * debian/patches:
+ - 01_set-default-path, 02_default-config, 03_quit-plymouth,
+ 04_default-gtk-greeter-config refreshed.
+ - 05_always-export-XAUTHORITY dropped, included upstream.
+ - 05_dont-add-pkglibexecdir-path added, don't add /usr/lib/lightdm/lightdm
+ to the PATH, it's ugly.
+ * debian/rules:
+ - don't install gdmflexiserver script for now until the PATH issue is
+ solved.
+ * debian/lightdm.install
+ - install lightdm-set-default and dm-tool there.
+ * debian/lightdm-{gtk,qt}-greeter.{config,templates,postinst,prerm}:
+ - provide a way to select the current greeter through debconf. Other
+ packages providing a greeter use the same templates/config to register
+ themselves in debconf.
+ * debian/control:
+ - add suggests on accountsservice.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Thu, 15 Sep 2011 11:36:21 +0200
+
+lightdm (0.9.2-3) unstable; urgency=low
+
+ * debian/patches:
+ - 05_always-export-XAUTHORITY added, always export path to xauth file.
+ * debian/lightdm-xsession.desktop:
+ - provide a default xsession desktop file. closes: #636111
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sat, 06 Aug 2011 11:34:57 +0200
+
+lightdm (0.9.2-2) unstable; urgency=low
+
+ * debian/control;
+ - use real package name in greeter dependency. closes: #636020
+ - recommends desktop-base (for default background) and
+ gnome-theme-standards (for Adwaita GTK+ 3 theme) in GTK+ greeter.
+ * debian/patches:
+ - 04_default-gtk-greeter-config added, tune GTK+ greeter config to match
+ Debian themes.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sat, 30 Jul 2011 20:03:59 +0200
+
+lightdm (0.9.2-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/lightdm.install:
+ - install locale files in lightdm package.
+ * debian/rules:
+ - set greeter user at build time.
+ * debian/control:
+ - rename the greeter packages to fit what's in Ubuntu.
+ - lightdm-vala doesn't provide a greeter anymore.
+ * debian/lightdm{,-gtk-greeter}.install:
+ - ship GTK+ greeter config file in the lightdm-gtk-greeter package.
+ * debian/lightdm.{config,templates} and debian/po debconf files added from
+ Ubuntu package.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Fri, 29 Jul 2011 20:32:36 +0200
+
+lightdm (0.9.0-1) unstable; urgency=low
+
+ * Initial release. closes: #615591
+
+ -- Yves-Alexis Perez <corsac at debian.org> Thu, 28 Jul 2011 22:39:44 +0200
Deleted: goodies/tags/lightdm/1.0.0-2/debian/compat
===================================================================
--- goodies/trunk/lightdm/debian/compat 2011-09-26 18:39:14 UTC (rev 6054)
+++ goodies/tags/lightdm/1.0.0-2/debian/compat 2011-09-29 11:19:05 UTC (rev 6078)
@@ -1 +0,0 @@
-7
Copied: goodies/tags/lightdm/1.0.0-2/debian/compat (from rev 6057, goodies/trunk/lightdm/debian/compat)
===================================================================
--- goodies/tags/lightdm/1.0.0-2/debian/compat (rev 0)
+++ goodies/tags/lightdm/1.0.0-2/debian/compat 2011-09-29 11:19:05 UTC (rev 6078)
@@ -0,0 +1 @@
+9
Deleted: goodies/tags/lightdm/1.0.0-2/debian/control
===================================================================
--- goodies/trunk/lightdm/debian/control 2011-09-26 18:39:14 UTC (rev 6054)
+++ goodies/tags/lightdm/1.0.0-2/debian/control 2011-09-29 11:19:05 UTC (rev 6078)
@@ -1,89 +0,0 @@
-Source: lightdm
-Section: x11
-Priority: optional
-Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
-Uploaders: Evgeni Golov <evgeni at debian.org>,
- Yves-Alexis Perez <corsac at debian.org>, Emanuele Rocca <ema at debian.org>,
- Simon Huggins <huggie at earth.li>
-Build-Depends: debhelper (>= 7.0.50~), intltool, pkg-config, libglib2.0-dev,
- libdbus-glib-1-dev, libxcb1-dev, libxdmcp-dev, libpam-dev, libxklavier-dev,
- libgtk-3-dev, libck-connector-dev, gnome-doc-utils, libqt4-dev,
- hardening-includes, valac, gobject-introspection
-Standards-Version: 3.9.2
-Homepage: https://launchpad.net/lightdm
-Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/lightdm
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/lightdm
-
-Package: lightdm
-Section: x11
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends},
- lightdm-gtk-greeter | lightdm-qt-greeter, dbus, consolekit, adduser
-Recommends: xserver-xorg
-Suggests: accountsservice
-Description: simple display manager
- An X display manager that:
- * Has a lightweight codebase
- * Is standards compliant (PAM, ConsoleKit, etc)
- * Has a well defined interface between the server and user interface
- * Fully themeable
- * Cross-desktop (greeters can be written in any toolkit)
-
-Package: lightdm-gtk-greeter
-Provides: lightdm-greeter
-Replaces: lightdm-gtk, lightdm (<< 0.9.2-1)
-Breaks: lightdm-gtk, lightdm (<< 0.9.2-1)
-Section: x11
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: desktop-base, gnome-themes-standard
-Description: simple display manager (GTK+ greeter)
- A LightDM greeter that uses the GTK+ toolkit.
-
-Package: lightdm-qt-greeter
-Provides: lightdm-greeter
-Replaces: lightdm-qt
-Breaks: lightdm-qt
-Section: x11
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: simple display manager (Qt greeter)
- A LightDM greeter that uses the Qt toolkit.
-
-Package: lightdm-vala
-Section: x11
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: simple display manager (Vala files)
- This package contains the Vala files for the lightdm display manager
-
-Package: liblightdm-gobject-1-0
-Section: libdevel
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: simple display manager (gobject library)
- This package contains the gobject library for lightdm, used by the GTK+
- greeter.
-
-Package: liblightdm-qt-1-0
-Section: libdevel
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: simple display manager (Qt library)
- This package contains the Qt library for lightdm.
-
-Package: liblightdm-gobject-dev
-Section: libdevel
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: simple display manager (gobject development files)
- This package contains the development files for lightdm.
- They can be used to build new greeters applications GTK+ based.
-
-Package: liblightdm-qt-dev
-Section: libdevel
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: simple display manager (Qt development files)
- This package contains the development files for lightdm.
- They can be used to build new greeters applications Qt based.
Copied: goodies/tags/lightdm/1.0.0-2/debian/control (from rev 6074, goodies/trunk/lightdm/debian/control)
===================================================================
--- goodies/tags/lightdm/1.0.0-2/debian/control (rev 0)
+++ goodies/tags/lightdm/1.0.0-2/debian/control 2011-09-29 11:19:05 UTC (rev 6078)
@@ -0,0 +1,92 @@
+Source: lightdm
+Section: x11
+Priority: optional
+Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
+Uploaders: Evgeni Golov <evgeni at debian.org>,
+ Yves-Alexis Perez <corsac at debian.org>, Emanuele Rocca <ema at debian.org>,
+ Simon Huggins <huggie at earth.li>
+Build-Depends: debhelper (>= 8.9.4), intltool, pkg-config, libglib2.0-dev,
+ libdbus-glib-1-dev, libxcb1-dev, libxdmcp-dev, libpam-dev, libxklavier-dev,
+ libgtk-3-dev, libck-connector-dev, gnome-doc-utils, libqt4-dev,
+ valac, gobject-introspection, dpkg-dev (>= 1.16.1), dh-autoreconf,
+ gtk-doc-tools
+Standards-Version: 3.9.2
+Homepage: https://launchpad.net/lightdm
+Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/lightdm
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/lightdm
+
+Package: lightdm
+Section: x11
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ lightdm-gtk-greeter | lightdm-qt-greeter, dbus, consolekit, adduser
+Recommends: xserver-xorg
+Suggests: accountsservice
+Description: simple display manager
+ An X display manager that:
+ * Has a lightweight codebase
+ * Is standards compliant (PAM, ConsoleKit, etc)
+ * Has a well defined interface between the server and user interface
+ * Fully themeable
+ * Cross-desktop (greeters can be written in any toolkit)
+
+Package: lightdm-gtk-greeter
+Provides: lightdm-greeter
+Replaces: lightdm-gtk, lightdm (<< 0.9.2-1)
+Breaks: lightdm-gtk, lightdm (<< 0.9.2-1)
+Section: x11
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: desktop-base, gnome-themes-standard, gnome-icon-theme
+Description: simple display manager (GTK+ greeter)
+ A LightDM greeter that uses the GTK+ toolkit.
+
+Package: lightdm-qt-greeter
+Provides: lightdm-greeter
+Replaces: lightdm-qt
+Breaks: lightdm-qt
+Section: x11
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: simple display manager (Qt greeter)
+ A LightDM greeter that uses the Qt toolkit.
+
+Package: lightdm-vala
+Section: x11
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: simple display manager (Vala files)
+ This package contains the Vala files for the lightdm display manager
+
+Package: liblightdm-gobject-1-0
+Section: libdevel
+Architecture: any
+Pre-depends: ${misc:Pre-Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: simple display manager (gobject library)
+ This package contains the gobject library for lightdm, used by the GTK+
+ greeter.
+
+Package: liblightdm-qt-1-0
+Section: libdevel
+Architecture: any
+Pre-depends: ${misc:Pre-Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: simple display manager (Qt library)
+ This package contains the Qt library for lightdm.
+
+Package: liblightdm-gobject-dev
+Section: libdevel
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: simple display manager (gobject development files)
+ This package contains the development files for lightdm.
+ They can be used to build new greeters applications GTK+ based.
+
+Package: liblightdm-qt-dev
+Section: libdevel
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: simple display manager (Qt development files)
+ This package contains the development files for lightdm.
+ They can be used to build new greeters applications Qt based.
Deleted: goodies/tags/lightdm/1.0.0-2/debian/liblightdm-gobject-1-0.install
===================================================================
--- goodies/trunk/lightdm/debian/liblightdm-gobject-1-0.install 2011-09-26 18:39:14 UTC (rev 6054)
+++ goodies/tags/lightdm/1.0.0-2/debian/liblightdm-gobject-1-0.install 2011-09-29 11:19:05 UTC (rev 6078)
@@ -1 +0,0 @@
-usr/lib/liblightdm-gobject-*.so.*
Copied: goodies/tags/lightdm/1.0.0-2/debian/liblightdm-gobject-1-0.install (from rev 6057, goodies/trunk/lightdm/debian/liblightdm-gobject-1-0.install)
===================================================================
--- goodies/tags/lightdm/1.0.0-2/debian/liblightdm-gobject-1-0.install (rev 0)
+++ goodies/tags/lightdm/1.0.0-2/debian/liblightdm-gobject-1-0.install 2011-09-29 11:19:05 UTC (rev 6078)
@@ -0,0 +1 @@
+usr/lib/*/liblightdm-gobject-*.so.*
Deleted: goodies/tags/lightdm/1.0.0-2/debian/liblightdm-gobject-dev.install
===================================================================
--- goodies/trunk/lightdm/debian/liblightdm-gobject-dev.install 2011-09-26 18:39:14 UTC (rev 6054)
+++ goodies/tags/lightdm/1.0.0-2/debian/liblightdm-gobject-dev.install 2011-09-29 11:19:05 UTC (rev 6078)
@@ -1,5 +0,0 @@
-usr/include/lightdm-gobject*
-usr/lib/pkgconfig/liblightdm-gobject-*.pc
-usr/lib/liblightdm-gobject-*.a
-usr/lib/liblightdm-gobject-*.so
-usr/share/gtk-doc
Copied: goodies/tags/lightdm/1.0.0-2/debian/liblightdm-gobject-dev.install (from rev 6057, goodies/trunk/lightdm/debian/liblightdm-gobject-dev.install)
===================================================================
--- goodies/tags/lightdm/1.0.0-2/debian/liblightdm-gobject-dev.install (rev 0)
+++ goodies/tags/lightdm/1.0.0-2/debian/liblightdm-gobject-dev.install 2011-09-29 11:19:05 UTC (rev 6078)
@@ -0,0 +1,5 @@
+usr/include/lightdm-gobject*
+usr/lib/*/pkgconfig/liblightdm-gobject-*.pc
+usr/lib/*/liblightdm-gobject-*.a
+usr/lib/*/liblightdm-gobject-*.so
+usr/share/gtk-doc
Deleted: goodies/tags/lightdm/1.0.0-2/debian/liblightdm-qt-1-0.install
===================================================================
--- goodies/trunk/lightdm/debian/liblightdm-qt-1-0.install 2011-09-26 18:39:14 UTC (rev 6054)
+++ goodies/tags/lightdm/1.0.0-2/debian/liblightdm-qt-1-0.install 2011-09-29 11:19:05 UTC (rev 6078)
@@ -1 +0,0 @@
-usr/lib/liblightdm-qt-*.so.*
Copied: goodies/tags/lightdm/1.0.0-2/debian/liblightdm-qt-1-0.install (from rev 6057, goodies/trunk/lightdm/debian/liblightdm-qt-1-0.install)
===================================================================
--- goodies/tags/lightdm/1.0.0-2/debian/liblightdm-qt-1-0.install (rev 0)
+++ goodies/tags/lightdm/1.0.0-2/debian/liblightdm-qt-1-0.install 2011-09-29 11:19:05 UTC (rev 6078)
@@ -0,0 +1 @@
+usr/lib/*/liblightdm-qt-*.so.*
Deleted: goodies/tags/lightdm/1.0.0-2/debian/liblightdm-qt-dev.install
===================================================================
--- goodies/trunk/lightdm/debian/liblightdm-qt-dev.install 2011-09-26 18:39:14 UTC (rev 6054)
+++ goodies/tags/lightdm/1.0.0-2/debian/liblightdm-qt-dev.install 2011-09-29 11:19:05 UTC (rev 6078)
@@ -1,4 +0,0 @@
-usr/include/lightdm-qt*
-usr/lib/pkgconfig/liblightdm-qt-*.pc
-usr/lib/liblightdm-qt-*.a
-usr/lib/liblightdm-qt-*.so
Copied: goodies/tags/lightdm/1.0.0-2/debian/liblightdm-qt-dev.install (from rev 6057, goodies/trunk/lightdm/debian/liblightdm-qt-dev.install)
===================================================================
--- goodies/tags/lightdm/1.0.0-2/debian/liblightdm-qt-dev.install (rev 0)
+++ goodies/tags/lightdm/1.0.0-2/debian/liblightdm-qt-dev.install 2011-09-29 11:19:05 UTC (rev 6078)
@@ -0,0 +1,4 @@
+usr/include/lightdm-qt*
+usr/lib/*/pkgconfig/liblightdm-qt-*.pc
+usr/lib/*/liblightdm-qt-*.a
+usr/lib/*/liblightdm-qt-*.so
Deleted: goodies/tags/lightdm/1.0.0-2/debian/lightdm-gtk-greeter.postinst
===================================================================
--- goodies/trunk/lightdm/debian/lightdm-gtk-greeter.postinst 2011-09-26 18:39:14 UTC (rev 6054)
+++ goodies/tags/lightdm/1.0.0-2/debian/lightdm-gtk-greeter.postinst 2011-09-29 11:19:05 UTC (rev 6078)
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-set -e
-
-. /usr/share/debconf/confmodule
-
-# using this greeter?
-GREETER=
-if db_get shared/lightdm-greeter; then
- GREETER="$RET"
-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
Copied: goodies/tags/lightdm/1.0.0-2/debian/lightdm-gtk-greeter.postinst (from rev 6074, goodies/trunk/lightdm/debian/lightdm-gtk-greeter.postinst)
===================================================================
--- goodies/tags/lightdm/1.0.0-2/debian/lightdm-gtk-greeter.postinst (rev 0)
+++ goodies/tags/lightdm/1.0.0-2/debian/lightdm-gtk-greeter.postinst 2011-09-29 11:19:05 UTC (rev 6078)
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+
+# using this greeter?
+GREETER=
+DEB_HOST_MULTIARCH=$(dpkg-architecture -qDEB_HOST_MULTIARCH)
+if db_get shared/lightdm-greeter; then
+ GREETER="$RET"
+fi
+
+if [ -n "${GREETER}" ];
+then
+ LIGHTDM_SET_DEFAULTS=/usr/lib/$(DEB_HOST_MULTIARCH)/lightdm/lightdm-set-defaults
+ if [ -x "${LIGHTDM_SET_DEFAULTS}" ];
+ then
+ "${LIGHTDM_SET_DEFAULTS}" --greeter "${GREETER}"
+ fi
+fi
+db_stop || true
+
+#DEBHELPER#
+
+exit 0
Deleted: goodies/tags/lightdm/1.0.0-2/debian/lightdm-gtk-greeter.prerm
===================================================================
--- goodies/trunk/lightdm/debian/lightdm-gtk-greeter.prerm 2011-09-26 18:39:14 UTC (rev 6054)
+++ goodies/tags/lightdm/1.0.0-2/debian/lightdm-gtk-greeter.prerm 2011-09-29 11:19:05 UTC (rev 6078)
@@ -1,46 +0,0 @@
-#!/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
-fi
-
-#DEBHELPER#
-
-exit 0
Copied: goodies/tags/lightdm/1.0.0-2/debian/lightdm-gtk-greeter.prerm (from rev 6074, goodies/trunk/lightdm/debian/lightdm-gtk-greeter.prerm)
===================================================================
--- goodies/tags/lightdm/1.0.0-2/debian/lightdm-gtk-greeter.prerm (rev 0)
+++ goodies/tags/lightdm/1.0.0-2/debian/lightdm-gtk-greeter.prerm 2011-09-29 11:19:05 UTC (rev 6078)
@@ -0,0 +1,47 @@
+#!/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"
+DEB_HOST_MULTIARCH=$(dpkg-architecture -qDEB_HOST_MULTIARCH)
+LIGHTDM_SET_DEFAULTS=/usr/lib/$(DEB_HOST_MULTIARCH)/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
+fi
+
+#DEBHELPER#
+
+exit 0
Deleted: goodies/tags/lightdm/1.0.0-2/debian/lightdm-qt-greeter.postinst
===================================================================
--- goodies/trunk/lightdm/debian/lightdm-qt-greeter.postinst 2011-09-26 18:39:14 UTC (rev 6054)
+++ goodies/tags/lightdm/1.0.0-2/debian/lightdm-qt-greeter.postinst 2011-09-29 11:19:05 UTC (rev 6078)
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-set -e
-
-. /usr/share/debconf/confmodule
-
-# using this greeter?
-GREETER=
-if db_get shared/lightdm-greeter; then
- GREETER="$RET"
-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
Copied: goodies/tags/lightdm/1.0.0-2/debian/lightdm-qt-greeter.postinst (from rev 6074, goodies/trunk/lightdm/debian/lightdm-qt-greeter.postinst)
===================================================================
--- goodies/tags/lightdm/1.0.0-2/debian/lightdm-qt-greeter.postinst (rev 0)
+++ goodies/tags/lightdm/1.0.0-2/debian/lightdm-qt-greeter.postinst 2011-09-29 11:19:05 UTC (rev 6078)
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+
+# using this greeter?
+GREETER=
+DEB_HOST_MULTIARCH=$(dpkg-architecture -qDEB_HOST_MULTIARCH)
+if db_get shared/lightdm-greeter; then
+ GREETER="$RET"
+fi
+
+if [ -n "${GREETER}" ];
+then
+ LIGHTDM_SET_DEFAULTS=/usr/lib/$(DEB_HOST_MULTIARCH)/lightdm/lightdm-set-defaults
+ if [ -x "${LIGHTDM_SET_DEFAULTS}" ];
+ then
+ "${LIGHTDM_SET_DEFAULTS}" --greeter "${GREETER}"
+ fi
+fi
+db_stop || true
+
+#DEBHELPER#
+
+exit 0
Deleted: goodies/tags/lightdm/1.0.0-2/debian/lightdm-qt-greeter.prerm
===================================================================
--- goodies/trunk/lightdm/debian/lightdm-qt-greeter.prerm 2011-09-26 18:39:14 UTC (rev 6054)
+++ goodies/tags/lightdm/1.0.0-2/debian/lightdm-qt-greeter.prerm 2011-09-29 11:19:05 UTC (rev 6078)
@@ -1,46 +0,0 @@
-#!/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-qt-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
-fi
-
-#DEBHELPER#
-
-exit 0
Copied: goodies/tags/lightdm/1.0.0-2/debian/lightdm-qt-greeter.prerm (from rev 6074, goodies/trunk/lightdm/debian/lightdm-qt-greeter.prerm)
===================================================================
--- goodies/tags/lightdm/1.0.0-2/debian/lightdm-qt-greeter.prerm (rev 0)
+++ goodies/tags/lightdm/1.0.0-2/debian/lightdm-qt-greeter.prerm 2011-09-29 11:19:05 UTC (rev 6078)
@@ -0,0 +1,47 @@
+#!/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-qt-greeter"
+DEB_HOST_MULTIARCH=$(dpkg-architecture -qDEB_HOST_MULTIARCH)
+LIGHTDM_SET_DEFAULTS=/usr/lib/$(DEB_HOST_MULTIARCH)/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
+fi
+
+#DEBHELPER#
+
+exit 0
Deleted: goodies/tags/lightdm/1.0.0-2/debian/lightdm.install
===================================================================
--- goodies/trunk/lightdm/debian/lightdm.install 2011-09-26 18:39:14 UTC (rev 6054)
+++ goodies/tags/lightdm/1.0.0-2/debian/lightdm.install 2011-09-29 11:19:05 UTC (rev 6078)
@@ -1,11 +0,0 @@
-usr/bin/dm-tool
-usr/sbin/lightdm
-usr/share/man
-usr/share/locale
-etc/dbus-1
-etc/init
-etc/lightdm/users.conf
-etc/lightdm/lightdm.conf
-etc/lightdm/keys.conf
-debian/lightdm-xsession.desktop /usr/share/xsessions
-usr/lib/lightdm/lightdm-set-defaults
Copied: goodies/tags/lightdm/1.0.0-2/debian/lightdm.install (from rev 6074, goodies/trunk/lightdm/debian/lightdm.install)
===================================================================
--- goodies/tags/lightdm/1.0.0-2/debian/lightdm.install (rev 0)
+++ goodies/tags/lightdm/1.0.0-2/debian/lightdm.install 2011-09-29 11:19:05 UTC (rev 6078)
@@ -0,0 +1,11 @@
+usr/bin/dm-tool
+usr/sbin/lightdm
+usr/share/man
+usr/share/locale
+etc/dbus-1
+etc/init
+etc/lightdm/users.conf
+etc/lightdm/lightdm.conf
+etc/lightdm/keys.conf
+debian/lightdm-xsession.desktop /usr/share/xsessions
+usr/lib/*/lightdm/lightdm-set-defaults
Deleted: goodies/tags/lightdm/1.0.0-2/debian/lightdm.postinst
===================================================================
--- goodies/trunk/lightdm/debian/lightdm.postinst 2011-09-26 18:39:14 UTC (rev 6054)
+++ goodies/tags/lightdm/1.0.0-2/debian/lightdm.postinst 2011-09-29 11:19:05 UTC (rev 6078)
@@ -1,69 +0,0 @@
-#!/bin/sh
-
-set -e
-
-. /usr/share/debconf/confmodule
-
-THIS_PACKAGE=lightdm
-DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager
-
-# creating lightdm group if he isn't already there
-if ! getent group lightdm >/dev/null; then
- addgroup --system lightdm
-fi
-
-# creating lightdm user if he isn't already there
-if ! getent passwd lightdm >/dev/null; then
- adduser --system --ingroup lightdm --home /var/lib/lightdm lightdm
- usermod -c "Light Display Manager" lightdm
- usermod -d "/var/lib/lightdm" lightdm
- usermod -g "lightdm" lightdm
- usermod -s "/bin/false" lightdm
-fi
-
-if [ -d /var/lib/lightdm ]; then
- chown -R lightdm:lightdm /var/lib/lightdm
- chmod 0750 /var/lib/lightdm
-fi
-
-# debconf is not a registry, so we only fiddle with the default file if it
-# does not exist
-if [ ! -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then
- if db_get shared/default-x-display-manager; then
- # workaround debconf passthru bug (#379198)
- if [ -z "$RET" ]; then
- $RET="$THIS_PACKAGE"
- fi
- if [ "$THIS_PACKAGE" != "$RET" ]; then
- echo "Please be sure to run \"dpkg --configure $RET\"."
- fi
- if db_get "$RET"/daemon_name; then
- echo "$RET" > $DEFAULT_DISPLAY_MANAGER_FILE
- fi
- fi
-fi
-
-# remove the displaced old default display manager file if it exists
-if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE.dpkg-tmp" ]; then
- rm "$DEFAULT_DISPLAY_MANAGER_FILE.dpkg-tmp"
-fi
-
-# debconf hangs if lightdm gets started below without this
-db_stop || true
-
-# update-rc.d levels
-S=30
-K=01
-
-if [ -x /etc/init.d/lightdm ]; then
- update-rc.d lightdm defaults $S $K >/dev/null 2>&1
-fi
-
-if [ "$1" = "configure" ];
-then
- invoke-rc.d dbus reload
-fi
-
-#DEBHELPER#
-
-exit 0
Copied: goodies/tags/lightdm/1.0.0-2/debian/lightdm.postinst (from rev 6061, goodies/trunk/lightdm/debian/lightdm.postinst)
===================================================================
--- goodies/tags/lightdm/1.0.0-2/debian/lightdm.postinst (rev 0)
+++ goodies/tags/lightdm/1.0.0-2/debian/lightdm.postinst 2011-09-29 11:19:05 UTC (rev 6078)
@@ -0,0 +1,69 @@
+#!/bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+
+THIS_PACKAGE=lightdm
+DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager
+
+# creating lightdm group if he isn't already there
+if ! getent group lightdm >/dev/null; then
+ addgroup --system lightdm
+fi
+
+# creating lightdm user if he isn't already there
+if ! getent passwd lightdm >/dev/null; then
+ adduser --system --ingroup lightdm --home /var/lib/lightdm lightdm
+ usermod -c "Light Display Manager" lightdm
+ usermod -d "/var/lib/lightdm" lightdm
+ usermod -g "lightdm" lightdm
+ usermod -s "/bin/false" lightdm
+fi
+
+if [ -d /var/lib/lightdm ]; then
+ chown -R lightdm:lightdm /var/lib/lightdm
+ chmod 0750 /var/lib/lightdm
+fi
+
+# debconf is not a registry, so we only fiddle with the default file if it
+# does not exist
+if [ ! -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then
+ if db_get shared/default-x-display-manager; then
+ # workaround debconf passthru bug (#379198)
+ if [ -z "$RET" ]; then
+ $RET="$THIS_PACKAGE"
+ fi
+ if [ "$THIS_PACKAGE" != "$RET" ]; then
+ echo "Please be sure to run \"dpkg --configure $RET\"."
+ fi
+ if db_get "$RET"/daemon_name; then
+ echo "$RET" > $DEFAULT_DISPLAY_MANAGER_FILE
+ fi
+ fi
+fi
+
+# remove the displaced old default display manager file if it exists
+if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE.dpkg-tmp" ]; then
+ rm "$DEFAULT_DISPLAY_MANAGER_FILE.dpkg-tmp"
+fi
+
+# debconf hangs if lightdm gets started below without this
+db_stop || true
+
+# update-rc.d levels
+S=30
+K=01
+
+if [ -x /etc/init.d/lightdm ]; then
+ update-rc.d lightdm defaults $S $K >/dev/null 2>&1
+fi
+
+if [ "$1" = "configure" ];
+then
+ invoke-rc.d dbus reload || true
+fi
+
+#DEBHELPER#
+
+exit 0
Deleted: goodies/tags/lightdm/1.0.0-2/debian/patches/01_set-default-path.patch
===================================================================
--- goodies/trunk/lightdm/debian/patches/01_set-default-path.patch 2011-09-26 18:39:14 UTC (rev 6054)
+++ goodies/tags/lightdm/1.0.0-2/debian/patches/01_set-default-path.patch 2011-09-29 11:19:05 UTC (rev 6078)
@@ -1,20 +0,0 @@
-Author: Yves-Alexis Perez <corsac at debian.org>
-Author: Lionel Le Folgoc <mrpouit at gmail.com>
-Bug: https://bugs.launchpad.net/ubuntu/+source/lightdm/+bug/798277
-Description: Fix default PATH environment variable
-Index: lightdm-0.9.6/src/session.c
-===================================================================
---- lightdm-0.9.6.orig/src/session.c 2011-09-11 07:48:18.000000000 +0200
-+++ lightdm-0.9.6/src/session.c 2011-09-15 10:30:54.498966614 +0200
-@@ -194,7 +194,10 @@
- pam_session_open (session->priv->authentication);
-
- user = pam_session_get_user (session->priv->authentication);
-- process_set_env (PROCESS (session), "PATH", "/usr/local/bin:/usr/bin:/bin");
-+ if (user_get_uid (user) == 0)
-+ process_set_env (PROCESS (session), "PATH", "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin");
-+ else
-+ process_set_env (PROCESS (session), "PATH", "/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games");
- process_set_env (PROCESS (session), "USER", user_get_name (user));
- process_set_env (PROCESS (session), "USERNAME", user_get_name (user)); // FIXME: Is this required?
- process_set_env (PROCESS (session), "HOME", user_get_home_directory (user));
Copied: goodies/tags/lightdm/1.0.0-2/debian/patches/01_set-default-path.patch (from rev 6056, goodies/trunk/lightdm/debian/patches/01_set-default-path.patch)
===================================================================
--- goodies/tags/lightdm/1.0.0-2/debian/patches/01_set-default-path.patch (rev 0)
+++ goodies/tags/lightdm/1.0.0-2/debian/patches/01_set-default-path.patch 2011-09-29 11:19:05 UTC (rev 6078)
@@ -0,0 +1,20 @@
+Author: Yves-Alexis Perez <corsac at debian.org>
+Author: Lionel Le Folgoc <mrpouit at gmail.com>
+Bug: https://bugs.launchpad.net/ubuntu/+source/lightdm/+bug/798277
+Description: Fix default PATH environment variable
+Index: lightdm-1.0.0/src/session.c
+===================================================================
+--- lightdm-1.0.0.orig/src/session.c 2011-09-28 04:46:15.000000000 +0200
++++ lightdm-1.0.0/src/session.c 2011-09-28 13:20:42.530765164 +0200
+@@ -269,7 +269,10 @@
+ g_debug ("Launching session");
+
+ user = pam_session_get_user (session->priv->authentication);
+- session_set_env (session, "PATH", "/usr/local/bin:/usr/bin:/bin");
++ if (user_get_uid (user) == 0)
++ session_set_env (session, "PATH", "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin");
++ else
++ session_set_env (session, "PATH", "/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games");
+ session_set_env (session, "USER", user_get_name (user));
+ session_set_env (session, "USERNAME", user_get_name (user)); // FIXME: Is this required?
+ session_set_env (session, "HOME", user_get_home_directory (user));
Deleted: goodies/tags/lightdm/1.0.0-2/debian/patches/02_default-config.patch
===================================================================
--- goodies/trunk/lightdm/debian/patches/02_default-config.patch 2011-09-26 18:39:14 UTC (rev 6054)
+++ goodies/tags/lightdm/1.0.0-2/debian/patches/02_default-config.patch 2011-09-29 11:19:05 UTC (rev 6078)
@@ -1,29 +0,0 @@
-Author: Yves-Alexis Perez <corsac at debian.org>
-Author: Lionel Le Folgoc <mrpouit at gmail.com>
-Description: adapt config to Debian
-Especially:
-
-* use X11 session wrapper
-* start on vt7
-* don't show userlist
-
-=== modified file 'data/lightdm.conf'
-Index: lightdm-0.9.5/data/lightdm.conf
-===================================================================
---- lightdm-0.9.5.orig/data/lightdm.conf 2011-09-05 04:41:55.000000000 +0200
-+++ lightdm-0.9.5/data/lightdm.conf 2011-09-07 09:23:02.784668233 +0200
-@@ -59,11 +59,11 @@
- #xdmcp-port=177
- #xdmcp-key=
- #greeter-session=example-gtk-gnome
--#greeter-hide-users=false
--#user-session=default
-+greeter-hide-users=true
-+user-session=lightdm-xsession
- #allow-guest=true
- #guest-session=UNIMPLEMENTED
--#session-wrapper=lightdm-session
-+session-wrapper=/etc/X11/Xsession
- #display-setup-script=
- #greeter-setup-script=
- #session-setup-script=
Copied: goodies/tags/lightdm/1.0.0-2/debian/patches/02_default-config.patch (from rev 6060, goodies/trunk/lightdm/debian/patches/02_default-config.patch)
===================================================================
--- goodies/tags/lightdm/1.0.0-2/debian/patches/02_default-config.patch (rev 0)
+++ goodies/tags/lightdm/1.0.0-2/debian/patches/02_default-config.patch 2011-09-29 11:19:05 UTC (rev 6078)
@@ -0,0 +1,35 @@
+Author: Yves-Alexis Perez <corsac at debian.org>
+Author: Lionel Le Folgoc <mrpouit at gmail.com>
+Description: adapt config to Debian
+Especially:
+
+* use X11 session wrapper
+* start on vt7
+* don't show userlist
+
+=== modified file 'data/lightdm.conf'
+Index: lightdm-1.0.0/data/lightdm.conf
+===================================================================
+--- lightdm-1.0.0.orig/data/lightdm.conf 2011-09-20 05:41:07.000000000 +0200
++++ lightdm-1.0.0/data/lightdm.conf 2011-09-28 15:06:06.875716076 +0200
+@@ -56,16 +56,16 @@
+ #xserver-command=X
+ #xserver-layout=
+ #xserver-config=
+-#xserver-allow-tcp=false
++xserver-allow-tcp=false
+ #xdmcp-manager=
+ #xdmcp-port=177
+ #xdmcp-key=
+ #greeter-session=example-gtk-gnome
+-#greeter-hide-users=false
+-#user-session=default
++greeter-hide-users=true
++user-session=lightdm-xsession
+ #allow-guest=true
+ #guest-session=UNIMPLEMENTED
+-#session-wrapper=lightdm-session
++session-wrapper=/etc/X11/Xsession
+ #display-setup-script=
+ #greeter-setup-script=
+ #session-setup-script=
Deleted: goodies/tags/lightdm/1.0.0-2/debian/patches/03_quit-plymouth.patch
===================================================================
--- goodies/trunk/lightdm/debian/patches/03_quit-plymouth.patch 2011-09-26 18:39:14 UTC (rev 6054)
+++ goodies/tags/lightdm/1.0.0-2/debian/patches/03_quit-plymouth.patch 2011-09-29 11:19:05 UTC (rev 6078)
@@ -1,19 +0,0 @@
-Author: Yves-Alexis Perez <corsac at debian.org>
-Description: quit plymouth instead of deactivating it
-plymouth is quitted from the /etc/init.d/plymouth script, but it'll hang if
-plymouth has been deactivated before, so just quit it for now.
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=632737
-Bug: https://bugs.launchpad.net/ubuntu/+source/lightdm/+bug/799069
-Index: lightdm-0.9.6/src/xserver-local.c
-===================================================================
---- lightdm-0.9.6.orig/src/xserver-local.c 2011-09-15 08:56:23.000000000 +0200
-+++ lightdm-0.9.6/src/xserver-local.c 2011-09-15 10:31:02.015093674 +0200
-@@ -98,7 +98,7 @@
- g_debug ("X server %s will replace Plymouth", xserver_get_address (XSERVER (self)));
- self->priv->replacing_plymouth = TRUE;
- self->priv->vt = active_vt;
-- plymouth_deactivate ();
-+ plymouth_quit (FALSE);
- }
- else
- g_debug ("Plymouth is running on VT %d, but this is less than the configured minimum of %d so not replacing it", active_vt, vt_get_min ());
Copied: goodies/tags/lightdm/1.0.0-2/debian/patches/03_quit-plymouth.patch (from rev 6056, goodies/trunk/lightdm/debian/patches/03_quit-plymouth.patch)
===================================================================
--- goodies/tags/lightdm/1.0.0-2/debian/patches/03_quit-plymouth.patch (rev 0)
+++ goodies/tags/lightdm/1.0.0-2/debian/patches/03_quit-plymouth.patch 2011-09-29 11:19:05 UTC (rev 6078)
@@ -0,0 +1,19 @@
+Author: Yves-Alexis Perez <corsac at debian.org>
+Description: quit plymouth instead of deactivating it
+plymouth is quitted from the /etc/init.d/plymouth script, but it'll hang if
+plymouth has been deactivated before, so just quit it for now.
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=632737
+Bug: https://bugs.launchpad.net/ubuntu/+source/lightdm/+bug/799069
+Index: lightdm-1.0.0/src/xserver-local.c
+===================================================================
+--- lightdm-1.0.0.orig/src/xserver-local.c 2011-09-28 04:36:58.000000000 +0200
++++ lightdm-1.0.0/src/xserver-local.c 2011-09-28 13:17:05.105082902 +0200
+@@ -139,7 +139,7 @@
+ g_debug ("X server %s will replace Plymouth", xserver_get_address (XSERVER (self)));
+ self->priv->replacing_plymouth = TRUE;
+ self->priv->vt = active_vt;
+- plymouth_deactivate ();
++ plymouth_quit (FALSE);
+ }
+ else
+ g_debug ("Plymouth is running on VT %d, but this is less than the configured minimum of %d so not replacing it", active_vt, vt_get_min ());
Deleted: goodies/tags/lightdm/1.0.0-2/debian/patches/04_default-gtk-greeter-config.patch
===================================================================
--- goodies/trunk/lightdm/debian/patches/04_default-gtk-greeter-config.patch 2011-09-26 18:39:14 UTC (rev 6054)
+++ goodies/tags/lightdm/1.0.0-2/debian/patches/04_default-gtk-greeter-config.patch 2011-09-29 11:19:05 UTC (rev 6078)
@@ -1,20 +0,0 @@
-Index: lightdm-0.9.4/greeters/gtk/lightdm-gtk-greeter.conf
-===================================================================
---- lightdm-0.9.4.orig/greeters/gtk/lightdm-gtk-greeter.conf 2011-07-22 05:24:36.000000000 +0200
-+++ lightdm-0.9.4/greeters/gtk/lightdm-gtk-greeter.conf 2011-09-07 09:21:05.291942506 +0200
-@@ -8,10 +8,10 @@
- # xft-rgba = Type of subpixel antialiasing (none, rgb, bgr, vrgb or vbgr)
- #
- [greeter]
--#background=
--#theme-name=
-+background=/usr/share/images/desktop-base/desktop-background
-+theme-name=Adwaita
- #font-name=
--#xft-antialias=
-+xft-antialias=true
- #xft-dpi=
--#xft-hintstyle=
--#xft-rgba=
-+xft-hintstyle=hintfull
-+xft-rgba=rgb
Copied: goodies/tags/lightdm/1.0.0-2/debian/patches/04_default-gtk-greeter-config.patch (from rev 6056, goodies/trunk/lightdm/debian/patches/04_default-gtk-greeter-config.patch)
===================================================================
--- goodies/tags/lightdm/1.0.0-2/debian/patches/04_default-gtk-greeter-config.patch (rev 0)
+++ goodies/tags/lightdm/1.0.0-2/debian/patches/04_default-gtk-greeter-config.patch 2011-09-29 11:19:05 UTC (rev 6078)
@@ -0,0 +1,21 @@
+Index: lightdm-1.0.0/greeters/gtk/lightdm-gtk-greeter.conf
+===================================================================
+--- lightdm-1.0.0.orig/greeters/gtk/lightdm-gtk-greeter.conf 2011-09-20 03:45:23.000000000 +0200
++++ lightdm-1.0.0/greeters/gtk/lightdm-gtk-greeter.conf 2011-09-28 13:18:07.865571415 +0200
+@@ -8,11 +8,11 @@
+ # xft-rgba = Type of subpixel antialiasing (none, rgb, bgr, vrgb or vbgr)
+ #
+ [greeter]
+-#background=
++background=/usr/share/images/desktop-base/desktop-background
+ #show-language-selector=false
+-#theme-name=
++theme-name=Adwaita
+ #font-name=
+-#xft-antialias=
++xft-antialias=true
+ #xft-dpi=
+-#xft-hintstyle=
+-#xft-rgba=
++xft-hintstyle=hintfull
++xft-rgba=rgb
Deleted: goodies/tags/lightdm/1.0.0-2/debian/patches/05_dont-add-pkglibexecdir-path.patch
===================================================================
--- goodies/trunk/lightdm/debian/patches/05_dont-add-pkglibexecdir-path.patch 2011-09-26 18:39:14 UTC (rev 6054)
+++ goodies/tags/lightdm/1.0.0-2/debian/patches/05_dont-add-pkglibexecdir-path.patch 2011-09-29 11:19:05 UTC (rev 6078)
@@ -1,24 +0,0 @@
-Index: lightdm-0.9.6/src/session.c
-===================================================================
---- lightdm-0.9.6.orig/src/session.c 2011-09-15 10:30:54.498966614 +0200
-+++ lightdm-0.9.6/src/session.c 2011-09-15 10:31:07.439185287 +0200
-@@ -204,19 +204,6 @@
- process_set_env (PROCESS (session), "SHELL", user_get_shell (user));
- set_env_from_authentication (session, session->priv->authentication);
-
-- /* Insert our own utility directory to PATH
-- * This is to provide gdmflexiserver which provides backwards compatibility with GDM.
-- * Must be done after set_env_from_authentication because that often sets PATH.
-- * This can be removed when this is no longer required.
-- */
-- orig_path = process_get_env (PROCESS (session), "PATH");
-- if (orig_path)
-- {
-- gchar *path = g_strdup_printf ("%s:%s", PKGLIBEXEC_DIR, orig_path);
-- process_set_env (PROCESS (session), "PATH", path);
-- g_free (path);
-- }
--
- if (session->priv->cookie)
- process_set_env (PROCESS (session), "XDG_SESSION_COOKIE", session->priv->cookie);
-
Copied: goodies/tags/lightdm/1.0.0-2/debian/patches/05_dont-add-pkglibexecdir-path.patch (from rev 6056, goodies/trunk/lightdm/debian/patches/05_dont-add-pkglibexecdir-path.patch)
===================================================================
--- goodies/tags/lightdm/1.0.0-2/debian/patches/05_dont-add-pkglibexecdir-path.patch (rev 0)
+++ goodies/tags/lightdm/1.0.0-2/debian/patches/05_dont-add-pkglibexecdir-path.patch 2011-09-29 11:19:05 UTC (rev 6078)
@@ -0,0 +1,24 @@
+Index: lightdm-1.0.0/src/session.c
+===================================================================
+--- lightdm-1.0.0.orig/src/session.c 2011-09-28 12:21:52.000000000 +0200
++++ lightdm-1.0.0/src/session.c 2011-09-28 13:18:55.821939827 +0200
+@@ -297,19 +297,6 @@
+ process_set_command (PROCESS (session), absolute_command);
+ g_free (absolute_command);
+
+- /* Insert our own utility directory to PATH
+- * This is to provide gdmflexiserver which provides backwards compatibility with GDM.
+- * Must be done after set_env_from_authentication because that often sets PATH.
+- * This can be removed when this is no longer required.
+- */
+- orig_path = session_get_env (session, "PATH");
+- if (orig_path)
+- {
+- gchar *path = g_strdup_printf ("%s:%s", PKGLIBEXEC_DIR, orig_path);
+- session_set_env (session, "PATH", path);
+- g_free (path);
+- }
+-
+ pam_session_open (session->priv->authentication);
+
+ /* Open ConsoleKit session */
Copied: goodies/tags/lightdm/1.0.0-2/debian/patches/06_move-lightdm-set-defaults-to-pkglibexecdir.patch (from rev 6074, goodies/trunk/lightdm/debian/patches/06_move-lightdm-set-defaults-to-pkglibexecdir.patch)
===================================================================
--- goodies/tags/lightdm/1.0.0-2/debian/patches/06_move-lightdm-set-defaults-to-pkglibexecdir.patch (rev 0)
+++ goodies/tags/lightdm/1.0.0-2/debian/patches/06_move-lightdm-set-defaults-to-pkglibexecdir.patch 2011-09-29 11:19:05 UTC (rev 6078)
@@ -0,0 +1,11 @@
+Index: lightdm-1.0.0/utils/Makefile.am
+===================================================================
+--- lightdm-1.0.0.orig/utils/Makefile.am 2011-08-17 03:25:49.000000000 +0200
++++ lightdm-1.0.0/utils/Makefile.am 2011-09-29 11:44:37.350238126 +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 = \
Deleted: goodies/tags/lightdm/1.0.0-2/debian/patches/series
===================================================================
--- goodies/trunk/lightdm/debian/patches/series 2011-09-26 18:39:14 UTC (rev 6054)
+++ goodies/tags/lightdm/1.0.0-2/debian/patches/series 2011-09-29 11:19:05 UTC (rev 6078)
@@ -1,5 +0,0 @@
-01_set-default-path.patch
-02_default-config.patch
-03_quit-plymouth.patch
-04_default-gtk-greeter-config.patch
-05_dont-add-pkglibexecdir-path.patch
Copied: goodies/tags/lightdm/1.0.0-2/debian/patches/series (from rev 6074, goodies/trunk/lightdm/debian/patches/series)
===================================================================
--- goodies/tags/lightdm/1.0.0-2/debian/patches/series (rev 0)
+++ goodies/tags/lightdm/1.0.0-2/debian/patches/series 2011-09-29 11:19:05 UTC (rev 6078)
@@ -0,0 +1,6 @@
+01_set-default-path.patch
+02_default-config.patch
+03_quit-plymouth.patch
+04_default-gtk-greeter-config.patch
+05_dont-add-pkglibexecdir-path.patch
+06_move-lightdm-set-defaults-to-pkglibexecdir.patch
Deleted: goodies/tags/lightdm/1.0.0-2/debian/rules
===================================================================
--- goodies/trunk/lightdm/debian/rules 2011-09-26 18:39:14 UTC (rev 6054)
+++ goodies/tags/lightdm/1.0.0-2/debian/rules 2011-09-29 11:19:05 UTC (rev 6078)
@@ -1,29 +0,0 @@
-#!/usr/bin/make -f
-
-include /usr/share/hardening-includes/hardening.make
-
-CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
-CXXFLAGS=$(shell dpkg-buildflags --get CXXFLAGS)
-LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
-#LDFLAGS += -Wl,-O1 -Wl,-z,defs -Wl,--as-needed
-CFLAGS+=$(HARDENING_CFLAGS)
-CXXFLAGS+=$(HARDENING_CFLAGS)
-LDFLAGS+=$(HARDENING_LDFLAGS)
-
-export CFLAGS CXXFLAGS LDFLAGS
-
-override_dh_auto_configure:
- dh_auto_configure -- --with-greeter-user=lightdm --with-user-session=lightdm-xsession
-
-override_dh_installinit:
- dh_installinit --noscripts
-
-override_dh_install:
- find debian/tmp -name '*.la' -delete
- rm debian/tmp/usr/lib/lightdm/lightdm/gdmflexiserver
- dh_install --fail-missing
-
-%:
- dh $@
-
-override_dh_auto_test:
Copied: goodies/tags/lightdm/1.0.0-2/debian/rules (from rev 6074, goodies/trunk/lightdm/debian/rules)
===================================================================
--- goodies/tags/lightdm/1.0.0-2/debian/rules (rev 0)
+++ goodies/tags/lightdm/1.0.0-2/debian/rules 2011-09-29 11:19:05 UTC (rev 6078)
@@ -0,0 +1,22 @@
+#!/usr/bin/make -f
+
+export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed -Wl,-O1
+export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow
+
+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
+
+override_dh_installinit:
+ dh_installinit --noscripts
+
+override_dh_install:
+ find debian/tmp -name '*.la' -delete
+ rm debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/lightdm/gdmflexiserver
+ dh_install --fail-missing
+
+%:
+ dh $@ --with autoreconf
+
+override_dh_auto_test:
More information about the Pkg-xfce-commits
mailing list