Hi, Attached is the diff for my amrita 1.0.2-3.1 NMU.
-- Julien Danjou // Λ̊ <[EMAIL PROTECTED]> http://julien.danjou.info // 9A0D 5FD9 EB42 22F6 8974 C95C A462 B51E C2FE E5CD // This is the end of my signature.
diff -u amrita-1.0.2/Makefile amrita-1.0.2/Makefile
--- amrita-1.0.2/Makefile
+++ amrita-1.0.2/Makefile
@@ -44,21 +44,21 @@
test_it :
rm -f sample.log
- (cd test; ruby1.6 -w -I../lib testall.rb)
- (cd sample/hello; for f in *.rb ;do echo $$f ; ruby1.6 -w -I../../lib
$$f; done) >> sample.log
- (cd sample/tour; for f in *.rb ;do echo $$f ; ruby1.6 -w -I../../lib
$$f ; done) >> sample.log
+ (cd test; ruby1.8 -w -I../lib testall.rb)
+ (cd sample/hello; for f in *.rb ;do echo $$f ; ruby1.8 -w -I../../lib
$$f; done) >> sample.log
+ (cd sample/tour; for f in *.rb ;do echo $$f ; ruby1.8 -w -I../../lib
$$f ; done) >> sample.log
(cd sample/tour; RUBYLIB=../../lib ../../bin/ams amstest.ams >>
../../sample.log);
(cd sample/tour; RUBYLIB=../../lib ../../bin/amx amxtest.xml >>
../../sample.log);
(cd docs; RUBYLIB=../lib ../bin/amx index.xml >> ../sample.log);
(cd docs; RUBYLIB=../lib ../bin/amx index_ja.xml >> ../sample.log); #
you need rexml 2.5.1 and uconv for this test
profile_it :
- (cd test; ruby1.6 -r profile.rb -I../lib testall.rb)
+ (cd test; ruby1.8 -r profile.rb -I../lib testall.rb)
rdoc:
rdoc1.8 --op $(DOCDIR) -S --main README README docs/QuickStart
docs/Tour docs/Tour2 docs/XML docs/Cgi lib/amrita README_ja docs/QuickStart_ja
docs/Tour_ja docs/XML_ja docs/Tour2_ja docs/Cgi_ja
- (cd $(DOCDIR)/files/; ruby1.6 -i.back -ne 'print gsub("iso-8859-1",
"EUC-JP") unless /<?xml/' *ja.html)
- (cd $(DOCDIR)/files/docs/; ruby1.6 -i.back -ne 'print
gsub("iso-8859-1", "EUC-JP") unless /<?xml/' *ja.html)
+ (cd $(DOCDIR)/files/; ruby1.8 -i.back -ne 'print gsub("iso-8859-1",
"EUC-JP") unless /<?xml/' *ja.html)
+ (cd $(DOCDIR)/files/docs/; ruby1.8 -i.back -ne 'print
gsub("iso-8859-1", "EUC-JP") unless /<?xml/' *ja.html)
src_clean :
rm -rf docs/html
diff -u amrita-1.0.2/debian/control amrita-1.0.2/debian/control
--- amrita-1.0.2/debian/control
+++ amrita-1.0.2/debian/control
@@ -3,13 +3,14 @@
Priority: optional
Maintainer: TANIGUCHI Takaki <[EMAIL PROTECTED]>
Uploaders: Taku YASUI <[EMAIL PROTECTED]>
-Build-Depends-Indep: debhelper (>> 4.0.0), ruby1.6, ruby1.8, rdoc1.8
-Standards-Version: 3.6.1
+Build-Depends: debhelper (>> 4.0.0)
+Build-Depends-Indep: ruby1.8, rdoc1.8
+Standards-Version: 3.7.2
Package: amrita
Architecture: all
-Depends: libamrita-ruby1.6 | libamrita-ruby1.8
-Description: HTML/XML template library for Ruby 1.6 (dummy package)
+Depends: libamrita-ruby1.8
+Description: HTML/XML template library for Ruby 1.8 (dummy package)
Amrita is an html/xhtml template library for Ruby. It makes html
documents from a template and model data.
.
@@ -31,33 +32,6 @@
.
This package is dummy package.
-Package: libamrita-ruby1.6
-Architecture: all
-Depends: libruby1.6, libstrscan-ruby1.6
-Conflicts: amrita(<<1.0.2-2)
-Provides: amrita
-Description: HTML/XML template library for Ruby 1.6
- Amrita is an html/xhtml template library for Ruby. It makes html
- documents from a template and model data.
- .
- * The template for amrita is a pure html/xhtml document without
- special tags like <?...?> or <% .. %>
- * The template can be written by designers using almost any html
- editor.
- * There's no need to change Ruby code to modify the view of the
- _dynamic_ part of the template (or the static portion).
- * The model data may be any standard Ruby data-- a Hash, Array,
- String... or an instance of any user-defined class.
- * The output is controlled by _data_, not by logic-- so it's easy to
- write, test, and debug code. (Good for eXtremeProgramming)
- * The html template can be compiled into Ruby code before execution
- with little effort.
- .
- Amrita uses a template and model data to create an html document by
- naturally matching the +id+ attribute of an html element to model data.
- .
- This package is for Ruby 1.6.
-
Package: libamrita-ruby1.8
Architecture: all
Depends: libruby1.8, libstrscan-ruby1.8
diff -u amrita-1.0.2/debian/rules amrita-1.0.2/debian/rules
--- amrita-1.0.2/debian/rules
+++ amrita-1.0.2/debian/rules
@@ -53,15 +53,10 @@
dh_installdirs
# Add here commands to install the package into debian/amrita.
- $(MAKE) install RUBY_VER=1.6 \
- PREFIX=$(CURDIR)/debian/libamrita-ruby1.6/usr \
-
SITE_DIR=$(CURDIR)/debian/libamrita-ruby1.6/usr/lib/ruby/1.6 \
-
BIN_DIR=$(CURDIR)/debian/libamrita-ruby1.6/usr/share/doc/libamrita-ruby1.6/examples/bin
$(MAKE) install RUBY_VER=1.8 \
PREFIX=$(CURDIR)/debian/libamrita-ruby1.8/usr \
SITE_DIR=$(CURDIR)/debian/libamrita-ruby1.8/usr/lib/ruby/1.8 \
BIN_DIR=$(CURDIR)/debian/libamrita-ruby1.8/usr/share/doc/libamrita-ruby1.8/examples/bin
- $(MAKE) rdoc RUBY_VER=1.6 PREFIX=$(CURDIR)/debian/libamrita-ruby1.6/usr
$(MAKE) rdoc RUBY_VER=1.8 PREFIX=$(CURDIR)/debian/libamrita-ruby1.8/usr
# Build architecture-independent files here.
@@ -74,7 +69,7 @@
dh_testroot
# dh_installdebconf
dh_installdocs
- dh_installexamples -plibamrita-ruby1.6 -plibamrita-ruby1.8 -X
.cvsignore sample/*
+ dh_installexamples -plibamrita-ruby1.8 -X .cvsignore sample/*
# dh_installmenu
# dh_installlogrotate
# dh_installemacsen
diff -u amrita-1.0.2/debian/changelog amrita-1.0.2/debian/changelog
--- amrita-1.0.2/debian/changelog
+++ amrita-1.0.2/debian/changelog
@@ -1,3 +1,12 @@
+amrita (1.0.2-3.1) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * Remove ruby-1.6 (Closes: #367923)
+ * Bump standards version
+ * Move debhelper to Build-Depends
+
+ -- Julien Danjou <[EMAIL PROTECTED]> Mon, 31 Jul 2006 10:16:25 +0200
+
amrita (1.0.2-3) unstable; urgency=low
* add ruby-1.8 support (make libamrita-ruby1.8)
signature.asc
Description: Digital signature
