[arch-commits] Commit in sddm/repos (12 files)
Felix Yan
fyan at archlinux.org
Tue Aug 18 03:26:25 UTC 2015
Date: Tuesday, August 18, 2015 @ 05:26:23
Author: fyan
Revision: 243849
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
sddm/repos/testing-i686/PKGBUILD
(from rev 243848, sddm/trunk/PKGBUILD)
sddm/repos/testing-i686/kubuntu_dbus-config-rename.patch
(from rev 243848, sddm/trunk/kubuntu_dbus-config-rename.patch)
sddm/repos/testing-i686/sddm.install
(from rev 243848, sddm/trunk/sddm.install)
sddm/repos/testing-x86_64/PKGBUILD
(from rev 243848, sddm/trunk/PKGBUILD)
sddm/repos/testing-x86_64/kubuntu_dbus-config-rename.patch
(from rev 243848, sddm/trunk/kubuntu_dbus-config-rename.patch)
sddm/repos/testing-x86_64/sddm.install
(from rev 243848, sddm/trunk/sddm.install)
Deleted:
sddm/repos/testing-i686/PKGBUILD
sddm/repos/testing-i686/kubuntu_dbus-config-rename.patch
sddm/repos/testing-i686/sddm.install
sddm/repos/testing-x86_64/PKGBUILD
sddm/repos/testing-x86_64/kubuntu_dbus-config-rename.patch
sddm/repos/testing-x86_64/sddm.install
-------------------------------------------------+
/PKGBUILD | 86 ++++++++++++++++++++++
/kubuntu_dbus-config-rename.patch | 26 ++++++
/sddm.install | 48 ++++++++++++
testing-i686/PKGBUILD | 44 -----------
testing-i686/kubuntu_dbus-config-rename.patch | 13 ---
testing-i686/sddm.install | 24 ------
testing-x86_64/PKGBUILD | 44 -----------
testing-x86_64/kubuntu_dbus-config-rename.patch | 13 ---
testing-x86_64/sddm.install | 24 ------
9 files changed, 160 insertions(+), 162 deletions(-)
Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD 2015-08-18 03:25:36 UTC (rev 243848)
+++ testing-i686/PKGBUILD 2015-08-18 03:26:23 UTC (rev 243849)
@@ -1,44 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=sddm
-pkgver=0.11.0
-pkgrel=2
-pkgdesc='QML based X11 display manager'
-arch=('i686' 'x86_64')
-url='http://github.com/sddm/sddm'
-license=('GPL')
-depends=('qt5-declarative')
-makedepends=('cmake' 'python-docutils' 'qt5-tools')
-install="${pkgname}.install"
-backup=('usr/share/sddm/scripts/Xsetup')
-conflicts=('display-manager')
-provides=('display-manager')
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/${pkgname}/${pkgname}/archive/v${pkgver}.tar.gz"
- kubuntu_dbus-config-rename.patch)
-md5sums=('e110a7683867400dc9484d4744fd41dd'
- '7c2934003e61c46d1d82d3d9a93ed35b')
-
-prepare() {
- mkdir -p build
-
- cd $pkgname-$pkgver
- # FS#42445
- patch -p1 -i ../kubuntu_dbus-config-rename.patch
-}
-
-build() {
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib/sddm \
- -DBUILD_MAN_PAGES=ON
- make
-}
-
-package() {
- cd build
- make DESTDIR="${pkgdir}" install
-}
Copied: sddm/repos/testing-i686/PKGBUILD (from rev 243848, sddm/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2015-08-18 03:26:23 UTC (rev 243849)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=sddm
+pkgver=0.11.0
+pkgrel=3
+pkgdesc='QML based X11 display manager'
+arch=('i686' 'x86_64')
+url='http://github.com/sddm/sddm'
+license=('GPL')
+depends=('qt5-declarative')
+makedepends=('cmake' 'python-docutils' 'qt5-tools')
+install="${pkgname}.install"
+backup=('usr/share/sddm/scripts/Xsetup')
+provides=('display-manager')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/${pkgname}/${pkgname}/archive/v${pkgver}.tar.gz"
+ kubuntu_dbus-config-rename.patch)
+md5sums=('e110a7683867400dc9484d4744fd41dd'
+ '7c2934003e61c46d1d82d3d9a93ed35b')
+
+prepare() {
+ mkdir -p build
+
+ cd $pkgname-$pkgver
+ # FS#42445
+ patch -p1 -i ../kubuntu_dbus-config-rename.patch
+}
+
+build() {
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib/sddm \
+ -DBUILD_MAN_PAGES=ON
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="${pkgdir}" install
+}
Deleted: testing-i686/kubuntu_dbus-config-rename.patch
===================================================================
--- testing-i686/kubuntu_dbus-config-rename.patch 2015-08-18 03:25:36 UTC (rev 243848)
+++ testing-i686/kubuntu_dbus-config-rename.patch 2015-08-18 03:26:23 UTC (rev 243849)
@@ -1,13 +0,0 @@
-Index: sddm-0.1.0+git20140718/data/CMakeLists.txt
-===================================================================
---- sddm-0.1.0+git20140718.orig/data/CMakeLists.txt 2014-07-18 11:36:58.974892509 +0200
-+++ sddm-0.1.0+git20140718/data/CMakeLists.txt 2014-07-18 11:36:58.970892509 +0200
-@@ -1,7 +1,7 @@
- install(DIRECTORY "faces" DESTINATION "${DATA_INSTALL_DIR}")
- install(DIRECTORY "flags" DESTINATION "${DATA_INSTALL_DIR}")
-
--install(FILES "org.freedesktop.DisplayManager.conf" DESTINATION "${DBUS_CONFIG_DIR}")
-+install(FILES "org.freedesktop.DisplayManager.conf" DESTINATION "${DBUS_CONFIG_DIR}" RENAME sddm_org.freedesktop.DisplayManager.conf)
-
- install(FILES "scripts/Xsession" "scripts/Xsetup" DESTINATION "${DATA_INSTALL_DIR}/scripts"
- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
Copied: sddm/repos/testing-i686/kubuntu_dbus-config-rename.patch (from rev 243848, sddm/trunk/kubuntu_dbus-config-rename.patch)
===================================================================
--- testing-i686/kubuntu_dbus-config-rename.patch (rev 0)
+++ testing-i686/kubuntu_dbus-config-rename.patch 2015-08-18 03:26:23 UTC (rev 243849)
@@ -0,0 +1,13 @@
+Index: sddm-0.1.0+git20140718/data/CMakeLists.txt
+===================================================================
+--- sddm-0.1.0+git20140718.orig/data/CMakeLists.txt 2014-07-18 11:36:58.974892509 +0200
++++ sddm-0.1.0+git20140718/data/CMakeLists.txt 2014-07-18 11:36:58.970892509 +0200
+@@ -1,7 +1,7 @@
+ install(DIRECTORY "faces" DESTINATION "${DATA_INSTALL_DIR}")
+ install(DIRECTORY "flags" DESTINATION "${DATA_INSTALL_DIR}")
+
+-install(FILES "org.freedesktop.DisplayManager.conf" DESTINATION "${DBUS_CONFIG_DIR}")
++install(FILES "org.freedesktop.DisplayManager.conf" DESTINATION "${DBUS_CONFIG_DIR}" RENAME sddm_org.freedesktop.DisplayManager.conf)
+
+ install(FILES "scripts/Xsession" "scripts/Xsetup" DESTINATION "${DATA_INSTALL_DIR}/scripts"
+ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
Deleted: testing-i686/sddm.install
===================================================================
--- testing-i686/sddm.install 2015-08-18 03:25:36 UTC (rev 243848)
+++ testing-i686/sddm.install 2015-08-18 03:26:23 UTC (rev 243849)
@@ -1,24 +0,0 @@
-post_install() {
- if ! getent group sddm > /dev/null; then
- groupadd --system sddm
- fi
- if ! getent passwd sddm > /dev/null; then
- useradd -c "Simple Desktop Display Manager" --system -d /var/lib/sddm -s /usr/bin/nologin -g sddm sddm
- passwd -l sddm > /dev/null
- fi
- mkdir -p /var/lib/sddm
- chown -R sddm:sddm /var/lib/sddm > /dev/null
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- if getent passwd sddm >/dev/null; then
- userdel sddm
- fi
- if getent group sddm >/dev/null; then
- groupdel sddm
- fi
-}
Copied: sddm/repos/testing-i686/sddm.install (from rev 243848, sddm/trunk/sddm.install)
===================================================================
--- testing-i686/sddm.install (rev 0)
+++ testing-i686/sddm.install 2015-08-18 03:26:23 UTC (rev 243849)
@@ -0,0 +1,24 @@
+post_install() {
+ if ! getent group sddm > /dev/null; then
+ groupadd --system sddm
+ fi
+ if ! getent passwd sddm > /dev/null; then
+ useradd -c "Simple Desktop Display Manager" --system -d /var/lib/sddm -s /usr/bin/nologin -g sddm sddm
+ passwd -l sddm > /dev/null
+ fi
+ mkdir -p /var/lib/sddm
+ chown -R sddm:sddm /var/lib/sddm > /dev/null
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ if getent passwd sddm >/dev/null; then
+ userdel sddm
+ fi
+ if getent group sddm >/dev/null; then
+ groupdel sddm
+ fi
+}
Deleted: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD 2015-08-18 03:25:36 UTC (rev 243848)
+++ testing-x86_64/PKGBUILD 2015-08-18 03:26:23 UTC (rev 243849)
@@ -1,44 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=sddm
-pkgver=0.11.0
-pkgrel=2
-pkgdesc='QML based X11 display manager'
-arch=('i686' 'x86_64')
-url='http://github.com/sddm/sddm'
-license=('GPL')
-depends=('qt5-declarative')
-makedepends=('cmake' 'python-docutils' 'qt5-tools')
-install="${pkgname}.install"
-backup=('usr/share/sddm/scripts/Xsetup')
-conflicts=('display-manager')
-provides=('display-manager')
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/${pkgname}/${pkgname}/archive/v${pkgver}.tar.gz"
- kubuntu_dbus-config-rename.patch)
-md5sums=('e110a7683867400dc9484d4744fd41dd'
- '7c2934003e61c46d1d82d3d9a93ed35b')
-
-prepare() {
- mkdir -p build
-
- cd $pkgname-$pkgver
- # FS#42445
- patch -p1 -i ../kubuntu_dbus-config-rename.patch
-}
-
-build() {
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib/sddm \
- -DBUILD_MAN_PAGES=ON
- make
-}
-
-package() {
- cd build
- make DESTDIR="${pkgdir}" install
-}
Copied: sddm/repos/testing-x86_64/PKGBUILD (from rev 243848, sddm/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2015-08-18 03:26:23 UTC (rev 243849)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=sddm
+pkgver=0.11.0
+pkgrel=3
+pkgdesc='QML based X11 display manager'
+arch=('i686' 'x86_64')
+url='http://github.com/sddm/sddm'
+license=('GPL')
+depends=('qt5-declarative')
+makedepends=('cmake' 'python-docutils' 'qt5-tools')
+install="${pkgname}.install"
+backup=('usr/share/sddm/scripts/Xsetup')
+provides=('display-manager')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/${pkgname}/${pkgname}/archive/v${pkgver}.tar.gz"
+ kubuntu_dbus-config-rename.patch)
+md5sums=('e110a7683867400dc9484d4744fd41dd'
+ '7c2934003e61c46d1d82d3d9a93ed35b')
+
+prepare() {
+ mkdir -p build
+
+ cd $pkgname-$pkgver
+ # FS#42445
+ patch -p1 -i ../kubuntu_dbus-config-rename.patch
+}
+
+build() {
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib/sddm \
+ -DBUILD_MAN_PAGES=ON
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="${pkgdir}" install
+}
Deleted: testing-x86_64/kubuntu_dbus-config-rename.patch
===================================================================
--- testing-x86_64/kubuntu_dbus-config-rename.patch 2015-08-18 03:25:36 UTC (rev 243848)
+++ testing-x86_64/kubuntu_dbus-config-rename.patch 2015-08-18 03:26:23 UTC (rev 243849)
@@ -1,13 +0,0 @@
-Index: sddm-0.1.0+git20140718/data/CMakeLists.txt
-===================================================================
---- sddm-0.1.0+git20140718.orig/data/CMakeLists.txt 2014-07-18 11:36:58.974892509 +0200
-+++ sddm-0.1.0+git20140718/data/CMakeLists.txt 2014-07-18 11:36:58.970892509 +0200
-@@ -1,7 +1,7 @@
- install(DIRECTORY "faces" DESTINATION "${DATA_INSTALL_DIR}")
- install(DIRECTORY "flags" DESTINATION "${DATA_INSTALL_DIR}")
-
--install(FILES "org.freedesktop.DisplayManager.conf" DESTINATION "${DBUS_CONFIG_DIR}")
-+install(FILES "org.freedesktop.DisplayManager.conf" DESTINATION "${DBUS_CONFIG_DIR}" RENAME sddm_org.freedesktop.DisplayManager.conf)
-
- install(FILES "scripts/Xsession" "scripts/Xsetup" DESTINATION "${DATA_INSTALL_DIR}/scripts"
- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
Copied: sddm/repos/testing-x86_64/kubuntu_dbus-config-rename.patch (from rev 243848, sddm/trunk/kubuntu_dbus-config-rename.patch)
===================================================================
--- testing-x86_64/kubuntu_dbus-config-rename.patch (rev 0)
+++ testing-x86_64/kubuntu_dbus-config-rename.patch 2015-08-18 03:26:23 UTC (rev 243849)
@@ -0,0 +1,13 @@
+Index: sddm-0.1.0+git20140718/data/CMakeLists.txt
+===================================================================
+--- sddm-0.1.0+git20140718.orig/data/CMakeLists.txt 2014-07-18 11:36:58.974892509 +0200
++++ sddm-0.1.0+git20140718/data/CMakeLists.txt 2014-07-18 11:36:58.970892509 +0200
+@@ -1,7 +1,7 @@
+ install(DIRECTORY "faces" DESTINATION "${DATA_INSTALL_DIR}")
+ install(DIRECTORY "flags" DESTINATION "${DATA_INSTALL_DIR}")
+
+-install(FILES "org.freedesktop.DisplayManager.conf" DESTINATION "${DBUS_CONFIG_DIR}")
++install(FILES "org.freedesktop.DisplayManager.conf" DESTINATION "${DBUS_CONFIG_DIR}" RENAME sddm_org.freedesktop.DisplayManager.conf)
+
+ install(FILES "scripts/Xsession" "scripts/Xsetup" DESTINATION "${DATA_INSTALL_DIR}/scripts"
+ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
Deleted: testing-x86_64/sddm.install
===================================================================
--- testing-x86_64/sddm.install 2015-08-18 03:25:36 UTC (rev 243848)
+++ testing-x86_64/sddm.install 2015-08-18 03:26:23 UTC (rev 243849)
@@ -1,24 +0,0 @@
-post_install() {
- if ! getent group sddm > /dev/null; then
- groupadd --system sddm
- fi
- if ! getent passwd sddm > /dev/null; then
- useradd -c "Simple Desktop Display Manager" --system -d /var/lib/sddm -s /usr/bin/nologin -g sddm sddm
- passwd -l sddm > /dev/null
- fi
- mkdir -p /var/lib/sddm
- chown -R sddm:sddm /var/lib/sddm > /dev/null
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- if getent passwd sddm >/dev/null; then
- userdel sddm
- fi
- if getent group sddm >/dev/null; then
- groupdel sddm
- fi
-}
Copied: sddm/repos/testing-x86_64/sddm.install (from rev 243848, sddm/trunk/sddm.install)
===================================================================
--- testing-x86_64/sddm.install (rev 0)
+++ testing-x86_64/sddm.install 2015-08-18 03:26:23 UTC (rev 243849)
@@ -0,0 +1,24 @@
+post_install() {
+ if ! getent group sddm > /dev/null; then
+ groupadd --system sddm
+ fi
+ if ! getent passwd sddm > /dev/null; then
+ useradd -c "Simple Desktop Display Manager" --system -d /var/lib/sddm -s /usr/bin/nologin -g sddm sddm
+ passwd -l sddm > /dev/null
+ fi
+ mkdir -p /var/lib/sddm
+ chown -R sddm:sddm /var/lib/sddm > /dev/null
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ if getent passwd sddm >/dev/null; then
+ userdel sddm
+ fi
+ if getent group sddm >/dev/null; then
+ groupdel sddm
+ fi
+}
More information about the arch-commits
mailing list