[arch-commits] Commit in cdemu-client/repos/community-any (4 files)

Jan Steffens heftig at archlinux.org
Sat Jan 7 16:43:58 UTC 2017


    Date: Saturday, January 7, 2017 @ 16:43:57
  Author: heftig
Revision: 206035

archrelease: copy trunk to community-any

Added:
  cdemu-client/repos/community-any/PKGBUILD
    (from rev 206034, cdemu-client/trunk/PKGBUILD)
  cdemu-client/repos/community-any/build-fixes.diff
    (from rev 206034, cdemu-client/trunk/build-fixes.diff)
Deleted:
  cdemu-client/repos/community-any/PKGBUILD
  cdemu-client/repos/community-any/cdemu-client.install

----------------------+
 PKGBUILD             |   84 ++++++++++++++++++++++---------------------------
 build-fixes.diff     |   14 ++++++++
 cdemu-client.install |   11 ------
 3 files changed, 52 insertions(+), 57 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2017-01-07 16:41:37 UTC (rev 206034)
+++ PKGBUILD	2017-01-07 16:43:57 UTC (rev 206035)
@@ -1,46 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: Mateusz Herych <heniekk at gmail.com>
-# Contributor: Charles Lindsay <charles at chaoslizard.org>
-
-pkgname=cdemu-client
-pkgver=3.0.4
-pkgrel=1
-pkgdesc="Simple command-line client for controlling cdemu-daemon"
-arch=(any)
-url="http://cdemu.sourceforge.net/"
-license=(GPL)
-depends=(python2 dbus-python cdemu-daemon)
-makedepends=(intltool cmake)
-conflicts=('cdemu')
-source=("http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.bz2")
-sha256sums=('e415a98672ac1ed908dab2ba43a94bc0af7653c470a87d6d9338a59d9856fd86')
-
-prepare() {
-  mkdir build
-  cd $pkgname-$pkgver
-
-  # python2 fix
-  sed -i '1s|^#!.*python$|&2|' src/cdemu
-
-  # fix text domain
-  sed -i '/^project /s/cdemu/&-client/' CMakeLists.txt
-
-  # bash completions
-  sed -e 's|${CMAKE_INSTALL_SYSCONFDIR}/bash_completion.d|${CMAKE_INSTALL_DATADIR}/bash-completion/completions|g' \
-      -e '/FILES data\/cdemu-bash-completion.sh/aRENAME cdemu' \
-      -i CMakeLists.txt
-}
-
-build() {
-  cd build
-  cmake ../$pkgname-$pkgver \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="$pkgdir" install
-}

Copied: cdemu-client/repos/community-any/PKGBUILD (from rev 206034, cdemu-client/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2017-01-07 16:43:57 UTC (rev 206035)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Mateusz Herych <heniekk at gmail.com>
+# Contributor: Charles Lindsay <charles at chaoslizard.org>
+
+pkgname=cdemu-client
+pkgver=3.0.4
+pkgrel=2
+pkgdesc="Simple command-line client for controlling cdemu-daemon"
+arch=(any)
+url="http://cdemu.sourceforge.net/"
+license=(GPL)
+depends=(python-gobject cdemu-daemon)
+makedepends=(intltool cmake)
+conflicts=('cdemu')
+source=("http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.bz2"
+        build-fixes.diff)
+sha256sums=('e415a98672ac1ed908dab2ba43a94bc0af7653c470a87d6d9338a59d9856fd86'
+            '908f919e779832eb05013cb0e3ecb49795afddaa4aa8cb946ec78c3218acf534')
+
+prepare() {
+  mkdir build
+  cd $pkgname-$pkgver
+  patch -Np2 -i ../build-fixes.diff
+}
+
+build() {
+  cd build
+  cmake ../$pkgname-$pkgver \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="$pkgdir" install
+}

Copied: cdemu-client/repos/community-any/build-fixes.diff (from rev 206034, cdemu-client/trunk/build-fixes.diff)
===================================================================
--- build-fixes.diff	                        (rev 0)
+++ build-fixes.diff	2017-01-07 16:43:57 UTC (rev 206035)
@@ -0,0 +1,14 @@
+diff --git i/cdemu-client/CMakeLists.txt w/cdemu-client/CMakeLists.txt
+index cdcff25232886440..5296229538cd64bf 100644
+--- i/cdemu-client/CMakeLists.txt
++++ w/cdemu-client/CMakeLists.txt
+@@ -38,7 +38,8 @@ install (
+ 
+ install (
+     FILES data/cdemu-bash-completion.sh
+-    DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/bash_completion.d
++    DESTINATION ${CMAKE_INSTALL_DATADIR}/bash-completion/completions
++    RENAME cdemu
+ )
+ 
+ install (

Deleted: cdemu-client.install
===================================================================
--- cdemu-client.install	2017-01-07 16:41:37 UTC (rev 206034)
+++ cdemu-client.install	2017-01-07 16:43:57 UTC (rev 206035)
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}



More information about the arch-commits mailing list