Bug#863341: jessie-pu: package nadoka/0.7.6-1.1+deb8u1

2017-06-27 Thread Cyril Brulebois
Control: tag -1 moreinfo

Adrian Bunk  (2017-05-25):
> Package: release.debian.org
> Severity: normal
> Tags: jessie
> User: release.debian@packages.debian.org
> Usertags: pu
> 
> Source format 1.0 does not apply debian/patches/

This is better than nothing, but see comments in my reply to #863352.


KiBi.


signature.asc
Description: Digital signature


Bug#863341: jessie-pu: package nadoka/0.7.6-1.1+deb8u1

2017-05-25 Thread Adrian Bunk
Package: release.debian.org
Severity: normal
Tags: jessie
User: release.debian@packages.debian.org
Usertags: pu

Source format 1.0 does not apply debian/patches/


 debian/patches/series   |1 -
 debian/patches/use-generic-ruby |8 
 nadoka-0.7.6/debian/changelog   |7 +++
 nadoka-0.7.6/nadoka |2 +-
 4 files changed, 8 insertions(+), 10 deletions(-)

diff -u nadoka-0.7.6/debian/changelog nadoka-0.7.6/debian/changelog
--- nadoka-0.7.6/debian/changelog
+++ nadoka-0.7.6/debian/changelog
@@ -1,3 +1,10 @@
+nadoka (0.7.6-1.1+deb8u1) jessie; urgency=medium
+
+  * Non-maintainer upload.
+  * Really remove the hard-coding of ruby1.8. (Closes: #735655)
+
+ -- Adrian Bunk   Thu, 25 May 2017 18:31:51 +0300
+
 nadoka (0.7.6-1.1) unstable; urgency=high
 
   * Non-maintainer upload.
reverted:
--- nadoka-0.7.6/debian/patches/series
+++ nadoka-0.7.6.orig/debian/patches/series
@@ -1 +0,0 @@
-use-generic-ruby
reverted:
--- nadoka-0.7.6/debian/patches/use-generic-ruby
+++ nadoka-0.7.6.orig/debian/patches/use-generic-ruby
@@ -1,8 +0,0 @@
-Index: nadoka-0.7.6/nadoka
-===
 nadoka-0.7.6.orig/nadoka   2014-02-13 00:55:15.0 +0100
-+++ nadoka-0.7.6/nadoka2014-02-13 00:55:28.0 +0100
-@@ -1,2 +1,2 @@
- #!/bin/sh
--exec /usr/bin/ruby1.8 -I/usr/share/nadoka /usr/share/nadoka/nadoka.rb $@
-+exec /usr/bin/ruby -I/usr/share/nadoka /usr/share/nadoka/nadoka.rb $@
diff -u nadoka-0.7.6/nadoka nadoka-0.7.6/nadoka
--- nadoka-0.7.6/nadoka
+++ nadoka-0.7.6/nadoka
@@ -2 +2 @@
-exec /usr/bin/ruby1.8 -I/usr/share/nadoka /usr/share/nadoka/nadoka.rb $@
+exec /usr/bin/ruby -I/usr/share/nadoka /usr/share/nadoka/nadoka.rb $@