← Back to branch summary

~ubuntu-branches/ubuntu/vivid/zonecheck/vivid

« back to all changes in this revision

Viewing changes to debian/patches/50_libxml_407896-fix.dpatch

  • Committer: Package Import Robot
  • Author(s): Sebastien Delafond
  • Date: 2012-06-18 15:44:33 UTC
  • Revision ID: package-import@ubuntu.com-20120618154433-hxy9iuf4fa9k2jvv
Tags: 3.0.3-2
http://bugs.debian.org/676109
http://bugs.debian.org/676173
* Fix problems related to ruby 1.9, thanks to patches from Antonio
  Terceiro <terceiro@debian.org> (Closes: #676109, #676173)
* Bump-up Standards revision.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/50_libxml_407896-fix.dpatch
1
 
#! /bin/sh /usr/share/dpatch/dpatch-run
2
 
## 50_libxml_407896-fix.dpatch by Sebastien Delafond <seb@debian.org>
3
 
##
4
 
## All lines beginning with `## DP:' are a description of the patch.
5
 
## DP: Don't use libxml even if it's available.
6
 
 
7
 
@DPATCH@
8
 
diff -urNad 2.0.4~/zc/ext/myxml.rb 2.0.4/zc/ext/myxml.rb
9
 
--- 2.0.4~/zc/ext/myxml.rb      2004-01-07 08:44:56.000000000 -0800
10
 
+++ 2.0.4/zc/ext/myxml.rb       2007-04-06 12:30:17.000000000 -0700
11
 
@@ -46,12 +46,7 @@
12
 
                          if $zc_xml_parser
13
 
                              $zc_xml_parser.intern
14
 
                          else
15
 
-                             begin
16
 
-                                 require 'xml/libxml'
17
 
-                                 :libxml
18
 
-                             rescue LoadError
19
 
-                                 :rexml
20
 
-                             end
21
 
+                            :rexml
22
 
                          end
23
 
                      }).call
24