Update patches after import of 2.7.0
authorJoel Rosdahl <joel@debian.org>
Sun, 16 Aug 2015 14:14:46 +0000 (16:14 +0200)
committerJoel Rosdahl <joel@debian.org>
Sun, 16 Aug 2015 14:14:46 +0000 (16:14 +0200)
.gitignore
debian/patches/enable_load_extension.patch [deleted file]
debian/patches/ignore-.pc-directory.patch
debian/patches/reproducible_build.patch
debian/patches/series
setup.py

index 96c9977..4caaa5b 100644 (file)
@@ -1,3 +1,4 @@
+.pc
 *~
 *.pyc
 *.swp
diff --git a/debian/patches/enable_load_extension.patch b/debian/patches/enable_load_extension.patch
deleted file mode 100644 (file)
index 0e35619..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-Description: Make it possible to use enable_load_extension()
-Author: Joel Rosdahl <joel@debian.org>
-
-Index: python-pysqlite2/setup.cfg
-===================================================================
---- python-pysqlite2.orig/setup.cfg    2010-05-16 15:40:16.986416847 +0200
-+++ python-pysqlite2/setup.cfg 2010-05-16 15:40:21.216411055 +0200
-@@ -3,4 +3,4 @@
- #include_dirs=/usr/local/include
- #library_dirs=/usr/local/lib
- libraries=sqlite3
--define=SQLITE_OMIT_LOAD_EXTENSION
-+#define=SQLITE_OMIT_LOAD_EXTENSION
index 59d304e..d48ba69 100644 (file)
@@ -3,7 +3,10 @@ Author: Joel Rosdahl <joel@debian.org>
 
 Index: python-pysqlite2/.gitignore
 ===================================================================
---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ python-pysqlite2/.gitignore        2015-08-16 16:01:26.140662757 +0200
-@@ -0,0 +1 @@
+--- python-pysqlite2.orig/.gitignore   2015-08-16 16:10:40.932443859 +0200
++++ python-pysqlite2/.gitignore        2015-08-16 16:11:43.179930958 +0200
+@@ -1,3 +1,4 @@
 +.pc
+ *~
+ *.pyc
+ *.swp
index a4b47bf..8d5d7c3 100644 (file)
@@ -4,9 +4,11 @@ Description: Make it possible to make build reproducible
 Author: Juan Picca <jumapico@gmail.com>
 Last-Update: 2015-06-25
 ---
---- a/setup.py
-+++ b/setup.py
-@@ -65,10 +65,10 @@ else:
+Index: python-pysqlite2/setup.py
+===================================================================
+--- python-pysqlite2.orig/setup.py     2015-08-16 16:13:42.535277587 +0200
++++ python-pysqlite2/setup.py  2015-08-16 16:13:42.531277876 +0200
+@@ -84,10 +84,10 @@
  
  class DocBuilder(Command):
      description = "Builds the documentation"
@@ -19,12 +21,12 @@ Last-Update: 2015-06-25
  
      def finalize_options(self):
          pass
-@@ -80,7 +80,7 @@ class DocBuilder(Command):
+@@ -98,7 +98,7 @@
          except OSError:
              pass
          os.makedirs("build/doc")
 -        rc = os.system("sphinx-build doc/sphinx build/doc")
 +        rc = os.system("sphinx-build %s doc/sphinx build/doc" % self.sphinxopts)
          if rc != 0:
-             print "Is sphinx installed? If not, try 'sudo easy_install sphinx'."
+             print "Is sphinx installed? If not, try 'sudo pip sphinx'."
  
index 07b8425..8578294 100644 (file)
@@ -1,3 +1,2 @@
 ignore-.pc-directory.patch
-enable_load_extension.patch
 reproducible_build.patch
index ea3de9f..772d823 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -84,10 +84,10 @@ class TestRunner(Command):
 
 class DocBuilder(Command):
     description = "Builds the documentation"
-    user_options = []
+    user_options = [("sphinxopts=", None, "sphinx options")]
 
     def initialize_options(self):
-        pass
+        self.sphinxopts = ""
 
     def finalize_options(self):
         pass
@@ -98,7 +98,7 @@ class DocBuilder(Command):
         except OSError:
             pass
         os.makedirs("build/doc")
-        rc = os.system("sphinx-build doc/sphinx build/doc")
+        rc = os.system("sphinx-build %s doc/sphinx build/doc" % self.sphinxopts)
         if rc != 0:
             print "Is sphinx installed? If not, try 'sudo pip sphinx'."