tags 743990 + patch tags 743990 + pending thanks Dear maintainer,
I've prepared an NMU for subtle (versioned as 0.11.3224-xi-1.1) and uploaded it to DELAYED/5. Please feel free to tell me if I should delay it longer. Regards.
diff -u subtle-0.11.3224-xi/debian/changelog subtle-0.11.3224-xi/debian/changelog
--- subtle-0.11.3224-xi/debian/changelog
+++ subtle-0.11.3224-xi/debian/changelog
@@ -1,3 +1,17 @@
+subtle (0.11.3224-xi-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Depend and Build-Depend on ruby instead of ruby1.9.1. (Closes: #743990)
+ * Add a build-dependency on the rake package for a version agnostic rake tool
+ * debian/rules: install in the directory RbConfig::CONFIG["vendorarchdir"]
+ * Add patches:
+ + 20_ruby19_or_higher.dpatch: do not check minimal Ruby version
+ + 30_system_flags.dpatch: do not overwrite system flags and fix header path
+ + 40_fix_shebangs.dpatch: do not rewrite shebangs of Ruby scripts to use
+ system default Ruby interpreter.
+
+ -- Cédric Boutillier <bou...@debian.org> Tue, 22 Apr 2014 15:58:27 +0200
+
subtle (0.11.3224-xi-1) unstable; urgency=low
* [eb054d1] Imported Upstream version 0.11.3216xi
diff -u subtle-0.11.3224-xi/debian/control subtle-0.11.3224-xi/debian/control
--- subtle-0.11.3224-xi/debian/control
+++ subtle-0.11.3224-xi/debian/control
@@ -5,8 +5,9 @@
Build-Depends: debhelper (>= 9),
chrpath,
libx11-dev,
- ruby1.9.1,
- ruby1.9.1-dev,
+ ruby,
+ ruby-dev,
+ rake,
pkg-config,
libxrandr-dev,
libxft-dev,
@@ -20,7 +21,7 @@
Package: subtle
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby1.9.1, ruby-archive-tar-minitar
+Depends: ${shlibs:Depends}, ${misc:Depends}, ruby, ruby-archive-tar-minitar
Provides: x-window-manager
Description: grid-based manual tiling window manager
Grid-based manual tiling window manager with a strong focus on easy but
diff -u subtle-0.11.3224-xi/debian/rules subtle-0.11.3224-xi/debian/rules
--- subtle-0.11.3224-xi/debian/rules
+++ subtle-0.11.3224-xi/debian/rules
@@ -13,20 +13,22 @@
+RUBYVENDORARCHDIR=$(shell ruby -e"puts RbConfig::CONFIG['vendorarchdir']")
+
%:
dh $@ --with dpatch
override_dh_clean:
dh_dpatch_unpatch
dh_clean
- rake1.9.1 clobber
+ rake clobber
override_dh_auto_build:
- extdir=debian/subtle/usr/lib/ruby/1.9.1/subtle \
+ extdir=debian/subtle/$(RUBYVENDORARCHDIR)/subtle \
DESTDIR=debian/subtle \
PREFIX=/usr \
- rake1.9.1 build
+ rake build
override_dh_install:
- rake1.9.1 install
+ rake install
chrpath -d debian/subtle/usr/bin/subtle
- chrpath -d debian/subtle/usr/lib/ruby/1.9.1/subtle/subtlext.so
+ chrpath -d debian/subtle/$(RUBYVENDORARCHDIR)/subtle/subtlext.so
dh_install
diff -u subtle-0.11.3224-xi/debian/patches/00list subtle-0.11.3224-xi/debian/patches/00list
--- subtle-0.11.3224-xi/debian/patches/00list
+++ subtle-0.11.3224-xi/debian/patches/00list
@@ -1,0 +2,3 @@
+20_ruby19_or_higher
+30_system_flags.dpatch
+40_fix_shebangs.dpatch
only in patch2:
unchanged:
--- subtle-0.11.3224-xi.orig/debian/patches/20_ruby19_or_higher.dpatch
+++ subtle-0.11.3224-xi/debian/patches/20_ruby19_or_higher.dpatch
@@ -0,0 +1,23 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## ruby19_or_higher.dpatch by Cédric Boutillier <bou...@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Do not check the Ruby version.
+## DP: The ruby version in Debian Jessie is higher than 1.9 anyway.
+
+@DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' subtle-0.11.3224-xi~/Rakefile subtle-0.11.3224-xi/Rakefile
+--- subtle-0.11.3224-xi~/Rakefile 2014-04-22 18:29:59.000000000 +0200
++++ subtle-0.11.3224-xi/Rakefile 2014-04-22 18:30:21.066738761 +0200
+@@ -257,11 +257,6 @@
+
+ make_config unless checksums
+ else
+- # Check version
+- if 1 != RbConfig::CONFIG["MAJOR"].to_i or 9 != RbConfig::CONFIG["MINOR"].to_i
+- fail("Ruby 1.9.0 or higher required")
+- end
+-
+ checksums
+
+ # Update rpath
only in patch2:
unchanged:
--- subtle-0.11.3224-xi.orig/debian/patches/30_system_flags.dpatch
+++ subtle-0.11.3224-xi/debian/patches/30_system_flags.dpatch
@@ -0,0 +1,26 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 30_system_flags.dpatch by Cédric Boutillier <bou...@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: do not overwrite system flags
+## DP: - remove -Werror, since a warning is raised with newer gcc
+## DP: - reuse system CFLAGS, CPPFLAGS, LDFLAGS to benefit from hardening
+## DP: - add RbConfig::CONFIG["rubyarchhdrdir"] to cpppath
+
+@DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' subtle-0.11.3224-xi~/Rakefile subtle-0.11.3224-xi/Rakefile
+--- subtle-0.11.3224-xi~/Rakefile 2014-04-22 23:20:37.000000000 +0200
++++ subtle-0.11.3224-xi/Rakefile 2014-04-22 23:20:59.498375548 +0200
+@@ -63,9 +63,9 @@
+ "hdrdir" => "",
+ "archdir" => "",
+ "revision" => "3224", #< Latest stable
+- "cflags" => "-Wall -Werror -Wpointer-arith -Wstrict-prototypes -Wunused -Wshadow -std=gnu99",
+- "cpppath" => "-I. -I$(builddir) -Isrc -Isrc/shared -Isrc/subtle -idirafter$(hdrdir) -idirafter$(archdir)",
+- "ldflags" => "-L$(libdir) $(rpath) $(LIBS) -l$(RUBY_SO_NAME)",
++ "cflags" => "$(CFLAGS) -Wall -Wpointer-arith -Wstrict-prototypes -Wunused -Wshadow -std=gnu99",
++ "cpppath" => "$(CPPFLAGS) -I. -I$(builddir) -Isrc -Isrc/shared -Isrc/subtle -idirafter$(hdrdir) -idirafter$(archdir) -idirafter$(rubyarchhdrdir)",
++ "ldflags" => "$(LDFLAGS) -L$(libdir) $(rpath) $(LIBS) -l$(RUBY_SO_NAME)",
+ "extflags" => "$(LDFLAGS) $(rpath) $(LIBS) -l$(RUBY_SO_NAME)",
+ "rpath" => "-L$(libdir) -Wl,-rpath=$(libdir)",
+ "checksums" => []
only in patch2:
unchanged:
--- subtle-0.11.3224-xi.orig/debian/patches/40_fix_shebangs.dpatch
+++ subtle-0.11.3224-xi/debian/patches/40_fix_shebangs.dpatch
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 40_fix_shebangs.dpatch by Cédric Boutillier <bou...@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: do not rewrite shebangs in Ruby's scripts to use system Ruby interpreter
+
+@DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' subtle-0.11.3224-xi~/Rakefile subtle-0.11.3224-xi/Rakefile
+--- subtle-0.11.3224-xi~/Rakefile 2014-04-22 17:48:22.000000000 +0200
++++ subtle-0.11.3224-xi/Rakefile 2014-04-22 18:27:02.930733235 +0200
+@@ -612,9 +612,6 @@
+ :verbose => verbose
+ )
+
+- # Update interpreter name
+- `#{sed} -i -e 's#/usr/bin/ruby.*##{interpreter}#' \
+- #{File.join(@options["bindir"], File.basename(f))}`
+ end
+
+ # Install manpages
signature.asc
Description: Digital signature
