[Python-modules-commits] r31896 - in packages/pysvn/trunk/debian (4 files)

Sun Feb 22 17:42:31 UTC 2015

Date: Sunday, February 22, 2015 @ 17:42:30
  Author: noahfx-guest
Revision: 31896

New upstream release: 1.7.10

Modified:
  packages/pysvn/trunk/debian/changelog
  packages/pysvn/trunk/debian/patches/01-setup_configure.patch
  packages/pysvn/trunk/debian/patches/fix_spell_error.patch
  packages/pysvn/trunk/debian/patches/specify_platform_kfreebsd-hurd_as_linux.patch

Modified: packages/pysvn/trunk/debian/changelog
===================================================================

--- packages/pysvn/trunk/debian/changelog	2015-02-21 21:45:38 UTC (rev 31895)
+++ packages/pysvn/trunk/debian/changelog	2015-02-22 17:42:30 UTC (rev 31896)
@@ -1,3 +1,10 @@
+pysvn (1.7.10-1) UNRELEASED; urgency=medium
+
+  * New upstream release:
+     - debian/patches/* updated to be compatible with new upstream release.
+
+ -- Josue Ortega <josueortega at debian.org.gt>  Sun, 22 Feb 2015 11:26:41 -0600
+
 pysvn (1.7.8-1) unstable; urgency=low
 
   * New Maintainer (Closes: #741094)

Modified: packages/pysvn/trunk/debian/patches/01-setup_configure.patch
===================================================================
--- packages/pysvn/trunk/debian/patches/01-setup_configure.patch	2015-02-21 21:45:38 UTC (rev 31895)
+++ packages/pysvn/trunk/debian/patches/01-setup_configure.patch	2015-02-22 17:42:30 UTC (rev 31896)
@@ -7,13 +7,11 @@
 Origin: vendor
 Bug-Debian: http://bugs.debian.org/678559
 Forwarded: no
-Last-Update: <2012-07-15>
+Last-Update: <2015-02-22>
 
-Index: pysvn-1.7.8/Source/setup_configure.py
-===================================================================
---- pysvn-1.7.8.orig/Source/setup_configure.py	2014-02-11 21:04:11.202998786 +0900
-+++ pysvn-1.7.8/Source/setup_configure.py	2014-02-11 21:04:11.202998786 +0900
-@@ -457,11 +457,11 @@
+--- a/Source/setup_configure.py
++++ b/Source/setup_configure.py
+@@ -469,11 +469,11 @@
                      '--pycxx-dir',
                      None,
                      self._find_paths_pycxx_dir,
@@ -27,7 +25,7 @@
          for line in f:
              words = line.split()
              if 'PYCXX_VERSION_MAJOR' in words:
-@@ -472,6 +472,7 @@
+@@ -484,6 +484,7 @@
          if not major_match and not minor_match:
              raise SetupError( 'PyCXX version not as required.' )
  
@@ -35,7 +33,7 @@
          return pycxx_dir
  
      def find_pycxx_src( self ):
-@@ -536,7 +537,8 @@
+@@ -548,7 +549,8 @@
  
      def find_apr_lib( self ):
          last_exception = None
@@ -45,7 +43,7 @@
                      (self.get_lib_name_for_platform( 'libapr-0' ), 'apr-0')]
  
          for apr_libname, self.lib_apr in lib_list:
-@@ -1226,7 +1228,7 @@
+@@ -1235,7 +1237,7 @@
                  '-L/usr/lib/python%d.%d/config -lpython%d.%d.dll' %
                      (sys.version_info[0], sys.version_info[1], sys.version_info[0], sys.version_info[1]),
                  '-lsvn_client-1',

Modified: packages/pysvn/trunk/debian/patches/fix_spell_error.patch
===================================================================
--- packages/pysvn/trunk/debian/patches/fix_spell_error.patch	2015-02-21 21:45:38 UTC (rev 31895)
+++ packages/pysvn/trunk/debian/patches/fix_spell_error.patch	2015-02-22 17:42:30 UTC (rev 31896)
@@ -3,11 +3,11 @@
 
 ---
 Forwarded: no
-Last-Update: 2013-09-29
+Last-Update: 2015-02-22
 
---- pysvn-1.7.8.orig/Docs/pysvn_prog_ref.html
-+++ pysvn-1.7.8/Docs/pysvn_prog_ref.html
-@@ -691,7 +691,7 @@ checkin( [path,path],
+--- a/Docs/pysvn_prog_ref.html
++++ b/Docs/pysvn_prog_ref.html
+@@ -691,7 +691,7 @@
  </pre>
  <p>
  checkin the files in the path_list to the repository with the
@@ -16,7 +16,7 @@
  a directory's children with the same log message. <span class="svn_1002000"> Set
  keep_locks to True to prevent locks in the path being unlocked.</span>
  </p>
-@@ -1027,7 +1027,7 @@ WC targets.
+@@ -1027,7 +1027,7 @@
  </div>
  
  <p><span class="svn_1001000">native_eol parameter allows the line ending of files with
@@ -25,9 +25,9 @@
  Use None to use the eol-style of the Operating System,
  use "LF" to use "\n", "CR" to use "\r" and "CRLF" to use "\r\n".</span>
  </p>
---- pysvn-1.7.8.orig/Import/pycxx-6.2.4/Doc/Python2/PyCXX.html
-+++ pysvn-1.7.8/Import/pycxx-6.2.4/Doc/Python2/PyCXX.html
-@@ -1251,7 +1251,7 @@ reference count is greater than one.</p>
+--- a/Import/pycxx-6.2.6/Doc/Python2/PyCXX.html
++++ b/Import/pycxx-6.2.6/Doc/Python2/PyCXX.html
+@@ -1251,7 +1251,7 @@
  <tr>
  <td class="code">virtual void</td>
  <td class="code">setItem (int offset, const Object&ob) </td>
@@ -36,9 +36,9 @@
  </tr>
  <tr>
  <td class="code">explicit</td>
---- pysvn-1.7.8.orig/Import/pycxx-6.2.4/Doc/Python3/PyCXX.html
-+++ pysvn-1.7.8/Import/pycxx-6.2.4/Doc/Python3/PyCXX.html
-@@ -1477,7 +1477,7 @@ reference count is greater than one.</p>
+--- a/Import/pycxx-6.2.6/Doc/Python3/PyCXX.html
++++ b/Import/pycxx-6.2.6/Doc/Python3/PyCXX.html
+@@ -1477,7 +1477,7 @@
  <tr>
  <td class="code">virtual void</td>
  <td class="code">setItem( int offset, const Object &ob ) </td>

Modified: packages/pysvn/trunk/debian/patches/specify_platform_kfreebsd-hurd_as_linux.patch
===================================================================
--- packages/pysvn/trunk/debian/patches/specify_platform_kfreebsd-hurd_as_linux.patch	2015-02-21 21:45:38 UTC (rev 31895)
+++ packages/pysvn/trunk/debian/patches/specify_platform_kfreebsd-hurd_as_linux.patch	2015-02-22 17:42:30 UTC (rev 31896)
@@ -8,12 +8,10 @@
 ---
 Origin: vendor
 Forwarded: no
-Last-Update: 2012-08-04
+Last-Update: 2015-02-22
 
-Index: pysvn-1.7.6/Source/setup_configure.py
-===================================================================
---- pysvn-1.7.6.orig/Source/setup_configure.py	2012-08-04 06:45:48.373174679 +0900
-+++ pysvn-1.7.6/Source/setup_configure.py	2012-08-04 06:51:20.050110596 +0900
+--- a/Source/setup_configure.py
++++ b/Source/setup_configure.py
 @@ -200,6 +200,14 @@
              self.c_utils = LinuxCompilerGCC( self )
              self.c_pysvn = LinuxCompilerGCC( self )


