[arch-commits] Commit in xdg-user-dirs/repos (12 files)

Jan Steffens heftig at archlinux.org
Tue Sep 5 14:36:23 UTC 2017


    Date: Tuesday, September 5, 2017 @ 14:36:22
  Author: heftig
Revision: 304691

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  xdg-user-dirs/repos/extra-i686/PKGBUILD
    (from rev 304690, xdg-user-dirs/trunk/PKGBUILD)
  xdg-user-dirs/repos/extra-i686/xdg-user-dirs-update.service
    (from rev 304690, xdg-user-dirs/trunk/xdg-user-dirs-update.service)
  xdg-user-dirs/repos/extra-i686/xdg-user-dirs.install
    (from rev 304690, xdg-user-dirs/trunk/xdg-user-dirs.install)
  xdg-user-dirs/repos/extra-x86_64/PKGBUILD
    (from rev 304690, xdg-user-dirs/trunk/PKGBUILD)
  xdg-user-dirs/repos/extra-x86_64/xdg-user-dirs-update.service
    (from rev 304690, xdg-user-dirs/trunk/xdg-user-dirs-update.service)
  xdg-user-dirs/repos/extra-x86_64/xdg-user-dirs.install
    (from rev 304690, xdg-user-dirs/trunk/xdg-user-dirs.install)
Deleted:
  xdg-user-dirs/repos/extra-i686/PKGBUILD
  xdg-user-dirs/repos/extra-i686/xdg-user-dirs-update.service
  xdg-user-dirs/repos/extra-i686/xdg-user-dirs.install
  xdg-user-dirs/repos/extra-x86_64/PKGBUILD
  xdg-user-dirs/repos/extra-x86_64/xdg-user-dirs-update.service
  xdg-user-dirs/repos/extra-x86_64/xdg-user-dirs.install

-------------------------------------------+
 /PKGBUILD                                 |   96 ++++++++++++++++++++++++++++
 /xdg-user-dirs-update.service             |   20 +++++
 /xdg-user-dirs.install                    |   28 ++++++++
 extra-i686/PKGBUILD                       |   39 -----------
 extra-i686/xdg-user-dirs-update.service   |   10 --
 extra-i686/xdg-user-dirs.install          |   14 ----
 extra-x86_64/PKGBUILD                     |   39 -----------
 extra-x86_64/xdg-user-dirs-update.service |   10 --
 extra-x86_64/xdg-user-dirs.install        |   14 ----
 9 files changed, 144 insertions(+), 126 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2017-09-05 14:29:34 UTC (rev 304690)
+++ extra-i686/PKGBUILD	2017-09-05 14:36:22 UTC (rev 304691)
@@ -1,39 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: Stefan Husmann <stefan-husmann at t-online.de>
-# Contributor:  <mathieu.clabaut at gmail.com>
-
-pkgname=xdg-user-dirs
-pkgver=0.15
-pkgrel=4
-pkgdesc="Manage user directories like ~/Desktop and ~/Music"
-arch=(i686 x86_64)
-url="http://www.freedesktop.org/wiki/Software/xdg-user-dirs"
-license=(GPL)
-depends=(sh systemd)
-makedepends=(docbook-xsl git)
-backup=(etc/xdg/user-dirs.conf etc/xdg/user-dirs.defaults)
-install=xdg-user-dirs.install
-_commit=1cf7d3fd7ac6514bce9af8c8114f38c51d3de441
-source=("git+https://anongit.freedesktop.org/git/xdg/$pkgname#commit=$_commit"
-        xdg-user-dirs-update.service)
-sha256sums=('SKIP'
-            '53c75f52d782e9492601400236bc8e5bfa76a26f0afd9bce3fe8df1740d341f0')
-
-prepare() {
-  cd $pkgname
-  NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
-  cd $pkgname
-  ./configure --prefix=/usr --sysconfdir=/etc
-  make
-}
-
-package() {
-  cd $pkgname
-  make DESTDIR="$pkgdir" install 
-  install -Dm644 ../xdg-user-dirs-update.service \
-    "$pkgdir/usr/lib/systemd/user/xdg-user-dirs-update.service"
-}

Copied: xdg-user-dirs/repos/extra-i686/PKGBUILD (from rev 304690, xdg-user-dirs/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2017-09-05 14:36:22 UTC (rev 304691)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Stefan Husmann <stefan-husmann at t-online.de>
+# Contributor:  <mathieu.clabaut at gmail.com>
+
+pkgname=xdg-user-dirs
+pkgver=0.16
+pkgrel=1
+pkgdesc="Manage user directories like ~/Desktop and ~/Music"
+arch=(i686 x86_64)
+url="http://www.freedesktop.org/wiki/Software/xdg-user-dirs"
+license=(GPL)
+depends=(sh systemd)
+makedepends=(docbook-xsl git)
+backup=(etc/xdg/user-dirs.conf etc/xdg/user-dirs.defaults)
+install=xdg-user-dirs.install
+options=(!emptydirs)
+_commit=6fb1741bd9a2ccc66507daea2c76da83e1e19222  # tags/0.16^0
+source=("git+https://anongit.freedesktop.org/git/xdg/xdg-user-dirs#commit=$_commit"
+        xdg-user-dirs-update.service)
+sha256sums=('SKIP'
+            '53c75f52d782e9492601400236bc8e5bfa76a26f0afd9bce3fe8df1740d341f0')
+
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+  cd $pkgname
+  NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+  cd $pkgname
+  ./configure --prefix=/usr --sysconfdir=/etc
+  make
+}
+
+package() {
+  cd $pkgname
+  make DESTDIR="$pkgdir" install 
+
+  # We use a service
+  rm "$pkgdir/etc/xdg/autostart/xdg-user-dirs.desktop"
+  install -Dm644 ../xdg-user-dirs-update.service \
+    "$pkgdir/usr/lib/systemd/user/xdg-user-dirs-update.service"
+}

Deleted: extra-i686/xdg-user-dirs-update.service
===================================================================
--- extra-i686/xdg-user-dirs-update.service	2017-09-05 14:29:34 UTC (rev 304690)
+++ extra-i686/xdg-user-dirs-update.service	2017-09-05 14:36:22 UTC (rev 304691)
@@ -1,10 +0,0 @@
-[Unit]
-Description=Update XDG user dir configuration
-Documentation=man:xdg-user-dirs-update(1)
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/xdg-user-dirs-update
-
-[Install]
-WantedBy=default.target

Copied: xdg-user-dirs/repos/extra-i686/xdg-user-dirs-update.service (from rev 304690, xdg-user-dirs/trunk/xdg-user-dirs-update.service)
===================================================================
--- extra-i686/xdg-user-dirs-update.service	                        (rev 0)
+++ extra-i686/xdg-user-dirs-update.service	2017-09-05 14:36:22 UTC (rev 304691)
@@ -0,0 +1,10 @@
+[Unit]
+Description=Update XDG user dir configuration
+Documentation=man:xdg-user-dirs-update(1)
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/xdg-user-dirs-update
+
+[Install]
+WantedBy=default.target

Deleted: extra-i686/xdg-user-dirs.install
===================================================================
--- extra-i686/xdg-user-dirs.install	2017-09-05 14:29:34 UTC (rev 304690)
+++ extra-i686/xdg-user-dirs.install	2017-09-05 14:36:22 UTC (rev 304691)
@@ -1,14 +0,0 @@
-post_install() {
-  # Enable update by default
-  systemctl --global enable xdg-user-dirs-update.service
-}
-
-post_upgrade() {
-  if (( $(vercmp $2 0.15-3) < 0)); then
-    systemctl --global enable xdg-user-dirs-update.service
-  fi
-}
-
-pre_remove() {
-  systemctl --global disable xdg-user-dirs-update.service
-}

Copied: xdg-user-dirs/repos/extra-i686/xdg-user-dirs.install (from rev 304690, xdg-user-dirs/trunk/xdg-user-dirs.install)
===================================================================
--- extra-i686/xdg-user-dirs.install	                        (rev 0)
+++ extra-i686/xdg-user-dirs.install	2017-09-05 14:36:22 UTC (rev 304691)
@@ -0,0 +1,14 @@
+post_install() {
+  # Enable update by default
+  systemctl --global enable xdg-user-dirs-update.service
+}
+
+post_upgrade() {
+  if (( $(vercmp $2 0.15-3) < 0)); then
+    systemctl --global enable xdg-user-dirs-update.service
+  fi
+}
+
+pre_remove() {
+  systemctl --global disable xdg-user-dirs-update.service
+}

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2017-09-05 14:29:34 UTC (rev 304690)
+++ extra-x86_64/PKGBUILD	2017-09-05 14:36:22 UTC (rev 304691)
@@ -1,39 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: Stefan Husmann <stefan-husmann at t-online.de>
-# Contributor:  <mathieu.clabaut at gmail.com>
-
-pkgname=xdg-user-dirs
-pkgver=0.15
-pkgrel=4
-pkgdesc="Manage user directories like ~/Desktop and ~/Music"
-arch=(i686 x86_64)
-url="http://www.freedesktop.org/wiki/Software/xdg-user-dirs"
-license=(GPL)
-depends=(sh systemd)
-makedepends=(docbook-xsl git)
-backup=(etc/xdg/user-dirs.conf etc/xdg/user-dirs.defaults)
-install=xdg-user-dirs.install
-_commit=1cf7d3fd7ac6514bce9af8c8114f38c51d3de441
-source=("git+https://anongit.freedesktop.org/git/xdg/$pkgname#commit=$_commit"
-        xdg-user-dirs-update.service)
-sha256sums=('SKIP'
-            '53c75f52d782e9492601400236bc8e5bfa76a26f0afd9bce3fe8df1740d341f0')
-
-prepare() {
-  cd $pkgname
-  NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
-  cd $pkgname
-  ./configure --prefix=/usr --sysconfdir=/etc
-  make
-}
-
-package() {
-  cd $pkgname
-  make DESTDIR="$pkgdir" install 
-  install -Dm644 ../xdg-user-dirs-update.service \
-    "$pkgdir/usr/lib/systemd/user/xdg-user-dirs-update.service"
-}

Copied: xdg-user-dirs/repos/extra-x86_64/PKGBUILD (from rev 304690, xdg-user-dirs/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2017-09-05 14:36:22 UTC (rev 304691)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Stefan Husmann <stefan-husmann at t-online.de>
+# Contributor:  <mathieu.clabaut at gmail.com>
+
+pkgname=xdg-user-dirs
+pkgver=0.16
+pkgrel=1
+pkgdesc="Manage user directories like ~/Desktop and ~/Music"
+arch=(i686 x86_64)
+url="http://www.freedesktop.org/wiki/Software/xdg-user-dirs"
+license=(GPL)
+depends=(sh systemd)
+makedepends=(docbook-xsl git)
+backup=(etc/xdg/user-dirs.conf etc/xdg/user-dirs.defaults)
+install=xdg-user-dirs.install
+options=(!emptydirs)
+_commit=6fb1741bd9a2ccc66507daea2c76da83e1e19222  # tags/0.16^0
+source=("git+https://anongit.freedesktop.org/git/xdg/xdg-user-dirs#commit=$_commit"
+        xdg-user-dirs-update.service)
+sha256sums=('SKIP'
+            '53c75f52d782e9492601400236bc8e5bfa76a26f0afd9bce3fe8df1740d341f0')
+
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+  cd $pkgname
+  NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+  cd $pkgname
+  ./configure --prefix=/usr --sysconfdir=/etc
+  make
+}
+
+package() {
+  cd $pkgname
+  make DESTDIR="$pkgdir" install 
+
+  # We use a service
+  rm "$pkgdir/etc/xdg/autostart/xdg-user-dirs.desktop"
+  install -Dm644 ../xdg-user-dirs-update.service \
+    "$pkgdir/usr/lib/systemd/user/xdg-user-dirs-update.service"
+}

Deleted: extra-x86_64/xdg-user-dirs-update.service
===================================================================
--- extra-x86_64/xdg-user-dirs-update.service	2017-09-05 14:29:34 UTC (rev 304690)
+++ extra-x86_64/xdg-user-dirs-update.service	2017-09-05 14:36:22 UTC (rev 304691)
@@ -1,10 +0,0 @@
-[Unit]
-Description=Update XDG user dir configuration
-Documentation=man:xdg-user-dirs-update(1)
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/xdg-user-dirs-update
-
-[Install]
-WantedBy=default.target

Copied: xdg-user-dirs/repos/extra-x86_64/xdg-user-dirs-update.service (from rev 304690, xdg-user-dirs/trunk/xdg-user-dirs-update.service)
===================================================================
--- extra-x86_64/xdg-user-dirs-update.service	                        (rev 0)
+++ extra-x86_64/xdg-user-dirs-update.service	2017-09-05 14:36:22 UTC (rev 304691)
@@ -0,0 +1,10 @@
+[Unit]
+Description=Update XDG user dir configuration
+Documentation=man:xdg-user-dirs-update(1)
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/xdg-user-dirs-update
+
+[Install]
+WantedBy=default.target

Deleted: extra-x86_64/xdg-user-dirs.install
===================================================================
--- extra-x86_64/xdg-user-dirs.install	2017-09-05 14:29:34 UTC (rev 304690)
+++ extra-x86_64/xdg-user-dirs.install	2017-09-05 14:36:22 UTC (rev 304691)
@@ -1,14 +0,0 @@
-post_install() {
-  # Enable update by default
-  systemctl --global enable xdg-user-dirs-update.service
-}
-
-post_upgrade() {
-  if (( $(vercmp $2 0.15-3) < 0)); then
-    systemctl --global enable xdg-user-dirs-update.service
-  fi
-}
-
-pre_remove() {
-  systemctl --global disable xdg-user-dirs-update.service
-}

Copied: xdg-user-dirs/repos/extra-x86_64/xdg-user-dirs.install (from rev 304690, xdg-user-dirs/trunk/xdg-user-dirs.install)
===================================================================
--- extra-x86_64/xdg-user-dirs.install	                        (rev 0)
+++ extra-x86_64/xdg-user-dirs.install	2017-09-05 14:36:22 UTC (rev 304691)
@@ -0,0 +1,14 @@
+post_install() {
+  # Enable update by default
+  systemctl --global enable xdg-user-dirs-update.service
+}
+
+post_upgrade() {
+  if (( $(vercmp $2 0.15-3) < 0)); then
+    systemctl --global enable xdg-user-dirs-update.service
+  fi
+}
+
+pre_remove() {
+  systemctl --global disable xdg-user-dirs-update.service
+}



More information about the arch-commits mailing list