[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (55cf8ea27ed51823b184f2b768b4760d07c9b480)

Treeve Jelbert scm at sourcemage.org
Fri Dec 17 05:04:18 EST 2010


GIT changes to master grimoire by Treeve Jelbert <treeve at sourcemage.org>:

 python-pypi/bzr/DETAILS        |    3 +--
 python-pypi/bzr/HISTORY        |    4 ++++
 python-pypi/bzr/PRE_BUILD      |    4 ----
 python-pypi/bzr/xmlrpclib.diff |   40 ----------------------------------------
 python-pypi/bzrtools/DETAILS   |    4 ++--
 python-pypi/bzrtools/HISTORY   |    3 +++
 6 files changed, 10 insertions(+), 48 deletions(-)

New commits:
commit 55cf8ea27ed51823b184f2b768b4760d07c9b480
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    bzrtools: => 2.2.0

commit a4a6b7f8f04166c31a50034dd39a019448f60236
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    bzr: => 2.2.2

diff --git a/python-pypi/bzr/DETAILS b/python-pypi/bzr/DETAILS
index 2e93f95..fcb0f9a 100755
--- a/python-pypi/bzr/DETAILS
+++ b/python-pypi/bzr/DETAILS
@@ -1,6 +1,5 @@
            SPELL=bzr
-         VERSION=2.2.0
-      PATCHLEVEL=1
+         VERSION=2.2.2
               VX=`echo $VERSION|cut -c-3`
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.sig
diff --git a/python-pypi/bzr/HISTORY b/python-pypi/bzr/HISTORY
index 95a6441..f01c8c9 100644
--- a/python-pypi/bzr/HISTORY
+++ b/python-pypi/bzr/HISTORY
@@ -1,3 +1,7 @@
+2010-12-17 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 2.2.2
+	* PREBUILD,xmlrpclib.diff: deleted
+
 2010-09-19 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: PATCHLEVEL=1
 	* PREBUILD: apply patch
diff --git a/python-pypi/bzr/PRE_BUILD b/python-pypi/bzr/PRE_BUILD
deleted file mode 100755
index 7793b2b..0000000
--- a/python-pypi/bzr/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p0 <$SPELL_DIRECTORY/xmlrpclib.diff &&
-sedit "s:man/man1:share/man/man1:" setup.py
diff --git a/python-pypi/bzr/xmlrpclib.diff b/python-pypi/bzr/xmlrpclib.diff
deleted file mode 100644
index 88e67e0..0000000
--- a/python-pypi/bzr/xmlrpclib.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-=== modified file 'bzrlib/transport/http/_urllib2_wrappers.py'
---- bzrlib/transport/http/_urllib2_wrappers.py	2010-05-08 05:56:28 +0000
-+++ bzrlib/transport/http/_urllib2_wrappers.py	2010-09-15 02:43:44 +0000
-@@ -75,6 +75,26 @@
-     )
- 
- 
-+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 @@
-             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
-
diff --git a/python-pypi/bzrtools/DETAILS b/python-pypi/bzrtools/DETAILS
index 80a3f7f..4225fdf 100755
--- a/python-pypi/bzrtools/DETAILS
+++ b/python-pypi/bzrtools/DETAILS
@@ -1,9 +1,9 @@
            SPELL=bzrtools
-         VERSION=2.1.0
+         VERSION=2.2.0
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.sig
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
-   SOURCE_URL[0]=http://launchpad.net/bzrtools/trunk/$VERSION/+download/$SOURCE
+   SOURCE_URL[0]=http://launchpad.net/bzrtools/stable/$VERSION/+download/$SOURCE
   SOURCE2_URL[0]=$SOURCE_URL.sig
   SOURCE2_IGNORE=signature
       SOURCE_GPG=canonical.gpg:$SOURCE2:UPSTREAM_KEY
diff --git a/python-pypi/bzrtools/HISTORY b/python-pypi/bzrtools/HISTORY
index aa1b348..909aa22 100644
--- a/python-pypi/bzrtools/HISTORY
+++ b/python-pypi/bzrtools/HISTORY
@@ -1,3 +1,6 @@
+2010-12-18 Treeve Jelbert <treeve at souremage.org>
+	* DETAILS: version 2.2.0
+
 2010-02-20 Treeve Jelbert <treeve at souremage.org>
 	* DETAILS: version 2.1.0
 



More information about the SM-Commit mailing list