Package: sisu Followup-For: Bug #735585 Dear Maintainer,
The changes to make it run with the default interpreter (ruby1.9.1 is going away at some point before jessie) are a bit larger than the ones I mentionned in my previous patch. Please find attached a debdiff fixing this issue. Unless you say otherwise, I consider sending an NMU next week to DELAYED/5 to fix this problem and be able to remove rubygems. Thanks! Cédric
diff -Nru sisu-4.2.18/debian/changelog sisu-4.2.18/debian/changelog
--- sisu-4.2.18/debian/changelog 2014-01-13 03:31:34.000000000 +0100
+++ sisu-4.2.18/debian/changelog 2014-01-17 12:54:32.000000000 +0100
@@ -1,3 +1,12 @@
+sisu (4.2.18-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Drop unneeded dependency on rubygems (Closes: #735585)
+ * Depend on the default Ruby interpreter instead of ruby1.9.1
+ * Use upstream version of bin/sisu with the default ruby shebang
+
+ -- Cédric Boutillier <bou...@debian.org> Fri, 17 Jan 2014 11:58:50 +0100
+
sisu (4.2.18-1) unstable; urgency=medium
[ Ralph Amissah ]
diff -Nru sisu-4.2.18/debian/control sisu-4.2.18/debian/control
--- sisu-4.2.18/debian/control 2014-01-13 03:31:34.000000000 +0100
+++ sisu-4.2.18/debian/control 2014-01-17 12:29:11.000000000 +0100
@@ -11,11 +11,11 @@
Package: sisu
Architecture: all
-Depends: ${misc:Depends}, ruby1.9.1 (>= 1.9.2.180), rsync, unzip, zip
+Depends: ${misc:Depends}, ruby | ruby-interpreter, rsync, unzip, zip
Recommends:
sisu-pdf, sisu-sqlite, sisu-postgresql, imagemagick | graphicsmagick,
keychain,
openssl, openssh-client | lsh-client, po4a, qrencode, rake, ruby-rmagick,
- rubygems, tidy, tree, vim-addon-manager
+ tidy, tree, vim-addon-manager
Suggests: lv, calibre, pinfo, poedit, texinfo, trang
Conflicts: sisu-markup-samples (<= 1.0.11)
Replaces: sisu-markup-samples (<= 1.0.11)
@@ -67,7 +67,7 @@
Package: sisu-complete
Architecture: all
Depends:
- ${misc:Depends}, ruby1.9.1 (>= 1.9.2.180), sisu (= ${source:Version}),
+ ${misc:Depends}, ruby | ruby-interpreter, sisu (= ${source:Version}),
sisu-pdf (= ${source:Version}), sisu-postgresql (= ${source:Version}),
sisu-sqlite (= ${source:Version})
Description: installs all SiSU related packages
@@ -82,7 +82,7 @@
Package: sisu-pdf
Architecture: all
Depends:
- ${misc:Depends}, ruby1.9.1 (>= 1.9.2.180), sisu (= ${source:Version}),
+ ${misc:Depends}, ruby | ruby-interpreter, sisu (= ${source:Version}),
texlive-latex-base, texlive-fonts-recommended, texlive-generic-recommended,
texlive-latex-recommended, texlive-latex-extra, texlive-math-extra,
texlive-xetex, fonts-liberation, lmodern, latex-cjk-all, texlive-lang-cjk
@@ -96,8 +96,8 @@
Package: sisu-postgresql
Architecture: all
Depends:
- ${misc:Depends}, ruby1.9.1 (>= 1.9.2.180), sisu (= ${source:Version}),
- postgresql, ruby-dbd-pg, ruby-dbi, libfcgi-ruby1.9.1
+ ${misc:Depends}, ruby | ruby-interpreter, sisu (= ${source:Version}),
+ postgresql, ruby-dbd-pg, ruby-dbi, ruby-fcgi
Suggests: postgresql-contrib
Description: SiSU dependencies for use with PostgreSQL database
SiSU is a lightweight markup based document structuring, publishing and search
@@ -115,8 +115,8 @@
Package: sisu-sqlite
Architecture: all
Depends:
- ${misc:Depends}, ruby1.9.1 (>= 1.9.2.180), sisu (= ${source:Version}),
sqlite3,
- ruby-sqlite3, ruby-dbd-sqlite3, ruby-dbi, libfcgi-ruby1.9.1
+ ${misc:Depends}, ruby | ruby-interpreter, sisu (= ${source:Version}), sqlite3,
+ ruby-sqlite3, ruby-dbd-sqlite3, ruby-dbi, ruby-fcgi
Description: SiSU dependencies for use with SQLite database
SiSU is a lightweight markup based document structuring, publishing and search
framework for document collections.
diff -Nru sisu-4.2.18/debian/sisu.install sisu-4.2.18/debian/sisu.install
--- sisu-4.2.18/debian/sisu.install 2014-01-13 03:31:34.000000000 +0100
+++ sisu-4.2.18/debian/sisu.install 2014-01-17 12:43:28.000000000 +0100
@@ -1,4 +1,4 @@
-debian/bin/sisu usr/bin
+bin/sisu usr/bin
bin/sisu4 usr/bin
bin/sisu5 usr/bin
bin/sisu-concordance usr/bin
signature.asc
Description: Digital signature
