[DRE-commits] r2853 - in packages/libxml-parser-ruby/trunk/debian: . patches
filipe-guest at alioth.debian.org
filipe-guest at alioth.debian.org
Sat Jun 28 01:50:17 UTC 2008
Author: filipe-guest
Date: 2008-06-28 01:50:16 +0000 (Sat, 28 Jun 2008)
New Revision: 2853
Added:
packages/libxml-parser-ruby/trunk/debian/patches/
packages/libxml-parser-ruby/trunk/debian/patches/001-adds_return_statement_to_return_value.patch
packages/libxml-parser-ruby/trunk/debian/patches/002-replaces_gt_symbol_by_enconded_version.patch
Modified:
packages/libxml-parser-ruby/trunk/debian/changelog
packages/libxml-parser-ruby/trunk/debian/compat
packages/libxml-parser-ruby/trunk/debian/control
packages/libxml-parser-ruby/trunk/debian/rules
packages/libxml-parser-ruby/trunk/debian/watch
Log:
* Applied Barry deFreese patch to allow package to stick to pkg-
ruby-extra standards and moving libuconv-ruby1.8 from suggests
to depends field (closes: #454953, #396019).
* Moved Debian Ruby Extras Maintainers to uploaders field and set
myself as maintainer (closes: #472433).
* Created patch to add return missing return statement in file
lib/xml/saxdriver.rb:171 (closes: #421250).
* Added diff to escape all > symbol in command strings to allow
compatibility with broken XML parsers (closes: #403164).
Modified: packages/libxml-parser-ruby/trunk/debian/changelog
===================================================================
--- packages/libxml-parser-ruby/trunk/debian/changelog 2008-06-26 14:40:59 UTC (rev 2852)
+++ packages/libxml-parser-ruby/trunk/debian/changelog 2008-06-28 01:50:16 UTC (rev 2853)
@@ -1,13 +1,21 @@
libxml-parser-ruby (0.6.8-4) UNRELEASED; urgency=low
- [ Lucas Nussbaum ]
- * NOT RELEASED YET
-
[ Vincent Fourmond ]
* Added watchfile
- -- Vincent Fourmond <fourmond at debian.org> Mon, 10 Dec 2007 20:08:24 +0100
+ [ Filipe Lautert ]
+ * Applied Barry deFreese patch to allow package to stick to pkg-
+ ruby-extra standards and moving libuconv-ruby1.8 from suggests
+ to depends field (closes: #454953, #396019).
+ * Moved Debian Ruby Extras Maintainers to uploaders field and set
+ myself as maintainer (closes: #472433).
+ * Created patch to add return missing return statement in file
+ lib/xml/saxdriver.rb:171 (closes: #421250).
+ * Added diff to escape all > symbol in command strings to allow
+ compatibility with broken XML parsers (closes: #403164).
+ -- Filipe Lautert <filipe at icewall.org> Fri, 27 Jun 2008 21:13:54 -0300
+
libxml-parser-ruby (0.6.8-3) unstable; urgency=low
* New maintainer.
Modified: packages/libxml-parser-ruby/trunk/debian/compat
===================================================================
--- packages/libxml-parser-ruby/trunk/debian/compat 2008-06-26 14:40:59 UTC (rev 2852)
+++ packages/libxml-parser-ruby/trunk/debian/compat 2008-06-28 01:50:16 UTC (rev 2853)
@@ -1 +1 @@
-4
+5
Modified: packages/libxml-parser-ruby/trunk/debian/control
===================================================================
--- packages/libxml-parser-ruby/trunk/debian/control 2008-06-26 14:40:59 UTC (rev 2852)
+++ packages/libxml-parser-ruby/trunk/debian/control 2008-06-28 01:50:16 UTC (rev 2853)
@@ -1,16 +1,17 @@
Source: libxml-parser-ruby
Section: interpreters
Priority: optional
-Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
-Build-Depends: debhelper (>> 3), libexpat1-dev (>= 1.95.1), ruby1.8, ruby1.8-dev
-Standards-Version: 3.6.1
+Maintainer: Filipe Lautert <filipe at debian.org>
+Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
+Build-Depends: debhelper (>> 5), cdbs, ruby-pkg-tools, libexpat1-dev (>= 1.95.1), ruby1.8, ruby1.8-dev
+Standards-Version: 3.7.3
Vcs-Browser: http://svn.debian.org/wsvn/pkg-ruby-extras/packages/libxml-parser-ruby/
Vcs-Svn: svn://svn.debian.org/pkg-ruby-extras/packages/libxml-parser-ruby/
+Homepage: http://www.yoshidam.net/Ruby.html
Package: libxml-parser-ruby1.8
Architecture: any
-Depends: ${shlibs:Depends}
-Suggests: libuconv-ruby1.8
+Depends: ${shlibs:Depends}, libuconv-ruby1.8
Description: Interface of expat for the scripting language Ruby 1.8
This is the module to access to James Clark's XML Parser Toolkit "expat"
<URL:http://www.jclark.com/xml/expat.html> from Ruby 1.8.
Added: packages/libxml-parser-ruby/trunk/debian/patches/001-adds_return_statement_to_return_value.patch
===================================================================
--- packages/libxml-parser-ruby/trunk/debian/patches/001-adds_return_statement_to_return_value.patch (rev 0)
+++ packages/libxml-parser-ruby/trunk/debian/patches/001-adds_return_statement_to_return_value.patch 2008-06-28 01:50:16 UTC (rev 2853)
@@ -0,0 +1,11 @@
+--- lib/xml/saxdriver.rb-or 2008-06-27 20:44:58.878527643 -0300
++++ lib/xml/saxdriver.rb 2008-06-27 20:46:09.577836925 -0300
+@@ -168,7 +168,7 @@
+ ## open stream if it is not opened
+ def openInputStream(stream)
+ if stream.getByteStream
+- stream
++ return stream
+ else stream.getSystemId
+ url = URL.new(stream.getSystemId)
+ if url.scheme == 'file' && url.login == 'localhost'
Added: packages/libxml-parser-ruby/trunk/debian/patches/002-replaces_gt_symbol_by_enconded_version.patch
===================================================================
--- packages/libxml-parser-ruby/trunk/debian/patches/002-replaces_gt_symbol_by_enconded_version.patch (rev 0)
+++ packages/libxml-parser-ruby/trunk/debian/patches/002-replaces_gt_symbol_by_enconded_version.patch 2008-06-28 01:50:16 UTC (rev 2853)
@@ -0,0 +1,44 @@
+--- samples/expat-1.2/exttest.rb-or 2008-06-27 21:01:14.048338043 -0300
++++ samples/expat-1.2/exttest.rb 2008-06-27 21:01:35.025317132 -0300
+@@ -24,6 +24,8 @@
+ ret << """
+ elsif c == "<"
+ ret << "<"
++ elsif c == ">"
++ ret << ">"
+ else
+ ret << c
+ end
+--- samples/expat-1.2/exttesti.rb-or 2008-06-27 21:01:54.846266663 -0300
++++ samples/expat-1.2/exttesti.rb 2008-06-27 21:02:11.107011550 -0300
+@@ -14,6 +14,8 @@
+ ret << """
+ elsif c == "<"
+ ret << "<"
++ elsif c == ">"
++ ret << ">"
+ else
+ ret << c
+ end
+--- lib/xml/dom/core.rb-or 2008-06-27 20:59:32.683571274 -0300
++++ lib/xml/dom/core.rb 2008-06-27 20:55:40.784674948 -0300
+@@ -1846,6 +1846,8 @@
+ value << """
+ when ?<
+ value << "<"
++ when ?>
++ value << ">"
+ else
+ value << code
+ end
+--- lib/xml/dom2/attr.rb-or 2008-06-27 20:57:36.750125082 -0300
++++ lib/xml/dom2/attr.rb 2008-06-27 20:58:40.725139931 -0300
+@@ -122,6 +122,8 @@
+ value << """
+ elsif c == "<"
+ value << "<"
++ elsif c == ">"
++ value << ">"
+ else
+ value << c
+ end
Modified: packages/libxml-parser-ruby/trunk/debian/rules
===================================================================
--- packages/libxml-parser-ruby/trunk/debian/rules 2008-06-26 14:40:59 UTC (rev 2852)
+++ packages/libxml-parser-ruby/trunk/debian/rules 2008-06-28 01:50:16 UTC (rev 2853)
@@ -1,94 +1,10 @@
#!/usr/bin/make -f
-# -*- mode: makefile; -*-
-# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
-# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/ruby-pkg-tools/1/class/ruby-common.mk
+include /usr/share/ruby-pkg-tools/1/class/ruby-extconf-rb.mk
-# This is the debhelper compatability version to use.
-#export DH_COMPAT=3
-
-build: build-stamp
-build-stamp:
- dh_testdir
-
- -rm -rf build-tree-1.8
- mkdir build-tree-1.8
- cd build-tree-1.8 && ruby1.8 ../extconf.rb \
- --with-perl-enc-map=/usr/lib/perl5/XML/Parser/Encodings && \
- $(MAKE)
-
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp install-stamp
-
- -rm -rf build-tree-1.8
-
- dh_clean
-
-install: install-stamp
-install-stamp: build-stamp
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- # Add here commands to install the package into debian/tmp.
- $(MAKE) -C build-tree-1.8 sitedir=$(CURDIR)/debian/libxml-parser-ruby1.8/usr/lib/ruby install
-
- touch install-stamp
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-# dh_testversion
- dh_testdir
- dh_testroot
- dh_installdocs -A README*
- tar cf - Encodings | \
- (cd $(CURDIR)/debian/libxml-parser-ruby1.8/usr/share/doc/libxml-parser-ruby1.8 && tar xvf -)
- dh_installexamples -A
- install -d $(CURDIR)/debian/libxml-parser-ruby1.8/usr/share/doc/libxml-parser-ruby1.8/examples
- (cd samples && tar --exclude CVS -cf - .) | \
- (cd $(CURDIR)/debian/libxml-parser-ruby1.8/usr/share/doc/libxml-parser-ruby1.8/examples && tar xvf -)
- for f in `find $(CURDIR)/debian/libxml-parser-ruby*/usr/share/doc/*/examples -type f`; \
- do \
- cp -p $$f $$f.tmp; \
- sed -e '1,1s,^#![ ]*\([^ ]*\)/\(ruby\),#!/usr/bin/\2,' < $$f > $$f.tmp; \
- if ! cmp $$f $$f.tmp >/dev/null; \
- then \
- mv -f $$f.tmp $$f; \
- else \
- rm -f $$f.tmp; \
- fi; \
- done
-# dh_installmenu
-# dh_installemacsen
-# dh_installpam
-# dh_installinit
-# dh_installcron
-# dh_installmanpages
-# dh_undocumented
- dh_installchangelogs
- dh_link
- dh_strip
- dh_compress -X.rb -X.xml -X.dtd
- dh_fixperms
-# dh_makeshlibs
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-source diff:
- @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+DEB_RUBY_SETUP_ARGS = --with-perl-enc-map=/usr/lib/perl5/XML/Parser/Encodings
+DEB_RUBY_INSTALL_ARGS = sitedir=$(CURDIR)/debian/libxml-parser-ruby1.8/usr/lib/ruby
Modified: packages/libxml-parser-ruby/trunk/debian/watch
===================================================================
--- packages/libxml-parser-ruby/trunk/debian/watch 2008-06-26 14:40:59 UTC (rev 2852)
+++ packages/libxml-parser-ruby/trunk/debian/watch 2008-06-28 01:50:16 UTC (rev 2853)
@@ -1,2 +1,4 @@
version=3
+http://www.yoshidam.net/Ruby.html xmlparser-([\d.]+)\.tar\.gz
+version=3
http://www.yoshidam.net/Ruby.html xmlparser-(.*).tar.gz
\ No newline at end of file
More information about the Pkg-ruby-extras-commits
mailing list