[DRE-commits] r3781 - in packages/libparsetree-ruby/trunk: . debian debian/patches
Tobias Grimm
tiber-guest at alioth.debian.org
Fri Jul 10 09:22:08 UTC 2009
Author: tiber-guest
Date: 2009-07-10 09:22:07 +0000 (Fri, 10 Jul 2009)
New Revision: 3781
Added:
packages/libparsetree-ruby/trunk/debian/
packages/libparsetree-ruby/trunk/debian/changelog
packages/libparsetree-ruby/trunk/debian/compat
packages/libparsetree-ruby/trunk/debian/control
packages/libparsetree-ruby/trunk/debian/copyright
packages/libparsetree-ruby/trunk/debian/libparsetree-ruby1.8.dirs
packages/libparsetree-ruby/trunk/debian/patches/
packages/libparsetree-ruby/trunk/debian/patches/00list
packages/libparsetree-ruby/trunk/debian/patches/10_correct-path-for-ruby-interpreter.dpatch
packages/libparsetree-ruby/trunk/debian/patches/20_no-shebang.dpatch
packages/libparsetree-ruby/trunk/debian/patches/30_fix_for_ruby_1.8.7.160.dpatch
packages/libparsetree-ruby/trunk/debian/rules
Log:
[svn-inject] Applying Debian modifications to trunk
Property changes on: packages/libparsetree-ruby/trunk/debian
___________________________________________________________________
Added: mergeWithUpstream
+ 1
Added: packages/libparsetree-ruby/trunk/debian/changelog
===================================================================
--- packages/libparsetree-ruby/trunk/debian/changelog (rev 0)
+++ packages/libparsetree-ruby/trunk/debian/changelog 2009-07-10 09:22:07 UTC (rev 3781)
@@ -0,0 +1,18 @@
+libparsetree-ruby (2.2.1-2) unstable; urgency=low
+
+ * Added 30_fix_for_ruby_1.8.7.160.dpatch to fix some broken
+ behaviour with Ruby 1.8.7.174 (Closes: #536437)
+ * Added Debian Ruby Extras Maintainers to list of uploaders
+ * Added Tobias Grimm <etobi at debian.org> to uploaders
+ * Added Homepage field to debian/control
+ * Added package VCS links to debian/control
+ * Bumped standards version to 3.8.2, debhelper (>= 5)
+ * Changed section to 'ruby'
+
+ -- Tobias Grimm <etobi at debian.org> Fri, 10 Jul 2009 10:51:53 +0200
+
+libparsetree-ruby (2.2.1-1) unstable; urgency=low
+
+ * Initial Release (Closes: #480695).
+
+ -- Sebastien Delafond <seb at debian.org> Sun, 11 May 2008 09:47:56 -0700
Added: packages/libparsetree-ruby/trunk/debian/compat
===================================================================
--- packages/libparsetree-ruby/trunk/debian/compat (rev 0)
+++ packages/libparsetree-ruby/trunk/debian/compat 2009-07-10 09:22:07 UTC (rev 3781)
@@ -0,0 +1 @@
+5
Added: packages/libparsetree-ruby/trunk/debian/control
===================================================================
--- packages/libparsetree-ruby/trunk/debian/control (rev 0)
+++ packages/libparsetree-ruby/trunk/debian/control 2009-07-10 09:22:07 UTC (rev 3781)
@@ -0,0 +1,31 @@
+Source: libparsetree-ruby
+Section: ruby
+Priority: optional
+Maintainer: Sebastien Delafond <seb at debian.org>
+Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>, Tobias Grimm <etobi at debian.org>
+Build-Depends: debhelper (>= 5), dpatch
+Standards-Version: 3.8.2
+Homepage: http://rubyforge.org/projects/parsetree
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-ruby-extras/packages/libparsetree-ruby/
+Vcs-Svn: svn://svn.debian.org/pkg-ruby-extras/packages/libparsetree-ruby/
+
+Package: libparsetree-ruby1.8
+Architecture: all
+Depends: ruby1.8, libinline-ruby1.8
+Description: Extracts the parse tree for a class or method and returns it as a s-expression
+ ParseTree is a C extension (using RubyInline) that extracts the parse
+ tree for an entire class or a specific method and returns it as a
+ s-expression (aka sexp) using ruby's arrays, strings, symbols, and
+ integers.
+
+Package: libparsetree-ruby
+Architecture: all
+Depends: libparsetree-ruby1.8
+Description: Extracts the parse tree for a class or method and returns it as a s-expression
+ ParseTree is a C extension (using RubyInline) that extracts the parse
+ tree for an entire class or a specific method and returns it as a
+ s-expression (aka sexp) using ruby's arrays, strings, symbols, and
+ integers.
+ .
+ This package provide documentation and depends on the package
+ containing the actual library for the default Ruby version.
Added: packages/libparsetree-ruby/trunk/debian/copyright
===================================================================
--- packages/libparsetree-ruby/trunk/debian/copyright (rev 0)
+++ packages/libparsetree-ruby/trunk/debian/copyright 2009-07-10 09:22:07 UTC (rev 3781)
@@ -0,0 +1,29 @@
+This package was debianized by Sebastien Delafond <seb at debian.org> on
+Sun, 11 May 2008 09:55:11 -0700
+
+It was downloaded from <URL:http://rubyforge.org/projects/parsetree/>
+
+Upstream Authors: Ryan Davis, Zen Spider Software
+
+Copyright:
+
+ Copyright (c) 2001-2007 Ryan Davis, Zen Spider Software
+
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Added: packages/libparsetree-ruby/trunk/debian/libparsetree-ruby1.8.dirs
===================================================================
--- packages/libparsetree-ruby/trunk/debian/libparsetree-ruby1.8.dirs (rev 0)
+++ packages/libparsetree-ruby/trunk/debian/libparsetree-ruby1.8.dirs 2009-07-10 09:22:07 UTC (rev 3781)
@@ -0,0 +1,2 @@
+usr/lib/ruby/1.8
+usr/bin
Added: packages/libparsetree-ruby/trunk/debian/patches/00list
===================================================================
--- packages/libparsetree-ruby/trunk/debian/patches/00list (rev 0)
+++ packages/libparsetree-ruby/trunk/debian/patches/00list 2009-07-10 09:22:07 UTC (rev 3781)
@@ -0,0 +1,3 @@
+10_correct-path-for-ruby-interpreter
+20_no-shebang
+30_fix_for_ruby_1.8.7.160
Added: packages/libparsetree-ruby/trunk/debian/patches/10_correct-path-for-ruby-interpreter.dpatch
===================================================================
--- packages/libparsetree-ruby/trunk/debian/patches/10_correct-path-for-ruby-interpreter.dpatch (rev 0)
+++ packages/libparsetree-ruby/trunk/debian/patches/10_correct-path-for-ruby-interpreter.dpatch 2009-07-10 09:22:07 UTC (rev 3781)
@@ -0,0 +1,43 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_correct-path-for-ruby-interpreter.dpatch by Sebastien Delafond <seb at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Correct Ruby interpreter.
+
+ at DPATCH@
+diff -urNad ParseTree-2.1.1~/bin/parse_tree_abc ParseTree-2.1.1/bin/parse_tree_abc
+--- ParseTree-2.1.1~/bin/parse_tree_abc 2007-12-22 17:38:36.000000000 -0800
++++ ParseTree-2.1.1/bin/parse_tree_abc 2008-05-11 10:04:45.000000000 -0700
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/ruby -ws
++#!/usr/bin/ruby1.8 -ws
+
+ # ABC metric
+ #
+diff -urNad ParseTree-2.1.1~/bin/parse_tree_audit ParseTree-2.1.1/bin/parse_tree_audit
+--- ParseTree-2.1.1~/bin/parse_tree_audit 2007-12-22 17:38:36.000000000 -0800
++++ ParseTree-2.1.1/bin/parse_tree_audit 2008-05-11 10:04:45.000000000 -0700
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/ruby -w
++#!/usr/bin/ruby1.8 -w
+
+ require 'parse_tree'
+
+diff -urNad ParseTree-2.1.1~/bin/parse_tree_deps ParseTree-2.1.1/bin/parse_tree_deps
+--- ParseTree-2.1.1~/bin/parse_tree_deps 2007-12-22 17:38:36.000000000 -0800
++++ ParseTree-2.1.1/bin/parse_tree_deps 2008-05-11 10:04:45.000000000 -0700
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/ruby -ws
++#!/usr/bin/ruby1.8 -ws
+
+ old_classes = []; new_classes = []
+
+diff -urNad ParseTree-2.1.1~/bin/parse_tree_show ParseTree-2.1.1/bin/parse_tree_show
+--- ParseTree-2.1.1~/bin/parse_tree_show 2007-12-22 17:38:36.000000000 -0800
++++ ParseTree-2.1.1/bin/parse_tree_show 2008-05-11 10:04:45.000000000 -0700
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/ruby -ws
++#!/usr/bin/ruby1.8 -ws
+
+ require 'pp'
+ begin require 'rubygems' rescue LoadError end
Property changes on: packages/libparsetree-ruby/trunk/debian/patches/10_correct-path-for-ruby-interpreter.dpatch
___________________________________________________________________
Added: svn:executable
+ *
Added: packages/libparsetree-ruby/trunk/debian/patches/20_no-shebang.dpatch
===================================================================
--- packages/libparsetree-ruby/trunk/debian/patches/20_no-shebang.dpatch (rev 0)
+++ packages/libparsetree-ruby/trunk/debian/patches/20_no-shebang.dpatch 2009-07-10 09:22:07 UTC (rev 3781)
@@ -0,0 +1,16 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20_no-shebang.dpatch by Sebastien Delafond <seb at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No shebang line for modules.
+
+ at DPATCH@
+diff -urNad ParseTree-2.1.1~/lib/parse_tree.rb ParseTree-2.1.1/lib/parse_tree.rb
+--- ParseTree-2.1.1~/lib/parse_tree.rb 2007-12-22 17:38:36.000000000 -0800
++++ ParseTree-2.1.1/lib/parse_tree.rb 2008-05-11 10:07:36.000000000 -0700
+@@ -1,5 +1,3 @@
+-#!/usr/local/bin/ruby -w
+-
+ abort "*** Sorry, ParseTree doesn't work with ruby #{RUBY_VERSION}" if
+ RUBY_VERSION >= "1.9"
+
Property changes on: packages/libparsetree-ruby/trunk/debian/patches/20_no-shebang.dpatch
___________________________________________________________________
Added: svn:executable
+ *
Added: packages/libparsetree-ruby/trunk/debian/patches/30_fix_for_ruby_1.8.7.160.dpatch
===================================================================
--- packages/libparsetree-ruby/trunk/debian/patches/30_fix_for_ruby_1.8.7.160.dpatch (rev 0)
+++ packages/libparsetree-ruby/trunk/debian/patches/30_fix_for_ruby_1.8.7.160.dpatch 2009-07-10 09:22:07 UTC (rev 3781)
@@ -0,0 +1,66 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 30_fix_for_ruby_1.8.7.160.dpatch by Tobias Grimm <etobi at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: This patch was taken from upstreams SVN repository revision r468.
+## DP: It fixes some issues that happend between ruby 1.8.7 p72 and p160.
+## DP: (e.g. ParseTree.translate("1..2") returned "lit 1..2 140652106060920"
+## DP: instead of just returning "lit 1..2")
+## DP: Upstream SVN log says:
+## DP: 1.8.6p287 & 1.8.7 changed flip2 with fixnum start. fixed
+
+ at DPATCH@
+diff -urNad libparsetree-ruby-2.2.1~/lib/parse_tree.rb libparsetree-ruby-2.2.1/lib/parse_tree.rb
+--- libparsetree-ruby-2.2.1~/lib/parse_tree.rb 2009-07-10 10:50:32.000000000 +0200
++++ libparsetree-ruby-2.2.1/lib/parse_tree.rb 2009-07-10 10:50:32.000000000 +0200
+@@ -529,10 +529,31 @@
+ add_to_parse_tree(self, current, node->nd_2nd, locals);
+ break;
+
+- case NODE_DOT2:
+- case NODE_DOT3:
+ case NODE_FLIP2:
+ case NODE_FLIP3:
++ if (nd_type(node->nd_beg) == NODE_LIT) {
++ /*
++ new somewhere between 1.8.6 p287 to p368 and 1.8.7 p72 to p160.
++ [:flip2, [:call, [:lit, 1], :==, [:array, [:gvar, :$.]]],
++ */
++ VALUE result = rb_ary_new3(1, _sym("call"));
++ add_to_parse_tree(self, result, node->nd_beg, locals);
++ rb_ary_push(result, _sym("=="));
++ rb_ary_push(result, rb_ary_new3(2, _sym("array"),
++ rb_ary_new3(2, _sym("gvar"),
++ _sym("$."))));
++ rb_ary_push(current, result);
++ } else {
++ add_to_parse_tree(self, current, node->nd_beg, locals);
++ }
++
++
++ // add_to_parse_tree(self, current, node->nd_beg, locals);
++ add_to_parse_tree(self, current, node->nd_end, locals);
++ break;
++
++ case NODE_DOT2:
++ case NODE_DOT3:
+ add_to_parse_tree(self, current, node->nd_beg, locals);
+ add_to_parse_tree(self, current, node->nd_end, locals);
+ break;
+@@ -854,15 +875,10 @@
+ case NODE_STR: /* u1 */
+ case NODE_LIT:
+ rb_ary_push(current, node->nd_lit);
+- if (node->nd_cflag) {
+- rb_ary_push(current, INT2FIX(node->nd_cflag));
+- }
+ break;
+
+ case NODE_MATCH: /* u1 -> [:lit, u1] */
+- {
+- rb_ary_push(current, wrap_into_node("lit", node->nd_lit));
+- }
++ rb_ary_push(current, wrap_into_node("lit", node->nd_lit));
+ break;
+
+ case NODE_NEWLINE:
Property changes on: packages/libparsetree-ruby/trunk/debian/patches/30_fix_for_ruby_1.8.7.160.dpatch
___________________________________________________________________
Added: svn:executable
+ *
Added: packages/libparsetree-ruby/trunk/debian/rules
===================================================================
--- packages/libparsetree-ruby/trunk/debian/rules (rev 0)
+++ packages/libparsetree-ruby/trunk/debian/rules 2009-07-10 09:22:07 UTC (rev 3781)
@@ -0,0 +1,68 @@
+#!/usr/bin/make -f
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+include /usr/share/dpatch/dpatch.make
+
+DESTDIR=$(CURDIR)/debian/libparsetree-ruby1.8
+
+clean: unpatch
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp configure-stamp
+ rm -fr $(DESTDIR)
+ dh_clean
+
+build: build-stamp
+build-stamp: patch
+ touch build-stamp
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ mkdir -p $(DESTDIR)
+ dh_installdirs
+ cp -r lib/* $(DESTDIR)/usr/lib/ruby/1.8/
+ cp -r bin/* $(DESTDIR)/usr/bin/
+
+# Build architecture-independent files here.
+binary-arch: install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-indep: install
+ dh_testdir
+ dh_testroot
+# dh_installdebconf
+ dh_installdocs
+ dh_installdocs -p libparsetree-ruby README.txt demo/
+# dh_installmenu
+# dh_installlogrotate
+# dh_installemacsen
+# dh_installpam
+# dh_installmime
+# dh_installinit
+# dh_installcron
+# dh_installman
+# dh_installinfo
+# dh_undocumented
+ dh_installchangelogs
+ dh_installchangelogs -p libparsetree-ruby History.txt
+ find $(DESTDIR)/usr/lib -type f -exec chmod 644 "{}" \;
+ find $(DESTDIR)/usr/share -type f -exec chmod 644 "{}" \;
+ find $(CURDIR)/debian/libparsetree-ruby/usr/share -type f -exec chmod 644 "{}" \;
+ dh_link
+# dh_strip
+ dh_compress
+ dh_fixperms
+# dh_makeshlibs
+ dh_installdeb
+# dh_perl
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: clean binary-indep binary-arch binary install patch unpatch
Property changes on: packages/libparsetree-ruby/trunk/debian/rules
___________________________________________________________________
Added: svn:executable
+ *
More information about the Pkg-ruby-extras-commits
mailing list