[arch-commits] Commit in xdelta3/trunk (3 files)

[Allan McRae]

    Date: Sunday, March 7, 2010 @ 05:25:54
  Author: allan
Revision: 71455

upgpkg: xdelta3 3.0y-1
upstream update

Modified:
  xdelta3/trunk/PKGBUILD
  xdelta3/trunk/xdelta3-makefile.patch
Deleted:
  xdelta3/trunk/xdelta3-xz.patch

------------------------+
 PKGBUILD               |   11 ++++-------
 xdelta3-makefile.patch |    9 ---------
 xdelta3-xz.patch       |   12 ------------
 3 files changed, 4 insertions(+), 28 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-03-07 05:54:54 UTC (rev 71454)
+++ PKGBUILD	2010-03-07 10:25:54 UTC (rev 71455)
@@ -4,7 +4,7 @@
 # Contributor: Henning Garus <henning.garus at gmail.com>
 
 pkgname=xdelta3
-pkgver=3.0w
+pkgver=3.0y
 pkgrel=1
 pkgdesc="A diff utility which works with binary files"
 arch=('i686' 'x86_64')
@@ -13,16 +13,13 @@
 makedepends=('python')
 optdepends=('python: for python modules')
 source=(http://xdelta.googlecode.com/files/xdelta$pkgver.tar.gz
-        xdelta3-makefile.patch
-        xdelta3-xz.patch)
-md5sums=('59feb294c53f09d253dd317d3d708f16'
-         '35aa0d20a27791addeb929591a78bd3f'
-         'fb1e685d810a15f04b7bdbc9a3f3e635')
+        xdelta3-makefile.patch)
+md5sums=('8246e6ba89a5a6b9efc24f9552fcf940'
+         '378e9a735d92fb2fc695ed9ce2fad2d5')
 
 build() {
   cd $srcdir/xdelta$pkgver
   patch -Np1 -i $srcdir/xdelta3-makefile.patch
-  patch -Np1 -i $srcdir/xdelta3-xz.patch
   
   # xdelta3 binary
   make xdelta3 || return 1

Modified: xdelta3-makefile.patch
===================================================================
--- xdelta3-makefile.patch	2010-03-07 05:54:54 UTC (rev 71454)
+++ xdelta3-makefile.patch	2010-03-07 10:25:54 UTC (rev 71455)
@@ -1,15 +1,6 @@
 diff -Naur xdelta3.0v-old/Makefile xdelta3.0v/Makefile
 --- xdelta3.0v-old/Makefile	2009-03-12 01:44:51.000000000 +0000
 +++ xdelta3.0v/Makefile	2009-03-14 17:02:33.000000000 +0000
-@@ -4,7 +4,7 @@
- UNAME = $(shell uname)
- CYGWIN = $(findstring CYGWIN, $(UNAME))
- DARWIN = $(findstring Darwin, $(UNAME))
--PYVER = 2.5
-+PYVER = 2.6
- 
- ifeq ("$(CYGWIN)", "")
- SWIGTGT = xdelta3module.so
 @@ -200,6 +200,9 @@
  xdelta3.o: $(SOURCES)
  	$(CC) -O3 $(CFLAGS) -c xdelta3.c $(SWIG_FLAGS) -o xdelta3.o

Deleted: xdelta3-xz.patch
===================================================================
--- xdelta3-xz.patch	2010-03-07 05:54:54 UTC (rev 71454)
+++ xdelta3-xz.patch	2010-03-07 10:25:54 UTC (rev 71455)
@@ -1,12 +0,0 @@
-diff -ruNa a/xdelta3-main.h b/xdelta3-main.h
---- a/xdelta3-main.h    2009-01-30 05:59:02.000000000 +0100
-+++ b/xdelta3-main.h    2009-05-13 12:43:00.000000000 +0200
-@@ -355,6 +355,7 @@
-     RD_NONEXTERNAL },
-   { "bzip2",    "-cf",   "bzip2",      "-dcf",   "B", "BZh",          3, 0 },
-   { "gzip",     "-cf",   "gzip",       "-dcf",   "G", "\037\213",     2, 0 },
-+  { "xz",       "-cf",   "xz",         "-dcf",   "Y", "\xfd\x37\x7a\x58\x5a\x00",     2, 0 },
-   { "compress", "-cf",   "uncompress", "-cf",    "Z", "\037\235",     2, 0 },
- 
-   /* TODO: add commandline support for magic-less formats */
-