Date: Wednesday, November 30, 2016 @ 13:21:47
  Author: arojas
Revision: 282380

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

Added:
  fvwm/repos/extra-i686/PKGBUILD
    (from rev 282379, fvwm/trunk/PKGBUILD)
  fvwm/repos/extra-i686/fvwm.desktop
    (from rev 282379, fvwm/trunk/fvwm.desktop)
  fvwm/repos/extra-x86_64/PKGBUILD
    (from rev 282379, fvwm/trunk/PKGBUILD)
  fvwm/repos/extra-x86_64/fvwm.desktop
    (from rev 282379, fvwm/trunk/fvwm.desktop)
Deleted:
  fvwm/repos/extra-i686/PKGBUILD
  fvwm/repos/extra-i686/fvwm.desktop
  fvwm/repos/extra-x86_64/PKGBUILD
  fvwm/repos/extra-x86_64/fvwm.desktop

---------------------------+
 /PKGBUILD                 |   78 ++++++++++++++++++++++++++++++++++++++++++++
 /fvwm.desktop             |   14 +++++++
 extra-i686/PKGBUILD       |   32 ------------------
 extra-i686/fvwm.desktop   |    7 ---
 extra-x86_64/PKGBUILD     |   32 ------------------
 extra-x86_64/fvwm.desktop |    7 ---
 6 files changed, 92 insertions(+), 78 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2016-11-30 13:20:50 UTC (rev 282379)
+++ extra-i686/PKGBUILD 2016-11-30 13:21:47 UTC (rev 282380)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger <[email protected]>
-
-pkgname=fvwm
-pkgver=2.6.7
-pkgrel=1
-pkgdesc="A multiple large virtual desktop window manager originally derived 
from twm"
-arch=('i686' 'x86_64')
-url="http://www.fvwm.org";
-license=('GPL' 'custom')
-depends=('fribidi' 'perl' 'libstroke' 'libxpm' 'librsvg' 'libxinerama' 
'libxcursor' 'python2-xdg')
-makedepends=('libxslt')
-optdepends=('perl-tk: for ClickToFocus support'
-            'perl-x11-protocol: for ClickToFocus support')
-options=('!emptydirs' '!makeflags')
-source=(https://github.com/fvwmorg/fvwm/releases/download/${pkgver}/fvwm-${pkgver}.tar.gz
 fvwm.desktop)
-sha1sums=('c50d530c75f549d2f4270f54ae8ba89a6634bcec'
-          '6fd8fd767f32f88cc8b4743a2ba49bcfcdb32bcb')
-
-build() {
-  cd ${pkgname}-${pkgver}
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc 
--libexecdir=/usr/lib --with-stroke-library
-  make
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-  install -d "${pkgdir}/usr/share/doc/fvwm"
-  install -D -m644 ../fvwm.desktop "${pkgdir}/usr/share/xsessions/fvwm.desktop"
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
-}

Copied: fvwm/repos/extra-i686/PKGBUILD (from rev 282379, fvwm/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD                         (rev 0)
+++ extra-i686/PKGBUILD 2016-11-30 13:21:47 UTC (rev 282380)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Eric Bélanger <[email protected]>
+
+pkgname=fvwm
+pkgver=2.6.7
+pkgrel=2
+pkgdesc="A multiple large virtual desktop window manager originally derived 
from twm"
+arch=('i686' 'x86_64')
+url="http://www.fvwm.org";
+license=('GPL' 'custom')
+depends=('fribidi' 'perl' 'libstroke' 'libxpm' 'librsvg' 'libxinerama' 
'libxcursor' 'python2-xdg')
+makedepends=('libxslt')
+optdepends=('perl-tk: for ClickToFocus support'
+            'perl-x11-protocol: for ClickToFocus support')
+options=('!emptydirs' '!makeflags')
+source=(https://github.com/fvwmorg/fvwm/releases/download/${pkgver}/fvwm-${pkgver}.tar.gz
 fvwm.desktop)
+sha1sums=('c50d530c75f549d2f4270f54ae8ba89a6634bcec'
+          '6fd8fd767f32f88cc8b4743a2ba49bcfcdb32bcb')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  # fix symlinks
+  sed -e 's|ln -sf|ln -sfr|g' -i default-config/Makefile.am
+  autoreconf -vi
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc 
--libexecdir=/usr/lib --with-stroke-library
+  make
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
+  install -d "${pkgdir}/usr/share/doc/fvwm"
+  install -D -m644 ../fvwm.desktop "${pkgdir}/usr/share/xsessions/fvwm.desktop"
+  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
+}

Deleted: extra-i686/fvwm.desktop
===================================================================
--- extra-i686/fvwm.desktop     2016-11-30 13:20:50 UTC (rev 282379)
+++ extra-i686/fvwm.desktop     2016-11-30 13:21:47 UTC (rev 282380)
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=FVWM
-Comment=The fvwm window manager
-Type=XSession
-Exec=/usr/bin/fvwm
-TryExec=/usr/bin/fvwm

Copied: fvwm/repos/extra-i686/fvwm.desktop (from rev 282379, 
fvwm/trunk/fvwm.desktop)
===================================================================
--- extra-i686/fvwm.desktop                             (rev 0)
+++ extra-i686/fvwm.desktop     2016-11-30 13:21:47 UTC (rev 282380)
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=FVWM
+Comment=The fvwm window manager
+Type=XSession
+Exec=/usr/bin/fvwm
+TryExec=/usr/bin/fvwm

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD       2016-11-30 13:20:50 UTC (rev 282379)
+++ extra-x86_64/PKGBUILD       2016-11-30 13:21:47 UTC (rev 282380)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger <[email protected]>
-
-pkgname=fvwm
-pkgver=2.6.7
-pkgrel=1
-pkgdesc="A multiple large virtual desktop window manager originally derived 
from twm"
-arch=('i686' 'x86_64')
-url="http://www.fvwm.org";
-license=('GPL' 'custom')
-depends=('fribidi' 'perl' 'libstroke' 'libxpm' 'librsvg' 'libxinerama' 
'libxcursor' 'python2-xdg')
-makedepends=('libxslt')
-optdepends=('perl-tk: for ClickToFocus support'
-            'perl-x11-protocol: for ClickToFocus support')
-options=('!emptydirs' '!makeflags')
-source=(https://github.com/fvwmorg/fvwm/releases/download/${pkgver}/fvwm-${pkgver}.tar.gz
 fvwm.desktop)
-sha1sums=('c50d530c75f549d2f4270f54ae8ba89a6634bcec'
-          '6fd8fd767f32f88cc8b4743a2ba49bcfcdb32bcb')
-
-build() {
-  cd ${pkgname}-${pkgver}
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc 
--libexecdir=/usr/lib --with-stroke-library
-  make
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-  install -d "${pkgdir}/usr/share/doc/fvwm"
-  install -D -m644 ../fvwm.desktop "${pkgdir}/usr/share/xsessions/fvwm.desktop"
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
-}

Copied: fvwm/repos/extra-x86_64/PKGBUILD (from rev 282379, fvwm/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD                               (rev 0)
+++ extra-x86_64/PKGBUILD       2016-11-30 13:21:47 UTC (rev 282380)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Eric Bélanger <[email protected]>
+
+pkgname=fvwm
+pkgver=2.6.7
+pkgrel=2
+pkgdesc="A multiple large virtual desktop window manager originally derived 
from twm"
+arch=('i686' 'x86_64')
+url="http://www.fvwm.org";
+license=('GPL' 'custom')
+depends=('fribidi' 'perl' 'libstroke' 'libxpm' 'librsvg' 'libxinerama' 
'libxcursor' 'python2-xdg')
+makedepends=('libxslt')
+optdepends=('perl-tk: for ClickToFocus support'
+            'perl-x11-protocol: for ClickToFocus support')
+options=('!emptydirs' '!makeflags')
+source=(https://github.com/fvwmorg/fvwm/releases/download/${pkgver}/fvwm-${pkgver}.tar.gz
 fvwm.desktop)
+sha1sums=('c50d530c75f549d2f4270f54ae8ba89a6634bcec'
+          '6fd8fd767f32f88cc8b4743a2ba49bcfcdb32bcb')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  # fix symlinks
+  sed -e 's|ln -sf|ln -sfr|g' -i default-config/Makefile.am
+  autoreconf -vi
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc 
--libexecdir=/usr/lib --with-stroke-library
+  make
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
+  install -d "${pkgdir}/usr/share/doc/fvwm"
+  install -D -m644 ../fvwm.desktop "${pkgdir}/usr/share/xsessions/fvwm.desktop"
+  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
+}

Deleted: extra-x86_64/fvwm.desktop
===================================================================
--- extra-x86_64/fvwm.desktop   2016-11-30 13:20:50 UTC (rev 282379)
+++ extra-x86_64/fvwm.desktop   2016-11-30 13:21:47 UTC (rev 282380)
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=FVWM
-Comment=The fvwm window manager
-Type=XSession
-Exec=/usr/bin/fvwm
-TryExec=/usr/bin/fvwm

Copied: fvwm/repos/extra-x86_64/fvwm.desktop (from rev 282379, 
fvwm/trunk/fvwm.desktop)
===================================================================
--- extra-x86_64/fvwm.desktop                           (rev 0)
+++ extra-x86_64/fvwm.desktop   2016-11-30 13:21:47 UTC (rev 282380)
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=FVWM
+Comment=The fvwm window manager
+Type=XSession
+Exec=/usr/bin/fvwm
+TryExec=/usr/bin/fvwm

Reply via email to