[arch-commits] Commit in xorg-xinit/trunk (PKGBUILD)

2020-05-16 Thread Evangelos Foutras via arch-commits
Date: Saturday, May 16, 2020 @ 14:03:39
  Author: foutrelis
Revision: 384729

upgpkg: xorg-xinit 1.4.1-2: reproducibility rebuild

Modified:
  xorg-xinit/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-05-16 14:03:36 UTC (rev 384728)
+++ PKGBUILD2020-05-16 14:03:39 UTC (rev 384729)
@@ -3,7 +3,7 @@
 
 pkgname=xorg-xinit
 pkgver=1.4.1
-pkgrel=1
+pkgrel=2
 pkgdesc="X.Org initialisation program "
 arch=('x86_64')
 license=('custom')


[arch-commits] Commit in xorg-xinit/trunk (PKGBUILD)

2019-03-04 Thread Andreas Radke via arch-commits
Date: Monday, March 4, 2019 @ 18:32:11
  Author: andyrtr
Revision: 347051

upgpkg: xorg-xinit 1.4.1-1

upstream update 1.4.1

Modified:
  xorg-xinit/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-03-04 18:29:47 UTC (rev 347050)
+++ PKGBUILD2019-03-04 18:32:11 UTC (rev 347051)
@@ -2,8 +2,8 @@
 # Contributor: Alexander Baldeck 
 
 pkgname=xorg-xinit
-pkgver=1.4.0
-pkgrel=3
+pkgver=1.4.1
+pkgrel=1
 pkgdesc="X.Org initialisation program "
 arch=('x86_64')
 license=('custom')
@@ -19,7 +19,7 @@
 fs46369.patch
 xserverrc)
 options=(!emptydirs)
-sha512sums=('53a29081130c1e195eb441ee77ccaa044b18b4cca3d2d5da3a6d67aa421dfd9718fa18b6be6232a41e40cf260c8190064c4d8d9ab771177bd5cd12e77a8fa79e'
+sha512sums=('6cbc5d025a891c419f3f4493381b2fca57a67d78df866d2f16a83426f86bad6eca7f240fac12b25cbcc63df0fec41f625407184e044898602d66483715315340'
 'SKIP'
 
'99216b2d50052a0bafede9a2db1744a8b0313ccbc02c609502ddacb8684fc56c6f2656e6521c848880033b25005bb14a1bce0d6fefade85141ed56aad07dadf3'
 
'12a89cbb26902e135bb21f945c8de86526ff879c9f20a2601157f6a39899f021ed2970cee9e4fbcd4c13af6fe78e7902dd1f7ce1928fc914d681453bf848c0f8'


[arch-commits] Commit in xorg-xinit/trunk (PKGBUILD fs25361.patch)

2018-03-13 Thread Andreas Radke via arch-commits
Date: Tuesday, March 13, 2018 @ 16:36:47
  Author: andyrtr
Revision: 318839

upgpkg: xorg-xinit 1.4.0-2

revert to old fs25361.patch status - 
FS#12a89cbb26902e135bb21f945c8de86526ff879c9f20a2601157f6a39899f021ed2970cee9e4fbcd4c13af6fe78e7902dd1f7ce1928fc914d681453bf848c0f8'

Modified:
  xorg-xinit/trunk/PKGBUILD
  xorg-xinit/trunk/fs25361.patch

---+
 PKGBUILD  |4 ++--
 fs25361.patch |   11 +++
 2 files changed, 9 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-03-13 16:13:02 UTC (rev 318838)
+++ PKGBUILD2018-03-13 16:36:47 UTC (rev 318839)
@@ -4,7 +4,7 @@
 
 pkgname=xorg-xinit
 pkgver=1.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc="X.Org initialisation program "
 arch=('x86_64')
 license=('custom')
@@ -21,7 +21,7 @@
 options=(!emptydirs)
 
sha512sums=('53a29081130c1e195eb441ee77ccaa044b18b4cca3d2d5da3a6d67aa421dfd9718fa18b6be6232a41e40cf260c8190064c4d8d9ab771177bd5cd12e77a8fa79e'
 'SKIP'
-
'cd52aa831154a8ed4f88c695b17fc692dc6ded30818b0e2bc28cb0174f4148bb1fb945c54e0ef2613e1dd459e36da69f03863b33b6ec16dc1d8466ff5e480a6a'
+
'12a89cbb26902e135bb21f945c8de86526ff879c9f20a2601157f6a39899f021ed2970cee9e4fbcd4c13af6fe78e7902dd1f7ce1928fc914d681453bf848c0f8'
 
'8a36bff3c472763a9a46b9a36b8b4a15f03e6fb0387b12efba27f15dc500faa2a3f92c0f7e217a0b00da7c78682c7af6357cc6b88b550ece9bc89c477412b7e0'
 
'f86d96d76bcb340021e7904925f0029f8662e4dfc32489198b3a8695dca069da496539e2287249c763fe9c4d8d5d591fd18fe49a0bee822cbbd0eb712efbb89b')
 validpgpkeys=('7C2608F8E5F9E78D7A3F26FF177544B49AF313FB') #  "Hans de Goede 
"

Modified: fs25361.patch
===
--- fs25361.patch   2018-03-13 16:13:02 UTC (rev 318838)
+++ fs25361.patch   2018-03-13 16:36:47 UTC (rev 318839)
@@ -1,6 +1,8 @@
 xinit-1.4.0/startx.cpp 2018-03-11 17:49:26.995313610 +0100
-+++ xinit-1.4.0/startx.cpp.new 2018-03-11 17:49:11.334908458 +0100
-@@ -296,9 +296,9 @@
+Common subdirectories: xinit.orig/privileged_startx and xinit/privileged_startx
+diff -u xinit.orig/startx.cpp xinit/startx.cpp
+--- xinit.orig/startx.cpp  2011-08-02 18:26:57.161711018 +0400
 xinit/startx.cpp   2011-08-02 19:06:39.348816866 +0400
+@@ -290,9 +290,9 @@
  XCOMM now add the same credentials to the client authority file
  XCOMM if '$displayname' already exists do not overwrite it as another
  XCOMM server may need it. Add them to the '$xserverauthfile' instead.
@@ -8,7 +10,8 @@
 +for displayname in $authdisplay $hostname/unix$authdisplay; do
  authcookie=`XAUTH list "$displayname" @@
 -| sed -n "s/.*$displayname[[:space:]*].*[[:space:]*]//p"` 2>/dev/null;
-+| sed -n 
"s/.*$displayname\/unix$authdisplay[[:space:]*].*[[:space:]*]//p"` 2>/dev/null;
++| sed -n 
"s/.*$hostname\/unix$authdisplay[[:space:]*].*[[:space:]*]//p"` 2>/dev/null;
  if [ "z${authcookie}" = "z" ] ; then
  XAUTH -q << EOF 
  add $displayname . $mcookie
+


[arch-commits] Commit in xorg-xinit/trunk (PKGBUILD)

2017-01-15 Thread Andreas Radke
Date: Sunday, January 15, 2017 @ 11:56:32
  Author: andyrtr
Revision: 286478

https sources / gpg signature fixes

Modified:
  xorg-xinit/trunk/PKGBUILD

--+
 PKGBUILD |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-01-15 11:04:57 UTC (rev 286477)
+++ PKGBUILD2017-01-15 11:56:32 UTC (rev 286478)
@@ -8,13 +8,13 @@
 pkgdesc="X.Org initialisation program "
 arch=('i686' 'x86_64')
 license=('custom')
-url="http://xorg.freedesktop.org/";
+url="https://xorg.freedesktop.org/";
 depends=('libx11' 'xorg-xauth' 'xorg-xrdb' 'xorg-xmodmap' 'inetutils')
 makedepends=('xorg-util-macros')
 optdepends=('xorg-twm' 'xterm')
 backup=('etc/X11/xinit/xserverrc'
 'etc/X11/xinit/xinitrc')
-source=(${url}/releases/individual/app/xinit-${pkgver}.tar.bz2
+source=(${url}/releases/individual/app/xinit-${pkgver}.tar.bz2{,.sig}
 06_move_serverauthfile_into_tmp.diff
 fs25361.patch
 fs46369.patch
@@ -21,10 +21,12 @@
 xserverrc)
 options=(!emptydirs)
 sha256sums=('75d88d7397a07e01db253163b7c7a00b249b3d30e99489f2734cac9a0c7902b3'
+'SKIP'
 'a5c6ced5822bbb3145e0f30a4b12995782ca6d80ff2d927851ec91b5e41212cb'
 '431335ceb84f75aaa96fba285a596f61a63629f94756f8063e4f621ae143629b'
 '6e2c44b997e604db167f00168e8b6c68257be50447d7a80856b4aa910f52351e'
 '86835010b5350c41035495b7b845db0eecf1e4b7eeaf152b12a881fa502e5387')
+validpgpkeys=('7C2608F8E5F9E78D7A3F26FF177544B49AF313FB') #  "Hans de Goede 
"
 
 prepare() {
   cd xinit-${pkgver}


[arch-commits] Commit in xorg-xinit/trunk (PKGBUILD)

2016-04-01 Thread Andreas Radke
Date: Friday, April 1, 2016 @ 18:24:46
  Author: andyrtr
Revision: 263726

upgpkg: xorg-xinit 1.3.4-4

add missing deps: xorg-xrdb xorg-xmodmap; FS#48131

Modified:
  xorg-xinit/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-04-01 15:53:15 UTC (rev 263725)
+++ PKGBUILD2016-04-01 16:24:46 UTC (rev 263726)
@@ -4,12 +4,12 @@
 
 pkgname=xorg-xinit
 pkgver=1.3.4
-pkgrel=3
+pkgrel=4
 pkgdesc="X.Org initialisation program "
 arch=('i686' 'x86_64')
 license=('custom')
 url="http://xorg.freedesktop.org/";
-depends=('libx11' 'xorg-xauth' 'inetutils')
+depends=('libx11' 'xorg-xauth' 'xorg-xrdb' 'xorg-xmodmap' 'inetutils')
 makedepends=('xorg-util-macros')
 optdepends=('xorg-twm' 'xterm')
 backup=('etc/X11/xinit/xserverrc'


[arch-commits] Commit in xorg-xinit/trunk (PKGBUILD fs46369.patch)

2015-09-21 Thread Jan Steffens
Date: Monday, September 21, 2015 @ 17:11:09
  Author: heftig
Revision: 247033

FS#46369: Don't unset DBUS_SESSION_BUS_ADDRESS

Added:
  xorg-xinit/trunk/fs46369.patch
Modified:
  xorg-xinit/trunk/PKGBUILD

---+
 PKGBUILD  |5 -
 fs46369.patch |   11 +++
 2 files changed, 15 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-09-21 09:08:07 UTC (rev 247032)
+++ PKGBUILD2015-09-21 15:11:09 UTC (rev 247033)
@@ -4,7 +4,7 @@
 
 pkgname=xorg-xinit
 pkgver=1.3.4
-pkgrel=2
+pkgrel=3
 pkgdesc="X.Org initialisation program "
 arch=('i686' 'x86_64')
 license=('custom')
@@ -17,11 +17,13 @@
 source=(${url}/releases/individual/app/xinit-${pkgver}.tar.bz2
 06_move_serverauthfile_into_tmp.diff
 fs25361.patch
+fs46369.patch
 xserverrc)
 options=(!emptydirs)
 sha256sums=('75d88d7397a07e01db253163b7c7a00b249b3d30e99489f2734cac9a0c7902b3'
 'a5c6ced5822bbb3145e0f30a4b12995782ca6d80ff2d927851ec91b5e41212cb'
 '431335ceb84f75aaa96fba285a596f61a63629f94756f8063e4f621ae143629b'
+'6e2c44b997e604db167f00168e8b6c68257be50447d7a80856b4aa910f52351e'
 '86835010b5350c41035495b7b845db0eecf1e4b7eeaf152b12a881fa502e5387')
 
 prepare() {
@@ -28,6 +30,7 @@
   cd xinit-${pkgver}
   patch -Np1 -i ../06_move_serverauthfile_into_tmp.diff
   patch -Np1 -i ../fs25361.patch
+  patch -Np1 -i ../fs46369.patch
   sed -i -e 's/XSLASHGLOB.sh/XSLASHGLOB/' xinitrc.cpp
 }
 

Added: fs46369.patch
===
--- fs46369.patch   (rev 0)
+++ fs46369.patch   2015-09-21 15:11:09 UTC (rev 247033)
@@ -0,0 +1,11 @@
+diff -u -r xinit-1.3.4/startx.cpp xinit-1.3.4-dbus/startx.cpp
+--- xinit-1.3.4/startx.cpp 2015-09-21 17:07:29.732240308 +0200
 xinit-1.3.4-dbus/startx.cpp2015-09-21 17:07:59.255424644 +0200
+@@ -11,7 +11,6 @@
+ XCOMM Site administrators are STRONGLY urged to write nicer versions.
+ XCOMM
+ 
+-unset DBUS_SESSION_BUS_ADDRESS
+ unset SESSION_MANAGER
+ 
+ #ifdef __APPLE__


[arch-commits] Commit in xorg-xinit/trunk (PKGBUILD xinitrc xserverrc xsession)

2015-03-16 Thread Andreas Radke
Date: Monday, March 16, 2015 @ 19:19:24
  Author: andyrtr
Revision: 233950

upgpkg: xorg-xinit 1.3.4-2

drop useless user skeleton files FS#41092; don't double 1 FS#42193

Modified:
  xorg-xinit/trunk/PKGBUILD
  xorg-xinit/trunk/xserverrc
Deleted:
  xorg-xinit/trunk/xinitrc
  xorg-xinit/trunk/xsession

---+
 PKGBUILD  |   16 +++-
 xinitrc   |   17 -
 xserverrc |6 +-
 xsession  |   10 --
 4 files changed, 4 insertions(+), 45 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-03-16 17:28:26 UTC (rev 233949)
+++ PKGBUILD2015-03-16 18:19:24 UTC (rev 233950)
@@ -4,7 +4,7 @@
 
 pkgname=xorg-xinit
 pkgver=1.3.4
-pkgrel=1
+pkgrel=2
 pkgdesc="X.Org initialisation program "
 arch=('i686' 'x86_64')
 license=('custom')
@@ -12,23 +12,17 @@
 depends=('libx11' 'xorg-xauth' 'inetutils')
 makedepends=('xorg-util-macros')
 optdepends=('xorg-twm' 'xterm')
-backup=('etc/skel/.xinitrc'
-'etc/skel/.xsession'
-'etc/X11/xinit/xserverrc'
+backup=('etc/X11/xinit/xserverrc'
 'etc/X11/xinit/xinitrc')
 source=(${url}/releases/individual/app/xinit-${pkgver}.tar.bz2
 06_move_serverauthfile_into_tmp.diff
 fs25361.patch
-xinitrc
-xsession
 xserverrc)
 options=(!emptydirs)
 sha256sums=('75d88d7397a07e01db253163b7c7a00b249b3d30e99489f2734cac9a0c7902b3'
 'a5c6ced5822bbb3145e0f30a4b12995782ca6d80ff2d927851ec91b5e41212cb'
 '431335ceb84f75aaa96fba285a596f61a63629f94756f8063e4f621ae143629b'
-'38a23848b49de8a5c635a128a8b32a6cd0a08a9ee153ad97cb25abd82cfda1bc'
-'2b94a42f2521cb5662fb9a5765a7507456dc0352ac9d0f44c56b359dcdb38898'
-'5e87bff928c143d9db9966048f6530e83e9e9a1cac09ce4c25f8aabc08611b6f')
+'86835010b5350c41035495b7b845db0eecf1e4b7eeaf152b12a881fa502e5387')
 
 prepare() {
   cd xinit-${pkgver}
@@ -47,10 +41,6 @@
 package() {
   cd xinit-${pkgver}
   make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/etc/skel"
-  install -m644 "${srcdir}/xinitrc" "${pkgdir}/etc/skel/.xinitrc"
-  install -m644 "${srcdir}/xsession" "${pkgdir}/etc/skel/.xsession"
   install -m644 "${srcdir}/xserverrc" "${pkgdir}/etc/X11/xinit/xserverrc"
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"

Deleted: xinitrc
===
--- xinitrc 2015-03-16 17:28:26 UTC (rev 233949)
+++ xinitrc 2015-03-16 18:19:24 UTC (rev 233950)
@@ -1,17 +0,0 @@
-#!/bin/sh
-#
-# ~/.xinitrc
-#
-# Executed by startx (run your window manager from here)
-
-if [ -d /etc/X11/xinit/xinitrc.d ]; then
-  for f in /etc/X11/xinit/xinitrc.d/*; do
-[ -x "$f" ] && . "$f"
-  done
-  unset f
-fi
-
-# exec gnome-session
-# exec startkde
-# exec startxfce4
-# ...or the Window Manager of your choice

Modified: xserverrc
===
--- xserverrc   2015-03-16 17:28:26 UTC (rev 233949)
+++ xserverrc   2015-03-16 18:19:24 UTC (rev 233950)
@@ -1,6 +1,2 @@
 #!/bin/sh
-if [ -z "$XDG_VTNR" ]; then
-  exec /usr/bin/X -nolisten tcp "$@"
-else
-  exec /usr/bin/X -nolisten tcp "$@" vt$XDG_VTNR
-fi
+exec /usr/bin/X -nolisten tcp "$@"

Deleted: xsession
===
--- xsession2015-03-16 17:28:26 UTC (rev 233949)
+++ xsession2015-03-16 18:19:24 UTC (rev 233950)
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-#
-# ~/.xsession
-#
-# Executed by xdm/gdm/kdm at login
-#
-
-/bin/bash --login -i ~/.xinitrc
-


[arch-commits] Commit in xorg-xinit/trunk (PKGBUILD git-upstream-fixes.patch)

2014-09-11 Thread Laurent Carlier
Date: Thursday, September 11, 2014 @ 23:43:02
  Author: lcarlier
Revision: 221434

upgpkg: xorg-xinit 1.3.4-1

upstream update 1.3.4

Modified:
  xorg-xinit/trunk/PKGBUILD
Deleted:
  xorg-xinit/trunk/git-upstream-fixes.patch

--+
 PKGBUILD |   13 -
 git-upstream-fixes.patch |  517 -
 2 files changed, 5 insertions(+), 525 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-09-11 21:26:56 UTC (rev 221433)
+++ PKGBUILD2014-09-11 21:43:02 UTC (rev 221434)
@@ -3,8 +3,8 @@
 # Contributor: Alexander Baldeck 
 
 pkgname=xorg-xinit
-pkgver=1.3.3
-pkgrel=4
+pkgver=1.3.4
+pkgrel=1
 pkgdesc="X.Org initialisation program "
 arch=('i686' 'x86_64')
 license=('custom')
@@ -21,22 +21,19 @@
 fs25361.patch
 xinitrc
 xsession
-xserverrc
-git-upstream-fixes.patch)
+xserverrc)
 options=(!emptydirs)
-sha256sums=('74b2878de6e3d5b5948f1562a77e7f53b4e10621e505ddb278050c7f3cae00af'
+sha256sums=('75d88d7397a07e01db253163b7c7a00b249b3d30e99489f2734cac9a0c7902b3'
 'a5c6ced5822bbb3145e0f30a4b12995782ca6d80ff2d927851ec91b5e41212cb'
 '431335ceb84f75aaa96fba285a596f61a63629f94756f8063e4f621ae143629b'
 '38a23848b49de8a5c635a128a8b32a6cd0a08a9ee153ad97cb25abd82cfda1bc'
 '2b94a42f2521cb5662fb9a5765a7507456dc0352ac9d0f44c56b359dcdb38898'
-'5e87bff928c143d9db9966048f6530e83e9e9a1cac09ce4c25f8aabc08611b6f'
-'dc520f1fb5b57a6ae1622efc1fda7348c1e6ed85972404368362ed62cbb5da88')
+'5e87bff928c143d9db9966048f6530e83e9e9a1cac09ce4c25f8aabc08611b6f')
 
 prepare() {
   cd xinit-${pkgver}
   patch -Np1 -i ../06_move_serverauthfile_into_tmp.diff
   patch -Np1 -i ../fs25361.patch
-  patch -Np1 -i ../git-upstream-fixes.patch
   sed -i -e 's/XSLASHGLOB.sh/XSLASHGLOB/' xinitrc.cpp
 }
 

Deleted: git-upstream-fixes.patch
===
--- git-upstream-fixes.patch2014-09-11 21:26:56 UTC (rev 221433)
+++ git-upstream-fixes.patch2014-09-11 21:43:02 UTC (rev 221434)
@@ -1,517 +0,0 @@
-From 182920f156c87715d91b2f64b8781a0072af996e Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith 
-Date: Sun, 8 Sep 2013 09:48:50 -0700
-Subject: [PATCH 1/9] Fix warnings about parameters to startServer &
- startClient shadowing globals
-
-Signed-off-by: Alan Coopersmith 

- xinit.c | 14 +++---
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/xinit.c b/xinit.c
-index 18e3e10..1b04911 100644
 a/xinit.c
-+++ b/xinit.c
-@@ -390,7 +390,7 @@ processTimeout(int timeout, const char *string)
- }
- 
- static pid_t
--startServer(char *server[])
-+startServer(char *server_argv[])
- {
- sigset_t mask, old;
- const char * const *cpp;
-@@ -422,12 +422,12 @@ startServer(char *server[])
-  * if client is xterm -L
-  */
- setpgid(0,getpid());
--Execute(server);
-+Execute(server_argv);
- 
--Error("unable to run server \"%s\"", server[0]);
-+Error("unable to run server \"%s\"", server_argv[0]);
- 
- fprintf(stderr, "Use the -- option, or make sure that %s is in your 
path and\n", bindir);
--fprintf(stderr, "that \"%s\" is a program or a link to the right type 
of server\n", server[0]);
-+fprintf(stderr, "that \"%s\" is a program or a link to the right type 
of server\n", server_argv[0]);
- fprintf(stderr, "for your display.  Possible server names 
include:\n\n");
- for (cpp = server_names; *cpp; cpp++)
- fprintf(stderr, "%s\n", *cpp);
-@@ -556,7 +556,7 @@ setWindowPath(void)
- }
- 
- static pid_t
--startClient(char *client[])
-+startClient(char *client_argv[])
- {
- clientpid = fork();
- if (clientpid == 0) {
-@@ -568,8 +568,8 @@ startClient(char *client[])
- _exit(EXIT_FAILURE);
- }
- setpgid(0, getpid());
--Execute(client);
--Error("Unable to run program \"%s\"", client[0]);
-+Execute(client_argv);
-+Error("Unable to run program \"%s\"", client_argv[0]);
- 
- fprintf(stderr, "Specify a program on the command line or make sure 
that %s\n", bindir);
- fprintf(stderr, "is in your path.\n\n");
--- 
-2.1.0
-
-From 463b85fcf51d8ff5886ebe1f3481e5cb4d603436 Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith 
-Date: Fri, 22 Nov 2013 23:03:39 -0800
-Subject: [PATCH 2/9] Pass files to cpp via CLI arg instead of stdin to
- workaround gcc 4.8 change
-
-Fixes Bug 69439 - Empty lines before #!/bin/sh in startx
-https://bugs.freedesktop.org/show_bug.cgi?id=69439
-
-Signed-off-by: Alan Coopersmith 

- cpprules.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cpprules.in b/cpprules.in
-index eaea428..0931bee 100644
 a/cpprules.in
-+++ b/cpprules.in
-@@ -15,4 +15,4 @@ CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9

[arch-commits] Commit in xorg-xinit/trunk (PKGBUILD)

2013-10-27 Thread Andreas Radke
Date: Sunday, October 27, 2013 @ 16:14:36
  Author: andyrtr
Revision: 197639

upgpkg: xorg-xinit 1.3.3-2

fix annoying empty lines - FS#36959

Modified:
  xorg-xinit/trunk/PKGBUILD

--+
 PKGBUILD |   13 +++--
 1 file changed, 11 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-10-27 15:13:27 UTC (rev 197638)
+++ PKGBUILD2013-10-27 15:14:36 UTC (rev 197639)
@@ -4,7 +4,7 @@
 
 pkgname=xorg-xinit
 pkgver=1.3.3
-pkgrel=1
+pkgrel=2
 pkgdesc="X.Org initialisation program "
 arch=('i686' 'x86_64')
 license=('custom')
@@ -30,11 +30,15 @@
 '2b94a42f2521cb5662fb9a5765a7507456dc0352ac9d0f44c56b359dcdb38898'
 '5e87bff928c143d9db9966048f6530e83e9e9a1cac09ce4c25f8aabc08611b6f')
 
-build() {
+prepare() {
   cd xinit-${pkgver}
   patch -Np1 -i "${srcdir}/06_move_serverauthfile_into_tmp.diff"
   patch -Np1 -i "${srcdir}/fs25361.patch"
   sed -i -e 's/XSLASHGLOB.sh/XSLASHGLOB/' xinitrc.cpp
+}
+
+build() {
+  cd xinit-${pkgver}
   ./configure --prefix=/usr --with-xinitdir=/etc/X11/xinit
   make
 }
@@ -49,4 +53,9 @@
   install -m644 "${srcdir}/xserverrc" "${pkgdir}/etc/X11/xinit/xserverrc"
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+  
+  # a workaround for https://bugs.archlinux.org/task/36959
+  sed -i '/^\s*$/d' $pkgdir/usr/bin/startx
+  sed -i '/^\s*$/d' $pkgdir/etc/X11/xinit/xinitrc
+
 }



[arch-commits] Commit in xorg-xinit/trunk (PKGBUILD)

2013-09-13 Thread Andreas Radke
Date: Friday, September 13, 2013 @ 09:41:32
  Author: andyrtr
Revision: 194301

upgpkg: xorg-xinit 1.3.3-1

upstream update 1.3.3

Modified:
  xorg-xinit/trunk/PKGBUILD

--+
 PKGBUILD |   20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-09-13 07:29:54 UTC (rev 194300)
+++ PKGBUILD2013-09-13 07:41:32 UTC (rev 194301)
@@ -3,8 +3,8 @@
 # Contributor: Alexander Baldeck 
 
 pkgname=xorg-xinit
-pkgver=1.3.2
-pkgrel=3
+pkgver=1.3.3
+pkgrel=1
 pkgdesc="X.Org initialisation program "
 arch=('i686' 'x86_64')
 license=('custom')
@@ -23,15 +23,15 @@
 xsession
 xserverrc)
 options=(!emptydirs)
-md5sums=('9c0943cbd83e489ad1b05221b97efd44'
- 'abd072ec435ce084cf4e89c58f83d45c'
- '73a597d3fb7f5b9487318ac8cfd4bedf'
- 'c7b406c3c5c1e8011b3ac7d6b29c1a2c'
- '7873d97db30d6c279ed37e3559e7c59d'
- '4deba1b7f2cc7f93b304b956023e65d6')
+sha256sums=('74b2878de6e3d5b5948f1562a77e7f53b4e10621e505ddb278050c7f3cae00af'
+'a5c6ced5822bbb3145e0f30a4b12995782ca6d80ff2d927851ec91b5e41212cb'
+'431335ceb84f75aaa96fba285a596f61a63629f94756f8063e4f621ae143629b'
+'38a23848b49de8a5c635a128a8b32a6cd0a08a9ee153ad97cb25abd82cfda1bc'
+'2b94a42f2521cb5662fb9a5765a7507456dc0352ac9d0f44c56b359dcdb38898'
+'5e87bff928c143d9db9966048f6530e83e9e9a1cac09ce4c25f8aabc08611b6f')
 
 build() {
-  cd "${srcdir}/xinit-${pkgver}"
+  cd xinit-${pkgver}
   patch -Np1 -i "${srcdir}/06_move_serverauthfile_into_tmp.diff"
   patch -Np1 -i "${srcdir}/fs25361.patch"
   sed -i -e 's/XSLASHGLOB.sh/XSLASHGLOB/' xinitrc.cpp
@@ -40,7 +40,7 @@
 }
 
 package() {
-  cd "${srcdir}/xinit-${pkgver}"
+  cd xinit-${pkgver}
   make DESTDIR="${pkgdir}" install
 
   install -m755 -d "${pkgdir}/etc/skel"



[arch-commits] Commit in xorg-xinit/trunk (PKGBUILD xserverrc)

2012-10-30 Thread Thomas Bächler
Date: Tuesday, October 30, 2012 @ 20:11:25
  Author: thomas
Revision: 170011

upgpkg: xorg-xinit 1.3.2-3: Support logind - without mistakes this time

Modified:
  xorg-xinit/trunk/PKGBUILD
  xorg-xinit/trunk/xserverrc

---+
 PKGBUILD  |4 ++--
 xserverrc |3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-10-30 23:44:04 UTC (rev 170010)
+++ PKGBUILD2012-10-31 00:11:25 UTC (rev 170011)
@@ -4,7 +4,7 @@
 
 pkgname=xorg-xinit
 pkgver=1.3.2
-pkgrel=2
+pkgrel=3
 pkgdesc="X.Org initialisation program "
 arch=('i686' 'x86_64')
 license=('custom')
@@ -28,7 +28,7 @@
  '73a597d3fb7f5b9487318ac8cfd4bedf'
  'c7b406c3c5c1e8011b3ac7d6b29c1a2c'
  '7873d97db30d6c279ed37e3559e7c59d'
- '2680283100495350fa4d0105db48736b')
+ '4deba1b7f2cc7f93b304b956023e65d6')
 
 build() {
   cd "${srcdir}/xinit-${pkgver}"

Modified: xserverrc
===
--- xserverrc   2012-10-30 23:44:04 UTC (rev 170010)
+++ xserverrc   2012-10-31 00:11:25 UTC (rev 170011)
@@ -1,4 +1,5 @@
-if [[ -z $XDG_VTNR ]]; then
+#!/bin/sh
+if [ -z "$XDG_VTNR" ]; then
   exec /usr/bin/X -nolisten tcp "$@"
 else
   exec /usr/bin/X -nolisten tcp "$@" vt$XDG_VTNR



[arch-commits] Commit in xorg-xinit/trunk (PKGBUILD xserverrc)

2012-10-30 Thread Thomas Bächler
Date: Tuesday, October 30, 2012 @ 19:43:19
  Author: thomas
Revision: 170008

upgpkg: xorg-xinit 1.3.2-2: Support logind

Modified:
  xorg-xinit/trunk/PKGBUILD
  xorg-xinit/trunk/xserverrc

---+
 PKGBUILD  |4 ++--
 xserverrc |6 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-10-30 23:43:12 UTC (rev 170007)
+++ PKGBUILD2012-10-30 23:43:19 UTC (rev 170008)
@@ -4,7 +4,7 @@
 
 pkgname=xorg-xinit
 pkgver=1.3.2
-pkgrel=1
+pkgrel=2
 pkgdesc="X.Org initialisation program "
 arch=('i686' 'x86_64')
 license=('custom')
@@ -28,7 +28,7 @@
  '73a597d3fb7f5b9487318ac8cfd4bedf'
  'c7b406c3c5c1e8011b3ac7d6b29c1a2c'
  '7873d97db30d6c279ed37e3559e7c59d'
- 'c5baef10fdb7239594daee72a94ddab3')
+ '2680283100495350fa4d0105db48736b')
 
 build() {
   cd "${srcdir}/xinit-${pkgver}"

Modified: xserverrc
===
--- xserverrc   2012-10-30 23:43:12 UTC (rev 170007)
+++ xserverrc   2012-10-30 23:43:19 UTC (rev 170008)
@@ -1 +1,5 @@
-exec /usr/bin/X -nolisten tcp "$@"
+if [[ -z $XDG_VTNR ]]; then
+  exec /usr/bin/X -nolisten tcp "$@"
+else
+  exec /usr/bin/X -nolisten tcp "$@" vt$XDG_VTNR
+fi



[arch-commits] Commit in xorg-xinit/trunk (PKGBUILD)

2012-02-03 Thread andyrtr
Date: Friday, February 3, 2012 @ 12:11:08
  Author: andyrtr
Revision: 148558

upgpkg: xorg-xinit 1.3.2-1

upstream update 1.3.2

Modified:
  xorg-xinit/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-02-03 17:02:15 UTC (rev 148557)
+++ PKGBUILD2012-02-03 17:11:08 UTC (rev 148558)
@@ -3,8 +3,8 @@
 # Contributor: Alexander Baldeck 
 
 pkgname=xorg-xinit
-pkgver=1.3.1
-pkgrel=2
+pkgver=1.3.2
+pkgrel=1
 pkgdesc="X.Org initialisation program "
 arch=('i686' 'x86_64')
 license=('custom')
@@ -23,7 +23,7 @@
 xsession
 xserverrc)
 options=(!emptydirs)
-md5sums=('ee234056d8a3dbf37b61b4bcb35b88e4'
+md5sums=('9c0943cbd83e489ad1b05221b97efd44'
  'abd072ec435ce084cf4e89c58f83d45c'
  '73a597d3fb7f5b9487318ac8cfd4bedf'
  'c7b406c3c5c1e8011b3ac7d6b29c1a2c'



[arch-commits] Commit in xorg-xinit/trunk (PKGBUILD fs25361.patch)

2011-12-19 Thread Jan de Groot
Date: Monday, December 19, 2011 @ 14:32:08
  Author: jgc
Revision: 145237

Fix FS#25361. Patch from user, created as suggested by Adam Jackson. Upstream 
reference: https://bugs.freedesktop.org/show_bug.cgi?id=13462

Added:
  xorg-xinit/trunk/fs25361.patch
Modified:
  xorg-xinit/trunk/PKGBUILD

---+
 PKGBUILD  |3 +++
 fs25361.patch |   16 
 2 files changed, 19 insertions(+)

Modified: PKGBUILD
===
--- PKGBUILD2011-12-19 19:17:54 UTC (rev 145236)
+++ PKGBUILD2011-12-19 19:32:08 UTC (rev 145237)
@@ -18,12 +18,14 @@
 'etc/X11/xinit/xinitrc')
 source=(${url}/releases/individual/app/xinit-${pkgver}.tar.bz2
 06_move_serverauthfile_into_tmp.diff
+fs25361.patch
 xinitrc
 xsession
 xserverrc)
 options=(!emptydirs)
 md5sums=('ee234056d8a3dbf37b61b4bcb35b88e4'
  'abd072ec435ce084cf4e89c58f83d45c'
+ '73a597d3fb7f5b9487318ac8cfd4bedf'
  'c7b406c3c5c1e8011b3ac7d6b29c1a2c'
  '7873d97db30d6c279ed37e3559e7c59d'
  'c5baef10fdb7239594daee72a94ddab3')
@@ -31,6 +33,7 @@
 build() {
   cd "${srcdir}/xinit-${pkgver}"
   patch -Np1 -i "${srcdir}/06_move_serverauthfile_into_tmp.diff"
+  patch -Np1 -i "${srcdir}/fs25361.patch"
   sed -i -e 's/XSLASHGLOB.sh/XSLASHGLOB/' xinitrc.cpp
   ./configure --prefix=/usr --with-xinitdir=/etc/X11/xinit
   make

Added: fs25361.patch
===
--- fs25361.patch   (rev 0)
+++ fs25361.patch   2011-12-19 19:32:08 UTC (rev 145237)
@@ -0,0 +1,16 @@
+Common subdirectories: xinit.orig/privileged_startx and xinit/privileged_startx
+diff -u xinit.orig/startx.cpp xinit/startx.cpp
+--- xinit.orig/startx.cpp  2011-08-02 18:26:57.161711018 +0400
 xinit/startx.cpp   2011-08-02 19:06:39.348816866 +0400
+@@ -290,9 +290,9 @@
+ XCOMM now add the same credentials to the client authority file
+ XCOMM if '$displayname' already exists do not overwrite it as another
+ XCOMM server man need it. Add them to the '$xserverauthfile' instead.
+-for displayname in $authdisplay $hostname$authdisplay; do
++for displayname in $authdisplay $hostname/unix$authdisplay; do
+ authcookie=`XAUTH list "$displayname" @@
+-| sed -n "s/.*$displayname[[:space:]*].*[[:space:]*]//p"` 2>/dev/null;
++| sed -n 
"s/.*$hostname\/unix$authdisplay[[:space:]*].*[[:space:]*]//p"` 2>/dev/null;
+ if [ "z${authcookie}" = "z" ] ; then
+ XAUTH -q << EOF 
+ add $displayname . $mcookie



[arch-commits] Commit in xorg-xinit/trunk (PKGBUILD)

2011-12-19 Thread Jan de Groot
Date: Monday, December 19, 2011 @ 06:59:15
  Author: jgc
Revision: 145188

Add inetutils dependency (FS#24811)

Modified:
  xorg-xinit/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-12-19 11:55:36 UTC (rev 145187)
+++ PKGBUILD2011-12-19 11:59:15 UTC (rev 145188)
@@ -4,12 +4,12 @@
 
 pkgname=xorg-xinit
 pkgver=1.3.1
-pkgrel=1
+pkgrel=2
 pkgdesc="X.Org initialisation program "
 arch=('i686' 'x86_64')
 license=('custom')
 url="http://xorg.freedesktop.org/";
-depends=('libx11' 'xorg-xauth')
+depends=('libx11' 'xorg-xauth' 'inetutils')
 makedepends=('xorg-util-macros')
 optdepends=('xorg-twm' 'xterm')
 backup=('etc/skel/.xinitrc'



[arch-commits] Commit in xorg-xinit/trunk (PKGBUILD)

2011-09-04 Thread andyrtr
Date: Monday, September 5, 2011 @ 01:59:00
  Author: andyrtr
Revision: 137003

upgpkg: xorg-xinit 1.3.1-1

upstream release 1.3.1

Modified:
  xorg-xinit/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-09-05 05:57:27 UTC (rev 137002)
+++ PKGBUILD2011-09-05 05:59:00 UTC (rev 137003)
@@ -3,10 +3,10 @@
 # Contributor: Alexander Baldeck 
 
 pkgname=xorg-xinit
-pkgver=1.3.0
-pkgrel=3
+pkgver=1.3.1
+pkgrel=1
 pkgdesc="X.Org initialisation program "
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('custom')
 url="http://xorg.freedesktop.org/";
 depends=('libx11' 'xorg-xauth')
@@ -22,7 +22,7 @@
 xsession
 xserverrc)
 options=(!emptydirs)
-md5sums=('bc4e8b7d1919597cc37a0d24aa149dda'
+md5sums=('ee234056d8a3dbf37b61b4bcb35b88e4'
  'abd072ec435ce084cf4e89c58f83d45c'
  'c7b406c3c5c1e8011b3ac7d6b29c1a2c'
  '7873d97db30d6c279ed37e3559e7c59d'



[arch-commits] Commit in xorg-xinit/trunk (PKGBUILD xinitrc)

2011-03-10 Thread Jan de Groot
Date: Thursday, March 10, 2011 @ 14:11:37
  Author: jgc
Revision: 113891

upgpkg: xorg-xinit 1.3.0-3
Remove from xorg group
Fix xinitrc.d to take all files, not just .sh files
Add xinitrc.d block to .xinitrc also, as xinit will not execute system xinitrc 
if it is present

Modified:
  xorg-xinit/trunk/PKGBUILD
  xorg-xinit/trunk/xinitrc

--+
 PKGBUILD |6 +++---
 xinitrc  |7 +++
 2 files changed, 10 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-03-10 17:50:31 UTC (rev 113890)
+++ PKGBUILD2011-03-10 19:11:37 UTC (rev 113891)
@@ -4,7 +4,7 @@
 
 pkgname=xorg-xinit
 pkgver=1.3.0
-pkgrel=2
+pkgrel=3
 pkgdesc="X.Org initialisation program "
 arch=(i686 x86_64)
 license=('custom')
@@ -16,7 +16,6 @@
 'etc/skel/.xsession'
 'etc/X11/xinit/xserverrc'
 'etc/X11/xinit/xinitrc')
-groups=('xorg')
 source=(${url}/releases/individual/app/xinit-${pkgver}.tar.bz2
 06_move_serverauthfile_into_tmp.diff
 xinitrc
@@ -25,13 +24,14 @@
 options=(!emptydirs)
 md5sums=('bc4e8b7d1919597cc37a0d24aa149dda'
  'abd072ec435ce084cf4e89c58f83d45c'
- 'cee2d70748a089fbc7db64a4a6e8fdb1'
+ 'c7b406c3c5c1e8011b3ac7d6b29c1a2c'
  '7873d97db30d6c279ed37e3559e7c59d'
  'c5baef10fdb7239594daee72a94ddab3')
 
 build() {
   cd "${srcdir}/xinit-${pkgver}"
   patch -Np1 -i "${srcdir}/06_move_serverauthfile_into_tmp.diff"
+  sed -i -e 's/XSLASHGLOB.sh/XSLASHGLOB/' xinitrc.cpp
   ./configure --prefix=/usr --with-xinitdir=/etc/X11/xinit
   make
 }

Modified: xinitrc
===
--- xinitrc 2011-03-10 17:50:31 UTC (rev 113890)
+++ xinitrc 2011-03-10 19:11:37 UTC (rev 113891)
@@ -4,6 +4,13 @@
 #
 # Executed by startx (run your window manager from here)
 
+if [ -d /etc/X11/xinit/xinitrc.d ]; then
+  for f in /etc/X11/xinit/xinitrc.d/*; do
+[ -x "$f" ] && . "$f"
+  done
+  unset f
+fi
+
 # exec gnome-session
 # exec startkde
 # exec startxfce4



[arch-commits] Commit in xorg-xinit/trunk (PKGBUILD xserverrc)

2010-12-18 Thread andyrtr
Date: Saturday, December 18, 2010 @ 12:21:28
  Author: andyrtr
Revision: 103381

prepare for #22134

Modified:
  xorg-xinit/trunk/PKGBUILD
  xorg-xinit/trunk/xserverrc

---+
 PKGBUILD  |   13 +
 xserverrc |2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-12-18 15:47:10 UTC (rev 103380)
+++ PKGBUILD2010-12-18 17:21:28 UTC (rev 103381)
@@ -1,9 +1,10 @@
 # $Id$
-# Maintainer: Alexander Baldeck 
-# Contributor: Jan de Groot 
+# Maintainer: Jan de Groot 
+# Contributor: Alexander Baldeck 
+
 pkgname=xorg-xinit
 pkgver=1.3.0
-pkgrel=1
+pkgrel=2
 pkgdesc="X.Org initialisation program "
 arch=(i686 x86_64)
 license=('custom')
@@ -26,13 +27,17 @@
  'abd072ec435ce084cf4e89c58f83d45c'
  'cee2d70748a089fbc7db64a4a6e8fdb1'
  '7873d97db30d6c279ed37e3559e7c59d'
- 'bb550d3b9a2d2b6cbe6e2667a3a7cd03')
+ 'c5baef10fdb7239594daee72a94ddab3')
 
 build() {
   cd "${srcdir}/xinit-${pkgver}"
   patch -Np1 -i "${srcdir}/06_move_serverauthfile_into_tmp.diff"
   ./configure --prefix=/usr --with-xinitdir=/etc/X11/xinit
   make
+}
+
+package() {
+  cd "${srcdir}/xinit-${pkgver}"
   make DESTDIR="${pkgdir}" install
 
   install -m755 -d "${pkgdir}/etc/skel"

Modified: xserverrc
===
--- xserverrc   2010-12-18 15:47:10 UTC (rev 103380)
+++ xserverrc   2010-12-18 17:21:28 UTC (rev 103381)
@@ -1 +1 @@
-exec /usr/bin/X -nolisten tcp
+exec /usr/bin/X -nolisten tcp "$@"



[arch-commits] Commit in xorg-xinit/trunk (PKGBUILD)

2010-11-15 Thread Jan de Groot
Date: Monday, November 15, 2010 @ 06:06:22
  Author: jgc
Revision: 99539

upgpkg: xorg-xinit 1.3.0-1
Update to 1.3.0, now supports xinitrc.d directory

Modified:
  xorg-xinit/trunk/PKGBUILD

--+
 PKGBUILD |   23 +++
 1 file changed, 11 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-11-15 10:37:25 UTC (rev 99538)
+++ PKGBUILD2010-11-15 11:06:22 UTC (rev 99539)
@@ -2,14 +2,14 @@
 # Maintainer: Alexander Baldeck 
 # Contributor: Jan de Groot 
 pkgname=xorg-xinit
-pkgver=1.2.1
+pkgver=1.3.0
 pkgrel=1
 pkgdesc="X.Org initialisation program "
 arch=(i686 x86_64)
 license=('custom')
 url="http://xorg.freedesktop.org/";
 depends=('libx11' 'xorg-xauth')
-makedepends=('pkgconfig')
+makedepends=('xorg-util-macros')
 optdepends=('xorg-twm' 'xterm')
 backup=('etc/skel/.xinitrc'
 'etc/skel/.xsession'
@@ -22,7 +22,7 @@
 xsession
 xserverrc)
 options=(!emptydirs)
-md5sums=('56f2d202b3dc10fcd21931a67bb270f7'
+md5sums=('bc4e8b7d1919597cc37a0d24aa149dda'
  'abd072ec435ce084cf4e89c58f83d45c'
  'cee2d70748a089fbc7db64a4a6e8fdb1'
  '7873d97db30d6c279ed37e3559e7c59d'
@@ -30,16 +30,15 @@
 
 build() {
   cd "${srcdir}/xinit-${pkgver}"
-  patch -Np1 -i "${srcdir}/06_move_serverauthfile_into_tmp.diff" || return 1
-  ./configure --prefix=/usr || return 1
-  make XINITDIR=/etc/X11/xinit || return 1
-  make XINITDIR=/etc/X11/xinit DESTDIR="${pkgdir}" install || return 1
+  patch -Np1 -i "${srcdir}/06_move_serverauthfile_into_tmp.diff"
+  ./configure --prefix=/usr --with-xinitdir=/etc/X11/xinit
+  make
+  make DESTDIR="${pkgdir}" install
 
   install -m755 -d "${pkgdir}/etc/skel"
-  install -m755 -d "${pkgdir}/etc/X11/xinit"
-  install -m644 "${srcdir}/xinitrc" "${pkgdir}/etc/skel/.xinitrc" || return 1
-  install -m644 "${srcdir}/xsession" "${pkgdir}/etc/skel/.xsession" || return 1
-  install -m644 "${srcdir}/xserverrc" "${pkgdir}/etc/X11/xinit/xserverrc" || 
return 1
+  install -m644 "${srcdir}/xinitrc" "${pkgdir}/etc/skel/.xinitrc"
+  install -m644 "${srcdir}/xsession" "${pkgdir}/etc/skel/.xsession"
+  install -m644 "${srcdir}/xserverrc" "${pkgdir}/etc/X11/xinit/xserverrc"
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
 }



[arch-commits] Commit in xorg-xinit/trunk (PKGBUILD)

2010-04-04 Thread Jan de Groot
Date: Sunday, April 4, 2010 @ 08:10:18
  Author: jgc
Revision: 75829

upgpkg: xorg-xinit 1.2.1-1
Fix license, this package is not GPL licensed

Modified:
  xorg-xinit/trunk/PKGBUILD

--+
 PKGBUILD |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-04-04 12:04:08 UTC (rev 75828)
+++ PKGBUILD2010-04-04 12:10:18 UTC (rev 75829)
@@ -2,11 +2,11 @@
 # Maintainer: Alexander Baldeck 
 # Contributor: Jan de Groot 
 pkgname=xorg-xinit
-pkgver=1.2.0
+pkgver=1.2.1
 pkgrel=1
 pkgdesc="X.Org initialisation program "
 arch=(i686 x86_64)
-license=('GPL')
+license=('custom')
 url="http://xorg.freedesktop.org/";
 depends=('libx11' 'xorg-xauth')
 makedepends=('pkgconfig')
@@ -22,7 +22,7 @@
 xsession
 xserverrc)
 options=(!emptydirs)
-md5sums=('fe1696cab2fbed6fa059d0cd1c53ac13'
+md5sums=('56f2d202b3dc10fcd21931a67bb270f7'
  'abd072ec435ce084cf4e89c58f83d45c'
  'cee2d70748a089fbc7db64a4a6e8fdb1'
  '7873d97db30d6c279ed37e3559e7c59d'
@@ -40,4 +40,6 @@
   install -m644 "${srcdir}/xinitrc" "${pkgdir}/etc/skel/.xinitrc" || return 1
   install -m644 "${srcdir}/xsession" "${pkgdir}/etc/skel/.xsession" || return 1
   install -m644 "${srcdir}/xserverrc" "${pkgdir}/etc/X11/xinit/xserverrc" || 
return 1
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
 }