Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=161197183d156b3bf6e3d0cbc128ae15d64643b5

commit 161197183d156b3bf6e3d0cbc128ae15d64643b5
Author: Miklos Vajna <vmik...@frugalware.org>
Date:   Mon Feb 14 09:35:17 2011 +0100

bzr-2.3.0-1-i686

- version bump

diff --git a/source/devel-extra/bzr/FrugalBuild 
b/source/devel-extra/bzr/FrugalBuild
index ef2bc0e..442afcb 100644
--- a/source/devel-extra/bzr/FrugalBuild
+++ b/source/devel-extra/bzr/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: Miklos Vajna <vmik...@frugalware.org>

pkgname=bzr
-pkgver=2.2.2
+pkgver=2.3.0
pkgrel=1
pkgdesc="Next generation distributed version control"
url="http://bazaar-vcs.org";
@@ -15,9 +15,8 @@ up2date="Flasttar https://launchpad.net/bzr/+download";
# trick: the first dir is a.bc and the version is a.bc or a.bc.d. given
# that d is usually one digit only, dropping .? from the end will give
# a.bc both for a.bc and a.bc.d.
-source=(https://launchpad.net/bzr/${pkgver%%.?}/${pkgver}/+download/bzr-$pkgver.tar.gz
 \
-       bzr.dev-5439-python27.patch)
-signatures=("${source[0]}.sig" '')
+source=(https://launchpad.net/bzr/${pkgver%%.?}/${pkgver}/+download/bzr-$pkgver.tar.gz)
+signatures=("${source[0]}.sig")

build()
{
diff --git a/source/devel-extra/bzr/bzr.dev-5439-python27.patch 
b/source/devel-extra/bzr/bzr.dev-5439-python27.patch
deleted file mode 100644
index 116e8e5..0000000
--- a/source/devel-extra/bzr/bzr.dev-5439-python27.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -up bzr-2.2.1/bzrlib/transport/http/_urllib2_wrappers.py.5439 
bzr-2.2.1/bzrlib/transport/http/_urllib2_wrappers.py
---- bzr-2.2.1/bzrlib/transport/http/_urllib2_wrappers.py.5439  2010-09-18 
02:37:55.000000000 +0200
-+++ bzr-2.2.1/bzrlib/transport/http/_urllib2_wrappers.py       2010-09-21 
14:14:21.000000000 +0200
-@@ -75,6 +75,26 @@ from bzrlib import (
-     )
-
-
-+class addinfourl(urllib2.addinfourl):
-+    '''Replacement addinfourl class compatible with python-2.7's xmlrpclib
-+
-+    In python-2.7, xmlrpclib expects that the response object that it receives
-+    has a getheader method.  httplib.HTTPResponse provides this but
-+    urllib2.addinfourl does not.  Add the necessary functions here, ported to
-+    use the internal data structures of addinfourl.
-+    '''
-+
-+    def getheader(self, name, default=None):
-+        if self.headers is None:
-+            raise httplib.ResponseNotReady()
-+        return self.headers.getheader(name, default)
-+
-+    def getheaders(self):
-+        if self.headers is None:
-+            raise httplib.ResponseNotReady()
-+        return self.headers.items()
-+
-+
- class _ReportingFileSocket(object):
-
-     def __init__(self, filesock, report_activity=None):
-@@ -656,7 +676,7 @@ class AbstractHTTPHandler(urllib2.Abstra
-             r = response
-             r.recv = r.read
-             fp = socket._fileobject(r, bufsize=65536)
--            resp = urllib2.addinfourl(fp, r.msg, req.get_full_url())
-+            resp = addinfourl(fp, r.msg, req.get_full_url())
-             resp.code = r.status
-             resp.msg = r.reason
-             resp.version = r.version
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to