[DRE-commits] [SCM] amrita2 packaging branch, master, updated. debian/2.0.2+dfsg.1-2-3-g02fabbe

[TANIGUCHI Takaki]

The following commit has been merged in the master branch:
commit 74a08148103844c447e2e7ccaa53c93d21a69a42
Author: TANIGUCHI Takaki <takaki at asis.media-as.org>
Date:   Tue May 17 15:53:36 2011 +0900

    Switch to gem2deb

diff --git a/debian/changelog b/debian/changelog
index e66c2fd..170efc3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-amrita2 (2.0.2+dfsg.1-3) UNRELEASED; urgency=low
+ruby-amrita2 (2.0.2+dfsg.1-3) UNRELEASED; urgency=low
 
   * 
 
diff --git a/debian/control b/debian/control
index 7fa1490..357d618 100644
--- a/debian/control
+++ b/debian/control
@@ -1,16 +1,21 @@
-Source: amrita2
+Source: ruby-amrita2
 Section: ruby
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Uploaders: TANIGUCHI Takaki <takaki at debian.org>
-Build-Depends: cdbs, debhelper (>= 7), ruby-pkg-tools, ruby1.8, ruby1.9.1
-Standards-Version: 3.8.4
+Build-Depends: debhelper (>= 7), gem2deb
+Standards-Version: 3.9.2
 Homepage: http://rubyforge.org/projects/amrita2/
+XS-Ruby-Versions: all
 
-Package: libamrita2-ruby
+Package: ruby-amrita2
 Architecture: all
-Depends: ${misc:Depends}, libhpricot-ruby, libamrita2-ruby1.8
-Description: a xml/xhtml template library for Ruby
+Depends: ${misc:Depends}, 
+	ruby-interpreter | ruby
+Replaces: libamrita-ruby (<< 2.0.2+dfsg.1-3~), libamrita-ruby1.8 (<< 2.0.2+dfsg.1-3~), libamrita-ruby1.9.1 (<< 2.0.2+dfsg.1-3~)
+Conflicts: libamrita-ruby (<< 2.0.2+dfsg.1-3~), libamrita-ruby1.8 (<< 2.0.2+dfsg.1-3~), libamrita-ruby1.9.1 (<< 2.0.2+dfsg.1-3~)
+Provides: libamrita-ruby, libamrita-ruby1.8, libamrita-ruby1.9.1
+Description: XML/XHTML template library for Ruby
  Amrita produces html documents from XML template and Ruby model data.
  .
   * The template for amrita2 is a pure html/xhtml document without any
@@ -30,58 +35,20 @@ Description: a xml/xhtml template library for Ruby
  .
  Amrita2 mixes a template and model data up to a html document naturally
  matching the +id+ attribute of XML element to model data.
- .
- This is a dependency package which depends on Debian's default Ruby version.
 
 Package: libamrita2-ruby1.8
+Section: oldlibs
 Architecture: all
-Depends: ${misc:Depends}, libruby1.8, libhpricot-ruby1.8
-Description: a xml/xhtml template library for Ruby (Ruby 1.8)
- Amrita produces html documents from XML template and Ruby model data.
- .
-  * The template for amrita2 is a pure html/xhtml document without any
-    special tag like <?...?> or <% .. %>
- .
-  * The template can be written by designers using almost any xhtml/xml
-    Editor.
- .
-  * Need no change on Ruby code to change the view of _dynamic_ part
-    (not only static part) of the template
- .
-  * The model data may be standard Ruby data, Hash, Array, String... or
-    an instance of classes you made.
- .
-  * The output is controlled by _data_ not by logic. So It's easy to
-    write, test, debug code. (Good for eXtreamPrograming)
- .
- Amrita2 mixes a template and model data up to a html document naturally
- matching the +id+ attribute of XML element to model data.
- .
- This is a dependency package which depends on Debian's default Ruby version.
+Depends: ${misc:Depends}, ruby-amrita2
+Description: Transitional package for ruby-amrita2
+ This is a transitional package to ease upgrades to the ruby-amrita2
+ package. It can safely be removed.
+
 
 Package: libamrita2-ruby1.9.1
+Section: oldlibs
 Architecture: all
-Depends: ${misc:Depends}, libruby1.9.1, libhpricot-ruby1.9.1
-Description: a xml/xhtml template library for Ruby (Ruby 1.9)
- Amrita produces html documents from XML template and Ruby model data.
- .
-  * The template for amrita2 is a pure html/xhtml document without any
-    special tag like <?...?> or <% .. %>
- .
-  * The template can be written by designers using almost any xhtml/xml
-    Editor.
- .
-  * Need no change on Ruby code to change the view of _dynamic_ part
-    (not only static part) of the template
- .
-  * The model data may be standard Ruby data, Hash, Array, String... or
-    an instance of classes you made.
- .
-  * The output is controlled by _data_ not by logic. So It's easy to
-    write, test, debug code. (Good for eXtreamPrograming)
- .
- Amrita2 mixes a template and model data up to a html document naturally
- matching the +id+ attribute of XML element to model data.
- .
- This is a dependency package which depends on Debian's default Ruby version.
-
+Depends: ${misc:Depends}, ruby-amrita2
+Description: Transitional package for ruby-amrita2
+ This is a transitional package to ease upgrades to the ruby-amrita2
+ package. It can safely be removed.
diff --git a/debian/rules b/debian/rules
index 855c236..a613c77 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,4 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/ruby-pkg-tools/1/class/ruby-setup-rb.mk
-
+%:
+	dh $@ --buildsystem ruby --with ruby

-- 
amrita2 packaging