[DRE-commits] r3130 - in packages-wip/libhaml-ruby/trunk/debian: . patches
gwolf at alioth.debian.org
gwolf at alioth.debian.org
Fri Dec 19 01:48:21 UTC 2008
Author: gwolf
Date: 2008-12-19 01:48:21 +0000 (Fri, 19 Dec 2008)
New Revision: 3130
Added:
packages-wip/libhaml-ruby/trunk/debian/patches/
packages-wip/libhaml-ruby/trunk/debian/patches/fix-hardcoded-gem-paths
packages-wip/libhaml-ruby/trunk/debian/patches/fix-hardcoded-gem-paths.patch
packages-wip/libhaml-ruby/trunk/debian/patches/get-version-from-right-path
packages-wip/libhaml-ruby/trunk/debian/patches/get-version-from-right-path.patch
packages-wip/libhaml-ruby/trunk/debian/patches/series
Modified:
packages-wip/libhaml-ruby/trunk/debian/control
packages-wip/libhaml-ruby/trunk/debian/rules
Log:
Added some recommends/build-deps and some debianization patches
Modified: packages-wip/libhaml-ruby/trunk/debian/control
===================================================================
--- packages-wip/libhaml-ruby/trunk/debian/control 2008-12-19 00:18:56 UTC (rev 3129)
+++ packages-wip/libhaml-ruby/trunk/debian/control 2008-12-19 01:48:21 UTC (rev 3130)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Gunnar Wolf <gwolf at debian.org>
Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
-Build-Depends: ruby-pkg-tools (>= 0.8), cdbs, debhelper (>= 7), libsetup-ruby1.8, graphviz
+Build-Depends: ruby-pkg-tools (>= 0.8), cdbs, debhelper (>= 7), libsetup-ruby1.8, graphviz, quilt
Build-Depends-Indep: ruby1.8, rdoc
Standards-Version: 3.8.0
@@ -45,7 +45,7 @@
Package: libhaml-ruby1.8
Architecture: all
Depends: ${misc:Depends}, ruby1.8
-Recommends: rails (>= 2.0.0)
+Recommends: rails (>= 2.0.0), libhpricot-ruby1.8
Description: Elegant, easy and powerful template engines for HTML and CSS
Haml (HTML Abstraction Markup Language) is a layer on top of XHTML or
XML that's designed to express the structure of XHTML or XML
Added: packages-wip/libhaml-ruby/trunk/debian/patches/fix-hardcoded-gem-paths
===================================================================
--- packages-wip/libhaml-ruby/trunk/debian/patches/fix-hardcoded-gem-paths (rev 0)
+++ packages-wip/libhaml-ruby/trunk/debian/patches/fix-hardcoded-gem-paths 2008-12-19 01:48:21 UTC (rev 3130)
@@ -0,0 +1,58 @@
+# The generated binaries include references to the location where the
+# Haml library should be located... If it was installed as a Gem.
+#
+# Besides this, this patch also collects the changes auto-made by
+# setup.rb to the actual interpreter (/usr/bin/ruby1.8)
+Index: libhaml-ruby-2.0.6/bin/css2sass
+===================================================================
+--- libhaml-ruby-2.0.6.orig/bin/css2sass 2008-12-17 05:14:51.000000000 -0600
++++ libhaml-ruby-2.0.6/bin/css2sass 2008-12-18 19:41:21.000000000 -0600
+@@ -1,6 +1,6 @@
+-#!/usr/bin/env ruby
++#! /usr/bin/ruby1.8
+
+-require File.dirname(__FILE__) + '/../lib/haml'
++require 'haml'
+ require 'haml/exec'
+
+ opts = Haml::Exec::CSS2Sass.new(ARGV)
+Index: libhaml-ruby-2.0.6/bin/haml
+===================================================================
+--- libhaml-ruby-2.0.6.orig/bin/haml 2008-12-17 05:14:51.000000000 -0600
++++ libhaml-ruby-2.0.6/bin/haml 2008-12-18 19:41:21.000000000 -0600
+@@ -1,7 +1,6 @@
+-#!/usr/bin/env ruby
++#! /usr/bin/ruby1.8
+ # The command line Haml parser.
+
+-$LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
+ require 'haml'
+ require 'haml/exec'
+
+Index: libhaml-ruby-2.0.6/bin/html2haml
+===================================================================
+--- libhaml-ruby-2.0.6.orig/bin/html2haml 2008-12-17 05:14:51.000000000 -0600
++++ libhaml-ruby-2.0.6/bin/html2haml 2008-12-18 19:41:21.000000000 -0600
+@@ -1,6 +1,6 @@
+-#!/usr/bin/env ruby
++#! /usr/bin/ruby1.8
+
+-require File.dirname(__FILE__) + '/../lib/haml'
++require 'haml'
+ require 'haml/exec'
+
+ opts = Haml::Exec::HTML2Haml.new(ARGV)
+Index: libhaml-ruby-2.0.6/bin/sass
+===================================================================
+--- libhaml-ruby-2.0.6.orig/bin/sass 2008-12-17 05:14:51.000000000 -0600
++++ libhaml-ruby-2.0.6/bin/sass 2008-12-18 19:41:21.000000000 -0600
+@@ -1,7 +1,7 @@
+-#!/usr/bin/env ruby
++#! /usr/bin/ruby1.8
+ # The command line Sass parser.
+
+-require File.dirname(__FILE__) + '/../lib/haml'
++require 'haml'
+ require 'haml/exec'
+
+ opts = Haml::Exec::Sass.new(ARGV)
Added: packages-wip/libhaml-ruby/trunk/debian/patches/fix-hardcoded-gem-paths.patch
===================================================================
--- packages-wip/libhaml-ruby/trunk/debian/patches/fix-hardcoded-gem-paths.patch (rev 0)
+++ packages-wip/libhaml-ruby/trunk/debian/patches/fix-hardcoded-gem-paths.patch 2008-12-19 01:48:21 UTC (rev 3130)
@@ -0,0 +1,47 @@
+# The generated binaries include references to the location where the
+# Haml library should be located... If it was installed as a Gem.
+diff -Nur -x '*.orig' -x '*~' libhaml-ruby-2.0.6/bin/css2sass libhaml-ruby-2.0.6.new/bin/css2sass
+--- libhaml-ruby-2.0.6/bin/css2sass 2008-12-18 18:24:08.000000000 -0600
++++ libhaml-ruby-2.0.6.new/bin/css2sass 2008-12-18 19:18:30.000000000 -0600
+@@ -1,6 +1,6 @@
+ #! /usr/bin/ruby1.8
+
+-require File.dirname(__FILE__) + '/../lib/haml'
++require 'haml'
+ require 'haml/exec'
+
+ opts = Haml::Exec::CSS2Sass.new(ARGV)
+diff -Nur -x '*.orig' -x '*~' libhaml-ruby-2.0.6/bin/haml libhaml-ruby-2.0.6.new/bin/haml
+--- libhaml-ruby-2.0.6/bin/haml 2008-12-18 18:24:08.000000000 -0600
++++ libhaml-ruby-2.0.6.new/bin/haml 2008-12-18 19:18:22.000000000 -0600
+@@ -1,7 +1,6 @@
+ #! /usr/bin/ruby1.8
+ # The command line Haml parser.
+
+-$LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
+ require 'haml'
+ require 'haml/exec'
+
+diff -Nur -x '*.orig' -x '*~' libhaml-ruby-2.0.6/bin/html2haml libhaml-ruby-2.0.6.new/bin/html2haml
+--- libhaml-ruby-2.0.6/bin/html2haml 2008-12-18 18:24:08.000000000 -0600
++++ libhaml-ruby-2.0.6.new/bin/html2haml 2008-12-18 19:18:02.000000000 -0600
+@@ -1,6 +1,6 @@
+ #! /usr/bin/ruby1.8
+
+-require File.dirname(__FILE__) + '/../lib/haml'
++require 'haml'
+ require 'haml/exec'
+
+ opts = Haml::Exec::HTML2Haml.new(ARGV)
+diff -Nur -x '*.orig' -x '*~' libhaml-ruby-2.0.6/bin/sass libhaml-ruby-2.0.6.new/bin/sass
+--- libhaml-ruby-2.0.6/bin/sass 2008-12-18 18:24:08.000000000 -0600
++++ libhaml-ruby-2.0.6.new/bin/sass 2008-12-18 19:17:54.000000000 -0600
+@@ -1,7 +1,7 @@
+ #! /usr/bin/ruby1.8
+ # The command line Sass parser.
+
+-require File.dirname(__FILE__) + '/../lib/haml'
++require 'haml'
+ require 'haml/exec'
+
+ opts = Haml::Exec::Sass.new(ARGV)
Added: packages-wip/libhaml-ruby/trunk/debian/patches/get-version-from-right-path
===================================================================
--- packages-wip/libhaml-ruby/trunk/debian/patches/get-version-from-right-path (rev 0)
+++ packages-wip/libhaml-ruby/trunk/debian/patches/get-version-from-right-path 2008-12-19 01:48:21 UTC (rev 3130)
@@ -0,0 +1,16 @@
+# Upstream has defined that, at initialization, the version number should
+# be retrieved from the path this would be installed... Were it to be installed
+# as a Gem :-/ Fix that... In a somewhat dirty way, but still.
+Index: libhaml-ruby-2.0.6/lib/haml.rb
+===================================================================
+--- libhaml-ruby-2.0.6.orig/lib/haml.rb 2008-12-18 19:29:36.000000000 -0600
++++ libhaml-ruby-2.0.6/lib/haml.rb 2008-12-18 19:34:39.000000000 -0600
+@@ -1002,7 +1002,7 @@
+ def self.version
+ return @@version if defined?(@@version)
+
+- numbers = File.read(scope('VERSION')).strip.split('.').map { |n| n.to_i }
++ numbers = File.read('/usr/lib/ruby/1.8/haml/VERSION').strip.split('.').map { |n| n.to_i }
+ @@version = {
+ :major => numbers[0],
+ :minor => numbers[1],
Added: packages-wip/libhaml-ruby/trunk/debian/patches/get-version-from-right-path.patch
===================================================================
--- packages-wip/libhaml-ruby/trunk/debian/patches/get-version-from-right-path.patch (rev 0)
+++ packages-wip/libhaml-ruby/trunk/debian/patches/get-version-from-right-path.patch 2008-12-19 01:48:21 UTC (rev 3130)
@@ -0,0 +1,15 @@
+# Upstream has defined that, at initialization, the version number should
+# be retrieved from the path this would be installed... Were it to be installed
+# as a Gem :-/ Fix that... In a somewhat dirty way, but still.
+diff -Nur -x '*.orig' -x '*~' libhaml-ruby-2.0.6/lib/haml.rb libhaml-ruby-2.0.6.new/lib/haml.rb
+--- libhaml-ruby-2.0.6/lib/haml.rb 2008-12-18 19:13:30.000000000 -0600
++++ libhaml-ruby-2.0.6.new/lib/haml.rb 2008-12-18 19:14:03.000000000 -0600
+@@ -1002,7 +1002,7 @@
+ def self.version
+ return @@version if defined?(@@version)
+
+- numbers = File.read(scope('VERSION')).strip.split('.').map { |n| n.to_i }
++ numbers = File.read('/usr/lib/ruby/1.8/haml/VERSION').strip.split('.').map { |n| n.to_i }
+ @@version = {
+ :major => numbers[0],
+ :minor => numbers[1],
Added: packages-wip/libhaml-ruby/trunk/debian/patches/series
===================================================================
--- packages-wip/libhaml-ruby/trunk/debian/patches/series (rev 0)
+++ packages-wip/libhaml-ruby/trunk/debian/patches/series 2008-12-19 01:48:21 UTC (rev 3130)
@@ -0,0 +1,2 @@
+fix-hardcoded-gem-paths
+get-version-from-right-path
Modified: packages-wip/libhaml-ruby/trunk/debian/rules
===================================================================
--- packages-wip/libhaml-ruby/trunk/debian/rules 2008-12-19 00:18:56 UTC (rev 3129)
+++ packages-wip/libhaml-ruby/trunk/debian/rules 2008-12-19 01:48:21 UTC (rev 3130)
@@ -1,4 +1,8 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/ruby-pkg-tools/1/class/ruby-setup-rb.mk
+
+install/libhaml-ruby1.8::
+ install -m 0644 VERSION ./debian/libhaml-ruby1.8/usr/lib/ruby/1.8/haml/
More information about the Pkg-ruby-extras-commits
mailing list