tags 573636 +patch
thanks

Hi,

Here is a patch following Evgeni's suggestion.  I've confirmed that it
actually fixed the startup failure.

Attachment: pgpTzeBzks5X1.pgp
Description: PGP signature

diff -u diakonos-0.8.12/debian/changelog diakonos-0.8.12/debian/changelog
--- diakonos-0.8.12/debian/changelog
+++ diakonos-0.8.12/debian/changelog
@@ -1,3 +1,11 @@
+diakonos (0.8.12-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Depend on ruby1.9.1 and don't use "#!/usr/bin/env ruby" since diakonos
+    only works with ruby1.9.1 (Closes: #573636).
+
+ -- Daiki Ueno <u...@unixuser.org>  Tue, 16 Mar 2010 10:08:49 +0700
+
 diakonos (0.8.12-1) unstable; urgency=medium
 
   * new upstream version, see upstream changelog, amongst the upstream changes
diff -u diakonos-0.8.12/debian/control diakonos-0.8.12/debian/control
--- diakonos-0.8.12/debian/control
+++ diakonos-0.8.12/debian/control
@@ -11,7 +11,7 @@
 
 Package: diakonos
 Architecture: all
-Depends: ${misc:Depends}, ruby (>=1.9.1)
+Depends: ${misc:Depends}, ruby1.9.1
 Homepage: http://purepistos.net/diakonos/
 Description: Customizable, usable console-based text editor
  an editor made it with the intention of being easier to configure and use than
diff -u diakonos-0.8.12/debian/rules diakonos-0.8.12/debian/rules
--- diakonos-0.8.12/debian/rules
+++ diakonos-0.8.12/debian/rules
@@ -1,12 +1,22 @@
 #!/usr/bin/make -f
 #export DH_VERBOSE=1
 
-clean:
+clean: clean-patched unpatch
+clean-patched:
 	dh_testdir
 	dh_testroot
 	dh_clean
 
-build:
+build: patch
+
+patch: patch-stamp
+patch-stamp:
+	dpatch apply-all
+	dpatch cat-all > patch-stamp
+
+unpatch:
+	dpatch deapply-all
+	rm -rf patch-stamp debian/patched
 
 install:
 
only in patch2:
unchanged:
--- diakonos-0.8.12.orig/debian/patches/00list
+++ diakonos-0.8.12/debian/patches/00list
@@ -0,0 +1,2 @@
+01_no-env-shebang
+
only in patch2:
unchanged:
--- diakonos-0.8.12.orig/debian/patches/01_no-env-shebang.dpatch
+++ diakonos-0.8.12/debian/patches/01_no-env-shebang.dpatch
@@ -0,0 +1,16 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_no-env-shebang.dpatch by Daiki Ueno <u...@unixuser.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: don't use /usr/bin/env for shebang
+
+...@dpatch@
+
+--- diakonos-0.8.12/bin/diakonos~	2010-03-16 10:35:49.000000000 +0700
++++ diakonos-0.8.12/bin/diakonos	2010-03-16 10:36:03.000000000 +0700
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env ruby
++#!/usr/bin/ruby1.9.1
+ 
+ require 'diakonos'
+ 
Sent from Thailand Mini-DebCamp 2010 BSP:
http://wiki.debian.org/DebianThailand/MiniDebCamp2010/BSP

Regards,
-- 
Daiki Ueno

Reply via email to