[arch-commits] Commit in (4 files)

[Jonathan Steel]

    Date: Thursday, May 30, 2013 @ 19:05:36
  Author: jsteel
Revision: 91975

Move files to /usr/bin

Added:
  clonezilla/trunk/usrbin.patch
  drbl/trunk/usrbin.patch
Modified:
  clonezilla/trunk/PKGBUILD
  drbl/trunk/PKGBUILD

-------------------------------+
 clonezilla/trunk/PKGBUILD     |   14 +++++++++++---
 clonezilla/trunk/usrbin.patch |   13 +++++++++++++
 drbl/trunk/PKGBUILD           |   14 +++++++++++---
 drbl/trunk/usrbin.patch       |   15 +++++++++++++++
 4 files changed, 50 insertions(+), 6 deletions(-)

Modified: clonezilla/trunk/PKGBUILD
===================================================================
--- clonezilla/trunk/PKGBUILD	2013-05-30 16:26:01 UTC (rev 91974)
+++ clonezilla/trunk/PKGBUILD	2013-05-30 17:05:36 UTC (rev 91975)
@@ -4,16 +4,24 @@
 
 pkgname=clonezilla
 pkgver=3.3.10
-pkgrel=1
+pkgrel=2
 pkgdesc="The Free and Open Source Software for Disk Imaging and Cloning"
 arch=('any')
 url="http://clonezilla.org"
 license=('GPL')
 depends=('drbl' 'partclone' 'ntfsprogs' 'partimage' 'pigz' 'sshfs')
-source=(http://free.nchc.org.tw/drbl-core/src/stable/$pkgname-$pkgver.tar.bz2)
+source=(http://free.nchc.org.tw/drbl-core/src/stable/$pkgname-$pkgver.tar.bz2
+        usrbin.patch)
 backup=(etc/drbl/drbl-ocs.conf)
-md5sums=('9a4815961adaadf2f25299abab314dbd')
+md5sums=('9a4815961adaadf2f25299abab314dbd'
+         'a976c9209f7bbccd352a9d0a5c8b41ae')
 
+prepare() {
+  cd "$srcdir"/$pkgname-$pkgver
+
+  patch -Np0 -i "$srcdir"/usrbin.patch
+}
+
 package() {
   cd "$srcdir"/$pkgname-$pkgver
 

Added: clonezilla/trunk/usrbin.patch
===================================================================
--- clonezilla/trunk/usrbin.patch	                        (rev 0)
+++ clonezilla/trunk/usrbin.patch	2013-05-30 17:05:36 UTC (rev 91975)
@@ -0,0 +1,13 @@
+--- Makefile.orig	2013-05-30 17:42:49.851418658 +0100
++++ Makefile	2013-05-30 17:44:41.157482402 +0100
+@@ -18,8 +18,8 @@
+ 
+ install:
+ 	# install exec files
+-	install -d ${DESTDIR}/usr/
+-	cp -a sbin bin ${DESTDIR}/usr/
++	install -d ${DESTDIR}/usr/bin
++	cp -a sbin/* bin/* ${DESTDIR}/usr/bin/
+ 
+ 	# install setup dir
+ 	install -d $(DESTDIR)/$(SHAREDIR)/

Modified: drbl/trunk/PKGBUILD
===================================================================
--- drbl/trunk/PKGBUILD	2013-05-30 16:26:01 UTC (rev 91974)
+++ drbl/trunk/PKGBUILD	2013-05-30 17:05:36 UTC (rev 91975)
@@ -4,17 +4,25 @@
 
 pkgname=drbl
 pkgver=2.3.10
-pkgrel=1
+pkgrel=2
 pkgdesc="Diskless Remote Boot in Linux: manage the deployment of the GNU/Linux operating system across many clients"
 arch=('any')
 url="http://drbl.sourceforge.net"
 license=('GPL')
 depends=('perl' 'bc')
 makedepends=('vim')
-source=(http://free.nchc.org.tw/$pkgname-core/src/stable/$pkgname-$pkgver.tar.bz2)
+source=(http://free.nchc.org.tw/$pkgname-core/src/stable/$pkgname-$pkgver.tar.bz2
+        usrbin.patch)
 backup=(etc/drbl/drbl.conf)
-md5sums=('412e68b8f96ef021052f680f2ea78501')
+md5sums=('412e68b8f96ef021052f680f2ea78501'
+         'f01eac478f1ae62f505de645de96c68a')
 
+prepare() {
+  cd "$srcdir"/$pkgname-$pkgver
+
+  patch -Np0 -i "$srcdir"/usrbin.patch
+}
+
 build() {
   cd "$srcdir"/$pkgname-$pkgver
 

Added: drbl/trunk/usrbin.patch
===================================================================
--- drbl/trunk/usrbin.patch	                        (rev 0)
+++ drbl/trunk/usrbin.patch	2013-05-30 17:05:36 UTC (rev 91975)
@@ -0,0 +1,15 @@
+--- Makefile.orig	2013-05-30 17:56:44.323563977 +0100
++++ Makefile	2013-05-30 17:57:35.139954480 +0100
+@@ -27,9 +27,9 @@
+ 
+ install:
+ 	# install exec files
+-	install -d $(DESTDIR)/usr/
+-	cp -a sbin bin $(DESTDIR)/usr/
+-	rm -f $(DESTDIR)/usr/sbin/Makefile
++	install -d $(DESTDIR)/usr/bin
++	cp -a sbin/* bin/* $(DESTDIR)/usr/bin/
++	rm -f $(DESTDIR)/usr/bin/Makefile
+ 	# install setup dir
+ 	install -d $(DESTDIR)/$(SHAREDIR)/
+ 	cp -a setup $(DESTDIR)/$(SHAREDIR)/