[Python-modules-commits] r4957 - in packages/pyopenssl/trunk/debian (7 files)
morph-guest at users.alioth.debian.org
morph-guest at users.alioth.debian.org
Sun Mar 30 15:19:05 UTC 2008
Date: Sunday, March 30, 2008 @ 15:19:04
Author: morph-guest
Revision: 4957
upgrade to 0.7a2
Added:
packages/pyopenssl/trunk/debian/patches/10_fix_doc_buildsystem.dpatch
Modified:
packages/pyopenssl/trunk/debian/changelog
packages/pyopenssl/trunk/debian/control
packages/pyopenssl/trunk/debian/patches/00list
packages/pyopenssl/trunk/debian/python-openssl-doc.doc-base
packages/pyopenssl/trunk/debian/rules
Deleted:
packages/pyopenssl/trunk/debian/patches/01_restore_pristine_code.dpatch
Modified: packages/pyopenssl/trunk/debian/changelog
===================================================================
--- packages/pyopenssl/trunk/debian/changelog 2008-03-30 11:03:17 UTC (rev 4956)
+++ packages/pyopenssl/trunk/debian/changelog 2008-03-30 15:19:04 UTC (rev 4957)
@@ -1,3 +1,19 @@
+pyopenssl (0.7a2-1) UNRELEASED; urgency=low
+
+ * New upstream release
+ * debian/patches/01_restore_pristine_code.dpatch
+ - removed since merged upstream
+ * debian/rules
+ - added doc creation at build-time
+ * debian/patches/10_fix_doc_buildsystem.dpatch
+ - added to allow doc build on debian
+ * debian/control
+ - added tex4ht and w3m build-dep needed to build doc
+ * debian/python-openssl-doc.doc-base
+ - updated for new index filename
+
+ -- Sandro Tosi <matrixhasu at gmail.com> Sun, 30 Mar 2008 17:18:40 +0200
+
pyopenssl (0.6-5) unstable; urgency=low
* debian/control
Modified: packages/pyopenssl/trunk/debian/control
===================================================================
--- packages/pyopenssl/trunk/debian/control 2008-03-30 11:03:17 UTC (rev 4956)
+++ packages/pyopenssl/trunk/debian/control 2008-03-30 15:19:04 UTC (rev 4957)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
Uploaders: Sandro Tosi <matrixhasu at gmail.com>
-Build-Depends: debhelper (>= 5.0.37.2), python-all-dev (>= 2.3.5-11), python-all-dbg (>= 2.4.4-6), python-support (>= 0.6.4), libssl-dev (>= 0.9.8), dpatch
+Build-Depends: debhelper (>= 5.0.37.2), python-all-dev (>= 2.3.5-11), python-all-dbg (>= 2.4.4-6), python-support (>= 0.6.4), libssl-dev (>= 0.9.8), dpatch, tex4ht, w3m
Standards-Version: 3.7.3
Homepage: http://pyopenssl.sourceforge.net/
Vcs-Svn: svn://svn.debian.org/python-modules/packages/pycg/trunk/
Modified: packages/pyopenssl/trunk/debian/patches/00list
===================================================================
--- packages/pyopenssl/trunk/debian/patches/00list 2008-03-30 11:03:17 UTC (rev 4956)
+++ packages/pyopenssl/trunk/debian/patches/00list 2008-03-30 15:19:04 UTC (rev 4957)
@@ -1 +1 @@
-01_restore_pristine_code
+10_fix_doc_buildsystem
Deleted: packages/pyopenssl/trunk/debian/patches/01_restore_pristine_code.dpatch
===================================================================
--- packages/pyopenssl/trunk/debian/patches/01_restore_pristine_code.dpatch 2008-03-30 11:03:17 UTC (rev 4956)
+++ packages/pyopenssl/trunk/debian/patches/01_restore_pristine_code.dpatch 2008-03-30 15:19:04 UTC (rev 4957)
@@ -1,66 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_restore_pristine_code.dpatch by Sandro Tosi <matrixhasu at gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: New patch generated from pyopenssl 0.6-3 diff.gz
-
- at DPATCH@
-
---- pyopenssl-0.6.orig/src/crypto/x509ext.c
-+++ pyopenssl-0.6/src/crypto/x509ext.c
-@@ -57,7 +57,7 @@
- {
- crypto_X509ExtensionObj *self;
- int ext_len, ext_nid;
-- unsigned char *ext_der, *p;
-+ unsigned char *ext_der;
- X509V3_EXT_METHOD *ext_method = NULL;
- ASN1_OCTET_STRING *ext_oct;
- STACK_OF(CONF_VALUE) *nval;
-@@ -110,17 +110,29 @@
- sk_CONF_VALUE_pop_free(nval, X509V3_conf_free);
-
- /* Find out how much memory we need */
-- ext_len = ext_method->i2d(ext_struct, NULL);
--
-- /* Allocate */
-- if(!(ext_der = malloc(ext_len))) {
-- PyErr_SetString(PyExc_MemoryError, "Could not allocate memory");
-- return NULL;
-+
-+
-+ /* Convert internal representation to DER */
-+ /* and Allocate */
-+ if (ext_method->it) {
-+ ext_der = NULL;
-+ ext_len = ASN1_item_i2d(ext_struct, &ext_der, ASN1_ITEM_ptr(ext_method->it));
-+ if (ext_len < 0) {
-+ PyErr_SetString(PyExc_MemoryError, "Could not allocate memory");
-+ return NULL;
-+ }
-+ } else {
-+ unsigned char *p;
-+ ext_len = ext_method->i2d(ext_struct, NULL);
-+ if(!(ext_der = malloc(ext_len))) {
-+ PyErr_SetString(PyExc_MemoryError, "Could not allocate memory");
-+ return NULL;
-+ }
-+ p = ext_der;
-+ ext_method->i2d(ext_struct, &p);
- }
-
- /* And create the ASN1_OCTET_STRING */
-- p = ext_der;
-- ext_method->i2d(ext_struct, &p);
- if(!(ext_oct = M_ASN1_OCTET_STRING_new())) {
- exception_from_error_queue();
- return NULL;
-@@ -140,7 +152,7 @@
- }
-
- M_ASN1_OCTET_STRING_free(ext_oct);
-- ext_method->ext_free(ext_struct);
-+ //ext_method->ext_free(ext_struct);
-
- self->x509_extension = extension;
- self->dealloc = 1;
Added: packages/pyopenssl/trunk/debian/patches/10_fix_doc_buildsystem.dpatch
===================================================================
--- packages/pyopenssl/trunk/debian/patches/10_fix_doc_buildsystem.dpatch (rev 0)
+++ packages/pyopenssl/trunk/debian/patches/10_fix_doc_buildsystem.dpatch 2008-03-30 15:19:04 UTC (rev 4957)
@@ -0,0 +1,163 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_fix_doc_buildsystem.dpatch by Sandro Tosi <matrixhasu at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad pyOpenSSL-0.7a1.orig/doc/Makefile pyOpenSSL-0.7a1/doc/Makefile
+--- pyOpenSSL-0.7a1.orig/doc/Makefile 2008-03-03 21:16:05.000000000 +0100
++++ pyOpenSSL-0.7a1/doc/Makefile 2008-03-29 13:29:01.141884954 +0100
+@@ -10,11 +10,11 @@
+
+ html: pyOpenSSL.tex
+ $(MKHOWTO) --html --iconserver . $^
+- -rm -rf html
+- mv pyOpenSSL html
++ -rm -rf html/
++ mkdir html/
++ mv *.html pyOpenSSL.css html/
+
+ clean:
+- rm -rf html pyOpenSSL.dvi pyOpenSSL.ps pyOpenSSL.txt \
+- pyOpenSSL.l2h pyOpenSSL.how
++ rm -rf html/ *.html pyOpenSSL.[0-9a-su-z]* pyOpenSSL.txt pyOpenSSL.tmp
+
+ .PHONY: default all html dvi ps text clean
+diff -urNad pyOpenSSL-0.7a1.orig/doc/tools/mkhowto pyOpenSSL-0.7a1/doc/tools/mkhowto
+--- pyOpenSSL-0.7a1.orig/doc/tools/mkhowto 2008-03-03 21:16:05.000000000 +0100
++++ pyOpenSSL-0.7a1/doc/tools/mkhowto 2008-03-29 13:10:59.744259615 +0100
+@@ -55,8 +55,8 @@
+ BIBTEX_BINARY = "bibtex"
+ DVIPS_BINARY = "dvips"
+ LATEX_BINARY = "latex"
+-LATEX2HTML_BINARY = "latex2html"
+-LYNX_BINARY = "lynx"
++LATEX2HTML_BINARY = "htlatex"
++LYNX_BINARY = "w3m"
+ MAKEINDEX_BINARY = "makeindex"
+ PDFLATEX_BINARY = "pdflatex"
+ PERL_BINARY = "perl"
+@@ -232,33 +232,10 @@
+ self.build_ps()
+ if "html" in formats:
+ self.require_temps()
+- self.build_html(self.options.builddir or self.doc)
+- if self.options.icon_server == ".":
+- pattern = os.path.join(MYDIR, "html", "icons",
+- "*." + self.options.image_type)
+- imgs = glob.glob(pattern)
+- if not imgs:
+- self.warning(
+- "Could not locate support images of type %s."
+- % `self.options.image_type`)
+- for fn in imgs:
+- new_fn = os.path.join(self.doc, os.path.basename(fn))
+- shutil.copyfile(fn, new_fn)
++ self.build_html()
+ if "text" in formats:
+- self.require_temps()
+- tempdir = self.doc
+- need_html = "html" not in formats
+- if self.options.max_split_depth != 1:
+- fp = open(self.l2h_aux_init_file, "a")
+- fp.write("# re-hack this file for --text:\n")
+- l2hoption(fp, "MAX_SPLIT_DEPTH", "1")
+- fp.write("1;\n")
+- fp.close()
+- tempdir = self.doc + "-temp-html"
+- need_html = 1
+- if need_html:
+- self.build_html(tempdir, max_split_depth=1)
+- self.build_text(tempdir)
++ self.build_html()
++ self.build_text()
+ if self.options.discard_temps:
+ self.cleanup()
+
+@@ -282,6 +259,10 @@
+ def build_pdf(self):
+ self.use_latex(PDFLATEX_BINARY)
+
++ def build_html(self):
++ self.setup_texinputs()
++ self.run("%s %s" % (LATEX2HTML_BINARY, self.doc))
++
+ def use_latex(self, binary):
+ self.require_temps(binary=binary)
+ if self.latex_runs < 2:
+@@ -333,72 +314,8 @@
+ def build_ps(self):
+ self.run("%s -N0 -o %s.ps %s" % (DVIPS_BINARY, self.doc, self.doc))
+
+- def build_html(self, builddir=None, max_split_depth=None):
+- if builddir is None:
+- builddir = self.doc
+- if max_split_depth is None:
+- max_split_depth = self.options.max_split_depth
+- texfile = None
+- for p in string.split(os.environ["TEXINPUTS"], os.pathsep):
+- fn = os.path.join(p, self.doc + ".tex")
+- if os.path.isfile(fn):
+- texfile = fn
+- break
+- if not texfile:
+- self.warning("Could not locate %s.tex; aborting." % self.doc)
+- sys.exit(1)
+- # remove leading ./ (or equiv.); might avoid problems w/ dvips
+- if texfile[:2] == os.curdir + os.sep:
+- texfile = texfile[2:]
+- # build the command line and run LaTeX2HTML:
+- if not os.path.isdir(builddir):
+- os.mkdir(builddir)
+- else:
+- for fname in glob.glob(os.path.join(builddir, "*.html")):
+- os.unlink(fname)
+- args = [LATEX2HTML_BINARY,
+- "-init_file", self.l2h_aux_init_file,
+- "-dir", builddir,
+- texfile
+- ]
+- self.run(string.join(args)) # XXX need quoting!
+- # ... postprocess
+- shutil.copyfile(self.options.style_file,
+- os.path.join(builddir, self.doc + ".css"))
+- shutil.copyfile(os.path.join(builddir, self.doc + ".html"),
+- os.path.join(builddir, "index.html"))
+- if max_split_depth != 1:
+- if self.options.numeric:
+- label_file = os.path.join(builddir, "labels.pl")
+- fp = open(label_file)
+- about_node = None
+- target = " = q/about/;\n"
+- x = len(target)
+- while 1:
+- line = fp.readline()
+- if not line:
+- break
+- if line[-x:] == target:
+- line = fp.readline()
+- m = re.search(r"\|(node\d+\.[a-z]+)\|", line)
+- about_node = m.group(1)
+- shutil.copyfile(os.path.join(builddir, about_node),
+- os.path.join(builddir, "about.html"))
+- break
+- else:
+- pwd = os.getcwd()
+- try:
+- os.chdir(builddir)
+- self.run("%s %s *.html" % (PERL_BINARY, NODE2LABEL_SCRIPT))
+- finally:
+- os.chdir(pwd)
+-
+- def build_text(self, tempdir=None):
+- if tempdir is None:
+- tempdir = self.doc
+- indexfile = os.path.join(tempdir, "index.html")
+- self.run("%s -nolist -dump %s >%s.txt"
+- % (LYNX_BINARY, indexfile, self.doc))
++ def build_text(self):
++ self.run("%s -dump %s > %s.txt" % (LYNX_BINARY, "pyOpenSSL.html", self.doc))
+
+ def require_temps(self, binary=None):
+ if not self.latex_runs:
Modified: packages/pyopenssl/trunk/debian/python-openssl-doc.doc-base
===================================================================
--- packages/pyopenssl/trunk/debian/python-openssl-doc.doc-base 2008-03-30 11:03:17 UTC (rev 4956)
+++ packages/pyopenssl/trunk/debian/python-openssl-doc.doc-base 2008-03-30 15:19:04 UTC (rev 4957)
@@ -6,5 +6,5 @@
Section: Programming
Format: HTML
-Index: /usr/share/doc/python-openssl-doc/html/index.html
+Index: /usr/share/doc/python-openssl-doc/html/pyOpenSSL.html
Files: /usr/share/doc/python-openssl-doc/html/*
Modified: packages/pyopenssl/trunk/debian/rules
===================================================================
--- packages/pyopenssl/trunk/debian/rules 2008-03-30 11:03:17 UTC (rev 4956)
+++ packages/pyopenssl/trunk/debian/rules 2008-03-30 15:19:04 UTC (rev 4957)
@@ -17,6 +17,8 @@
$$py-dbg setup.py build; \
done
+ $(MAKE) -C doc all
+
touch build-stamp
clean: unpatch
@@ -30,6 +32,8 @@
done
rm -rf build version.pyc
+ $(MAKE) -C doc clean
+
dh_clean
install: DH_OPTIONS=
More information about the Python-modules-commits
mailing list