[arch-commits] Commit in widelands/repos (16 files)

Sven-Hendrik Haase svenstaro at archlinux.org
Sun Nov 13 12:02:47 UTC 2016


    Date: Sunday, November 13, 2016 @ 12:02:47
  Author: svenstaro
Revision: 195501

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

Added:
  widelands/repos/community-i686/PKGBUILD
    (from rev 195500, widelands/trunk/PKGBUILD)
  widelands/repos/community-i686/widelands.desktop
    (from rev 195500, widelands/trunk/widelands.desktop)
  widelands/repos/community-i686/widelands.png
    (from rev 195500, widelands/trunk/widelands.png)
  widelands/repos/community-i686/widelands.sh
    (from rev 195500, widelands/trunk/widelands.sh)
  widelands/repos/community-x86_64/PKGBUILD
    (from rev 195500, widelands/trunk/PKGBUILD)
  widelands/repos/community-x86_64/widelands.desktop
    (from rev 195500, widelands/trunk/widelands.desktop)
  widelands/repos/community-x86_64/widelands.png
    (from rev 195500, widelands/trunk/widelands.png)
  widelands/repos/community-x86_64/widelands.sh
    (from rev 195500, widelands/trunk/widelands.sh)
Deleted:
  widelands/repos/community-i686/PKGBUILD
  widelands/repos/community-i686/widelands.desktop
  widelands/repos/community-i686/widelands.png
  widelands/repos/community-i686/widelands.sh
  widelands/repos/community-x86_64/PKGBUILD
  widelands/repos/community-x86_64/widelands.desktop
  widelands/repos/community-x86_64/widelands.png
  widelands/repos/community-x86_64/widelands.sh

------------------------------------+
 /PKGBUILD                          |  108 +++++++++++++++++++++++++++++++++++
 /widelands.desktop                 |   16 +++++
 /widelands.sh                      |    6 +
 community-i686/PKGBUILD            |   51 ----------------
 community-i686/widelands.desktop   |    8 --
 community-i686/widelands.sh        |    3 
 community-x86_64/PKGBUILD          |   51 ----------------
 community-x86_64/widelands.desktop |    8 --
 community-x86_64/widelands.sh      |    3 
 9 files changed, 130 insertions(+), 124 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2016-11-13 12:02:33 UTC (rev 195500)
+++ community-i686/PKGBUILD	2016-11-13 12:02:47 UTC (rev 195501)
@@ -1,51 +0,0 @@
-# $Id$
-# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
-# Contributor: Arkham <arkham at archlinux dot us>
-# Contributor: Christoph Zeiler <rabyte*gmail>
-
-pkgname=widelands
-pkgver=18
-_realver=build${pkgver}
-pkgrel=6
-pkgdesc="A realtime strategy game with emphasis on economy and transport"
-arch=('i686' 'x86_64')
-url="http://widelands.org/"
-license=('GPL')
-depends=('sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'sdl_gfx' 'lua51' 'glew' 'python2' 'boost-libs')
-makedepends=('cmake' 'boost' 'mesa')
-source=("https://launchpad.net/widelands/${_realver}/build-${pkgver}/+download/$pkgname-$_realver-src.tar.bz2"
-        $pkgname.desktop
-        $pkgname.png
-        $pkgname.sh)
-md5sums=('01efe8db8cd25ffeb4f82b8b4ab6652e'
-         '15820bf099fd6f16251fe70a75c534bb'
-         '3dfda7e9ca76ca00dd98d745d0ceb328'
-         '7cae50aba5ed0cd2cfeea79124637b46')
-
-build() {
-    cd $srcdir/$pkgname-$_realver-src
-
-    mkdir -p build/compile && cd build/compile
-
-    cmake ../.. -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_INSTALL_PREFIX=/usr \
-        -DWL_INSTALL_PREFIX=/usr \
-        -DWL_INSTALL_DATADIR=share/$pkgname \
-        -DWL_INSTALL_BINDIR=bin
-    make
-}
-
-package() {
-    depends=(${depends[@]} 'widelands-data')
-    cd $srcdir/$pkgname-$_realver-src/build/compile
-
-    make DESTDIR="$pkgdir" install
-
-    rm -r $pkgdir/usr/share/widelands/{campaigns,fonts,global,locale,maps,music,pics,scripting,sound,tribes,txts,worlds}
-
-    # Install bin, icon and desktop file
-    #install -Dm 755 src/$pkgname $pkgdir/usr/share/$pkgname/$pkgname
-    #install -Dm 755 $srcdir/$pkgname.sh $pkgdir/usr/bin/$pkgname
-    install -Dm644 $srcdir/$pkgname.png $pkgdir/usr/share/pixmaps/$pkgname.png
-    install -Dm644 $srcdir/$pkgname.desktop $pkgdir/usr/share/applications/$pkgname.desktop
-}

Copied: widelands/repos/community-i686/PKGBUILD (from rev 195500, widelands/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2016-11-13 12:02:47 UTC (rev 195501)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Contributor: Arkham <arkham at archlinux dot us>
+# Contributor: Christoph Zeiler <rabyte*gmail>
+
+pkgname=widelands
+pkgver=19
+_realver=build${pkgver}
+pkgrel=1
+pkgdesc="A realtime strategy game with emphasis on economy and transport"
+arch=('i686' 'x86_64')
+url="http://widelands.org/"
+license=('GPL')
+depends=('sdl2_mixer' 'sdl2_image' 'sdl2_net' 'sdl2_ttf' 'sdl2_gfx' 'lua51' 'glew' 'python2' 'boost-libs')
+makedepends=('cmake' 'boost' 'mesa')
+replaces=('widelands-data')
+source=("https://launchpad.net/widelands/${_realver}/build${pkgver}/+download/$pkgname-$_realver-src.tar.bz2"
+        $pkgname.desktop
+        $pkgname.png
+        $pkgname.sh)
+md5sums=('0ef7ccf021b8001056739f755500366d'
+         '15820bf099fd6f16251fe70a75c534bb'
+         '3dfda7e9ca76ca00dd98d745d0ceb328'
+         '7cae50aba5ed0cd2cfeea79124637b46')
+
+build() {
+    cd $srcdir/$pkgname-$_realver-src
+
+    mkdir -p build/compile && cd build/compile
+
+    cmake ../.. \
+        -DCMAKE_BUILD_TYPE=Release \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DWL_INSTALL_BASEDIR=/usr \
+        -DWL_INSTALL_DATADIR=share/$pkgname
+    make
+}
+
+package() {
+    cd $srcdir/$pkgname-$_realver-src/build/compile
+
+    make DESTDIR="$pkgdir" install
+
+    mkdir -p $pkgdir/usr/bin
+    mv $pkgdir/usr/{widelands,wl_map_object_info,wl_render_richtext,wl_map_info} $pkgdir/usr/bin
+    mv $pkgdir/usr/{VERSION,ChangeLog,CREDITS} $pkgdir/usr/share/widelands
+
+    mkdir -p $pkgdir/usr/share/licenses/$pkgname
+    mv $pkgdir/usr/COPYING $pkgdir/usr/share/licenses/$pkgname
+
+    # Install bin, icon and desktop file
+    install -Dm644 $srcdir/$pkgname.png $pkgdir/usr/share/pixmaps/$pkgname.png
+    install -Dm644 $srcdir/$pkgname.desktop $pkgdir/usr/share/applications/$pkgname.desktop
+}

Deleted: community-i686/widelands.desktop
===================================================================
--- community-i686/widelands.desktop	2016-11-13 12:02:33 UTC (rev 195500)
+++ community-i686/widelands.desktop	2016-11-13 12:02:47 UTC (rev 195501)
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=Widelands
-GenericName=Widelands
-Comment=Realtime strategy game
-Icon=widelands
-Exec=widelands
-Type=Application
-Categories=Game;StrategyGame;

Copied: widelands/repos/community-i686/widelands.desktop (from rev 195500, widelands/trunk/widelands.desktop)
===================================================================
--- community-i686/widelands.desktop	                        (rev 0)
+++ community-i686/widelands.desktop	2016-11-13 12:02:47 UTC (rev 195501)
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Widelands
+GenericName=Widelands
+Comment=Realtime strategy game
+Icon=widelands
+Exec=widelands
+Type=Application
+Categories=Game;StrategyGame;

Deleted: community-i686/widelands.png
===================================================================
(Binary files differ)

Copied: widelands/repos/community-i686/widelands.png (from rev 195500, widelands/trunk/widelands.png)
===================================================================
(Binary files differ)

Deleted: community-i686/widelands.sh
===================================================================
--- community-i686/widelands.sh	2016-11-13 12:02:33 UTC (rev 195500)
+++ community-i686/widelands.sh	2016-11-13 12:02:47 UTC (rev 195501)
@@ -1,3 +0,0 @@
-#!/bin/sh
-cd /usr/share/widelands
-./widelands $*

Copied: widelands/repos/community-i686/widelands.sh (from rev 195500, widelands/trunk/widelands.sh)
===================================================================
--- community-i686/widelands.sh	                        (rev 0)
+++ community-i686/widelands.sh	2016-11-13 12:02:47 UTC (rev 195501)
@@ -0,0 +1,3 @@
+#!/bin/sh
+cd /usr/share/widelands
+./widelands $*

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2016-11-13 12:02:33 UTC (rev 195500)
+++ community-x86_64/PKGBUILD	2016-11-13 12:02:47 UTC (rev 195501)
@@ -1,51 +0,0 @@
-# $Id$
-# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
-# Contributor: Arkham <arkham at archlinux dot us>
-# Contributor: Christoph Zeiler <rabyte*gmail>
-
-pkgname=widelands
-pkgver=18
-_realver=build${pkgver}
-pkgrel=6
-pkgdesc="A realtime strategy game with emphasis on economy and transport"
-arch=('i686' 'x86_64')
-url="http://widelands.org/"
-license=('GPL')
-depends=('sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'sdl_gfx' 'lua51' 'glew' 'python2' 'boost-libs')
-makedepends=('cmake' 'boost' 'mesa')
-source=("https://launchpad.net/widelands/${_realver}/build-${pkgver}/+download/$pkgname-$_realver-src.tar.bz2"
-        $pkgname.desktop
-        $pkgname.png
-        $pkgname.sh)
-md5sums=('01efe8db8cd25ffeb4f82b8b4ab6652e'
-         '15820bf099fd6f16251fe70a75c534bb'
-         '3dfda7e9ca76ca00dd98d745d0ceb328'
-         '7cae50aba5ed0cd2cfeea79124637b46')
-
-build() {
-    cd $srcdir/$pkgname-$_realver-src
-
-    mkdir -p build/compile && cd build/compile
-
-    cmake ../.. -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_INSTALL_PREFIX=/usr \
-        -DWL_INSTALL_PREFIX=/usr \
-        -DWL_INSTALL_DATADIR=share/$pkgname \
-        -DWL_INSTALL_BINDIR=bin
-    make
-}
-
-package() {
-    depends=(${depends[@]} 'widelands-data')
-    cd $srcdir/$pkgname-$_realver-src/build/compile
-
-    make DESTDIR="$pkgdir" install
-
-    rm -r $pkgdir/usr/share/widelands/{campaigns,fonts,global,locale,maps,music,pics,scripting,sound,tribes,txts,worlds}
-
-    # Install bin, icon and desktop file
-    #install -Dm 755 src/$pkgname $pkgdir/usr/share/$pkgname/$pkgname
-    #install -Dm 755 $srcdir/$pkgname.sh $pkgdir/usr/bin/$pkgname
-    install -Dm644 $srcdir/$pkgname.png $pkgdir/usr/share/pixmaps/$pkgname.png
-    install -Dm644 $srcdir/$pkgname.desktop $pkgdir/usr/share/applications/$pkgname.desktop
-}

Copied: widelands/repos/community-x86_64/PKGBUILD (from rev 195500, widelands/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2016-11-13 12:02:47 UTC (rev 195501)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Contributor: Arkham <arkham at archlinux dot us>
+# Contributor: Christoph Zeiler <rabyte*gmail>
+
+pkgname=widelands
+pkgver=19
+_realver=build${pkgver}
+pkgrel=1
+pkgdesc="A realtime strategy game with emphasis on economy and transport"
+arch=('i686' 'x86_64')
+url="http://widelands.org/"
+license=('GPL')
+depends=('sdl2_mixer' 'sdl2_image' 'sdl2_net' 'sdl2_ttf' 'sdl2_gfx' 'lua51' 'glew' 'python2' 'boost-libs')
+makedepends=('cmake' 'boost' 'mesa')
+replaces=('widelands-data')
+source=("https://launchpad.net/widelands/${_realver}/build${pkgver}/+download/$pkgname-$_realver-src.tar.bz2"
+        $pkgname.desktop
+        $pkgname.png
+        $pkgname.sh)
+md5sums=('0ef7ccf021b8001056739f755500366d'
+         '15820bf099fd6f16251fe70a75c534bb'
+         '3dfda7e9ca76ca00dd98d745d0ceb328'
+         '7cae50aba5ed0cd2cfeea79124637b46')
+
+build() {
+    cd $srcdir/$pkgname-$_realver-src
+
+    mkdir -p build/compile && cd build/compile
+
+    cmake ../.. \
+        -DCMAKE_BUILD_TYPE=Release \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DWL_INSTALL_BASEDIR=/usr \
+        -DWL_INSTALL_DATADIR=share/$pkgname
+    make
+}
+
+package() {
+    cd $srcdir/$pkgname-$_realver-src/build/compile
+
+    make DESTDIR="$pkgdir" install
+
+    mkdir -p $pkgdir/usr/bin
+    mv $pkgdir/usr/{widelands,wl_map_object_info,wl_render_richtext,wl_map_info} $pkgdir/usr/bin
+    mv $pkgdir/usr/{VERSION,ChangeLog,CREDITS} $pkgdir/usr/share/widelands
+
+    mkdir -p $pkgdir/usr/share/licenses/$pkgname
+    mv $pkgdir/usr/COPYING $pkgdir/usr/share/licenses/$pkgname
+
+    # Install bin, icon and desktop file
+    install -Dm644 $srcdir/$pkgname.png $pkgdir/usr/share/pixmaps/$pkgname.png
+    install -Dm644 $srcdir/$pkgname.desktop $pkgdir/usr/share/applications/$pkgname.desktop
+}

Deleted: community-x86_64/widelands.desktop
===================================================================
--- community-x86_64/widelands.desktop	2016-11-13 12:02:33 UTC (rev 195500)
+++ community-x86_64/widelands.desktop	2016-11-13 12:02:47 UTC (rev 195501)
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=Widelands
-GenericName=Widelands
-Comment=Realtime strategy game
-Icon=widelands
-Exec=widelands
-Type=Application
-Categories=Game;StrategyGame;

Copied: widelands/repos/community-x86_64/widelands.desktop (from rev 195500, widelands/trunk/widelands.desktop)
===================================================================
--- community-x86_64/widelands.desktop	                        (rev 0)
+++ community-x86_64/widelands.desktop	2016-11-13 12:02:47 UTC (rev 195501)
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Widelands
+GenericName=Widelands
+Comment=Realtime strategy game
+Icon=widelands
+Exec=widelands
+Type=Application
+Categories=Game;StrategyGame;

Deleted: community-x86_64/widelands.png
===================================================================
(Binary files differ)

Copied: widelands/repos/community-x86_64/widelands.png (from rev 195500, widelands/trunk/widelands.png)
===================================================================
(Binary files differ)

Deleted: community-x86_64/widelands.sh
===================================================================
--- community-x86_64/widelands.sh	2016-11-13 12:02:33 UTC (rev 195500)
+++ community-x86_64/widelands.sh	2016-11-13 12:02:47 UTC (rev 195501)
@@ -1,3 +0,0 @@
-#!/bin/sh
-cd /usr/share/widelands
-./widelands $*

Copied: widelands/repos/community-x86_64/widelands.sh (from rev 195500, widelands/trunk/widelands.sh)
===================================================================
--- community-x86_64/widelands.sh	                        (rev 0)
+++ community-x86_64/widelands.sh	2016-11-13 12:02:47 UTC (rev 195501)
@@ -0,0 +1,3 @@
+#!/bin/sh
+cd /usr/share/widelands
+./widelands $*



More information about the arch-commits mailing list