Control: tags 804794 + patch
Control: tags 804794 + pending
Dear maintainer,
I've prepared an NMU for subtle (versioned as 0.11.3224-xi-2.2) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.
Regards.
diff -Nru subtle-0.11.3224-xi/debian/changelog
subtle-0.11.3224-xi/debian/changelog
--- subtle-0.11.3224-xi/debian/changelog 2016-03-01 14:51:16.000000000
+0100
+++ subtle-0.11.3224-xi/debian/changelog 2016-03-01 14:48:19.000000000
+0100
@@ -1,3 +1,11 @@
+subtle (0.11.3224-xi-2.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Switch from dpatch to source format 3.0 (quilt).
+ * Fix missing include dir for ft2build.h. (Closes: #804794)
+
+ -- Christian Hofstaedtler <z...@debian.org> Tue, 01 Mar 2016 14:44:25 +0100
+
subtle (0.11.3224-xi-2.1) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru subtle-0.11.3224-xi/debian/control subtle-0.11.3224-xi/debian/control
--- subtle-0.11.3224-xi/debian/control 2016-03-01 14:51:16.000000000 +0100
+++ subtle-0.11.3224-xi/debian/control 2016-03-01 14:48:19.000000000 +0100
@@ -12,8 +12,7 @@
libxrandr-dev,
libxft-dev,
libxinerama-dev,
- libxpm-dev,
- dpatch (>= 2.0.32)
+ libxpm-dev
Standards-Version: 3.9.5
Homepage: http://subforge.org/
Vcs-Git: git://github.com/formorer/pkg-subtle.git
diff -Nru subtle-0.11.3224-xi/debian/patches/00list
subtle-0.11.3224-xi/debian/patches/00list
--- subtle-0.11.3224-xi/debian/patches/00list 2016-03-01 14:51:16.000000000
+0100
+++ subtle-0.11.3224-xi/debian/patches/00list 1970-01-01 01:00:00.000000000
+0100
@@ -1,5 +0,0 @@
-10_use_x-terminal-emulator
-20_ruby19_or_higher
-30_system_flags.dpatch
-40_fix_shebangs.dpatch
-50_include_ruby_h.dpatch
diff -Nru subtle-0.11.3224-xi/debian/patches/10_use_x-terminal-emulator
subtle-0.11.3224-xi/debian/patches/10_use_x-terminal-emulator
--- subtle-0.11.3224-xi/debian/patches/10_use_x-terminal-emulator
1970-01-01 01:00:00.000000000 +0100
+++ subtle-0.11.3224-xi/debian/patches/10_use_x-terminal-emulator
2016-03-01 14:48:19.000000000 +0100
@@ -0,0 +1,17 @@
+## 10_use_x-terminal-emulator.dpatch by Alexander Wirt <formo...@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Use Debians x-terminal-emulator instead of urxvt
+
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git'
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr'
pkg-subtle~/data/subtle.rb pkg-subtle/data/subtle.rb
+--- pkg-subtle~/data/subtle.rb 2012-06-21 08:10:26.000000000 +0200
++++ pkg-subtle/data/subtle.rb 2012-06-21 08:11:04.097356538 +0200
+@@ -431,7 +431,7 @@
+ #grab "W-c", [ :bottom_right, :bottom_right66, :bottom_right33 ]
+
+ # Exec programs
+-grab "W-Return", "urxvt"
++grab "W-Return", "x-terminal-emulator"
+
+ # Run Ruby lambdas
+ grab "S-F2" do |c|
diff -Nru subtle-0.11.3224-xi/debian/patches/10_use_x-terminal-emulator.dpatch
subtle-0.11.3224-xi/debian/patches/10_use_x-terminal-emulator.dpatch
--- subtle-0.11.3224-xi/debian/patches/10_use_x-terminal-emulator.dpatch
2016-03-01 14:51:16.000000000 +0100
+++ subtle-0.11.3224-xi/debian/patches/10_use_x-terminal-emulator.dpatch
1970-01-01 01:00:00.000000000 +0100
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_use_x-terminal-emulator.dpatch by Alexander Wirt <formo...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Use Debians x-terminal-emulator instead of urxvt
-
-@DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git'
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr'
pkg-subtle~/data/subtle.rb pkg-subtle/data/subtle.rb
---- pkg-subtle~/data/subtle.rb 2012-06-21 08:10:26.000000000 +0200
-+++ pkg-subtle/data/subtle.rb 2012-06-21 08:11:04.097356538 +0200
-@@ -431,7 +431,7 @@
- #grab "W-c", [ :bottom_right, :bottom_right66, :bottom_right33 ]
-
- # Exec programs
--grab "W-Return", "urxvt"
-+grab "W-Return", "x-terminal-emulator"
-
- # Run Ruby lambdas
- grab "S-F2" do |c|
diff -Nru subtle-0.11.3224-xi/debian/patches/20_ruby19_or_higher
subtle-0.11.3224-xi/debian/patches/20_ruby19_or_higher
--- subtle-0.11.3224-xi/debian/patches/20_ruby19_or_higher 1970-01-01
01:00:00.000000000 +0100
+++ subtle-0.11.3224-xi/debian/patches/20_ruby19_or_higher 2016-03-01
14:48:19.000000000 +0100
@@ -0,0 +1,21 @@
+## 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.
+
+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
diff -Nru subtle-0.11.3224-xi/debian/patches/20_ruby19_or_higher.dpatch
subtle-0.11.3224-xi/debian/patches/20_ruby19_or_higher.dpatch
--- subtle-0.11.3224-xi/debian/patches/20_ruby19_or_higher.dpatch
2016-03-01 14:51:16.000000000 +0100
+++ subtle-0.11.3224-xi/debian/patches/20_ruby19_or_higher.dpatch
1970-01-01 01:00:00.000000000 +0100
@@ -1,23 +0,0 @@
-#! /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
diff -Nru subtle-0.11.3224-xi/debian/patches/30_system_flags
subtle-0.11.3224-xi/debian/patches/30_system_flags
--- subtle-0.11.3224-xi/debian/patches/30_system_flags 1970-01-01
01:00:00.000000000 +0100
+++ subtle-0.11.3224-xi/debian/patches/30_system_flags 2016-03-01
14:48:19.000000000 +0100
@@ -0,0 +1,24 @@
+## 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
+
+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" => []
diff -Nru subtle-0.11.3224-xi/debian/patches/30_system_flags.dpatch
subtle-0.11.3224-xi/debian/patches/30_system_flags.dpatch
--- subtle-0.11.3224-xi/debian/patches/30_system_flags.dpatch 2016-03-01
14:51:16.000000000 +0100
+++ subtle-0.11.3224-xi/debian/patches/30_system_flags.dpatch 1970-01-01
01:00:00.000000000 +0100
@@ -1,26 +0,0 @@
-#! /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" => []
diff -Nru subtle-0.11.3224-xi/debian/patches/40_fix_shebangs
subtle-0.11.3224-xi/debian/patches/40_fix_shebangs
--- subtle-0.11.3224-xi/debian/patches/40_fix_shebangs 1970-01-01
01:00:00.000000000 +0100
+++ subtle-0.11.3224-xi/debian/patches/40_fix_shebangs 2016-03-01
14:48:19.000000000 +0100
@@ -0,0 +1,18 @@
+## 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
+
+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
diff -Nru subtle-0.11.3224-xi/debian/patches/40_fix_shebangs.dpatch
subtle-0.11.3224-xi/debian/patches/40_fix_shebangs.dpatch
--- subtle-0.11.3224-xi/debian/patches/40_fix_shebangs.dpatch 2016-03-01
14:51:16.000000000 +0100
+++ subtle-0.11.3224-xi/debian/patches/40_fix_shebangs.dpatch 1970-01-01
01:00:00.000000000 +0100
@@ -1,20 +0,0 @@
-#! /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
diff -Nru subtle-0.11.3224-xi/debian/patches/50_include_ruby_h
subtle-0.11.3224-xi/debian/patches/50_include_ruby_h
--- subtle-0.11.3224-xi/debian/patches/50_include_ruby_h 1970-01-01
01:00:00.000000000 +0100
+++ subtle-0.11.3224-xi/debian/patches/50_include_ruby_h 2016-03-01
14:48:19.000000000 +0100
@@ -0,0 +1,16 @@
+## 50_include_ruby_h.dpatch by Antonio Terceiro <terce...@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: include ruby.h to define OnigUChar and other symbols
+
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git'
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr'
subtle-0.11.3224-xi~/src/shared/shared.h subtle-0.11.3224-xi/src/shared/shared.h
+--- subtle-0.11.3224-xi~/src/shared/shared.h 2012-06-20 13:29:55.000000000
+0200
++++ subtle-0.11.3224-xi/src/shared/shared.h 2014-06-09 23:31:59.000000000
+0200
+@@ -28,6 +28,7 @@
+ #include <X11/Xutil.h>
+ #include <X11/Xmd.h>
+ #include <X11/cursorfont.h>
++#include <ruby.h>
+ #include <ruby/oniguruma.h>
+
+ #include "config.h"
diff -Nru subtle-0.11.3224-xi/debian/patches/50_include_ruby_h.dpatch
subtle-0.11.3224-xi/debian/patches/50_include_ruby_h.dpatch
--- subtle-0.11.3224-xi/debian/patches/50_include_ruby_h.dpatch 2016-03-01
14:51:16.000000000 +0100
+++ subtle-0.11.3224-xi/debian/patches/50_include_ruby_h.dpatch 1970-01-01
01:00:00.000000000 +0100
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 50_include_ruby_h.dpatch by Antonio Terceiro <terce...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: include ruby.h to define OnigUChar and other symbols
-
-@DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git'
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr'
subtle-0.11.3224-xi~/src/shared/shared.h subtle-0.11.3224-xi/src/shared/shared.h
---- subtle-0.11.3224-xi~/src/shared/shared.h 2012-06-20 13:29:55.000000000
+0200
-+++ subtle-0.11.3224-xi/src/shared/shared.h 2014-06-09 23:31:59.000000000
+0200
-@@ -28,6 +28,7 @@
- #include <X11/Xutil.h>
- #include <X11/Xmd.h>
- #include <X11/cursorfont.h>
-+#include <ruby.h>
- #include <ruby/oniguruma.h>
-
- #include "config.h"
diff -Nru subtle-0.11.3224-xi/debian/patches/60_find_xft_cflags
subtle-0.11.3224-xi/debian/patches/60_find_xft_cflags
--- subtle-0.11.3224-xi/debian/patches/60_find_xft_cflags 1970-01-01
01:00:00.000000000 +0100
+++ subtle-0.11.3224-xi/debian/patches/60_find_xft_cflags 2016-03-01
14:48:19.000000000 +0100
@@ -0,0 +1,20 @@
+Index: pkg-subtle/Rakefile
+===================================================================
+--- pkg-subtle.orig/Rakefile
++++ pkg-subtle/Rakefile
+@@ -391,12 +391,12 @@ task(:config) do
+ checking_for("X11/Xft/Xft.h") do
+ ret = false
+
+- cflags, ldflags, libs = pkg_config("xft")
++ cflags, libs = [pkg_config("xft", "cflags"), pkg_config("xft",
"libs")]
+ unless libs.nil?
+ # Update flags
+ @options["cpppath"] << " %s" % [ cflags ]
+- @options["ldflags"] << " %s %s" % [ ldflags, libs ]
+- @options["extflags"] << " %s %s" % [ ldflags, libs ]
++ @options["ldflags"] << " %s" % [ libs ]
++ @options["extflags"] << " %s" % [ libs ]
+
+ $defs.push("-DHAVE_X11_XFT_XFT_H")
+ ret = true
diff -Nru subtle-0.11.3224-xi/debian/patches/series
subtle-0.11.3224-xi/debian/patches/series
--- subtle-0.11.3224-xi/debian/patches/series 1970-01-01 01:00:00.000000000
+0100
+++ subtle-0.11.3224-xi/debian/patches/series 2016-03-01 14:48:19.000000000
+0100
@@ -0,0 +1,6 @@
+10_use_x-terminal-emulator
+20_ruby19_or_higher
+30_system_flags
+40_fix_shebangs
+50_include_ruby_h
+60_find_xft_cflags
diff -Nru subtle-0.11.3224-xi/debian/rules subtle-0.11.3224-xi/debian/rules
--- subtle-0.11.3224-xi/debian/rules 2016-03-01 14:51:16.000000000 +0100
+++ subtle-0.11.3224-xi/debian/rules 2016-03-01 14:48:19.000000000 +0100
@@ -9,15 +9,12 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
-
RUBYVENDORARCHDIR=$(shell ruby -e"puts RbConfig::CONFIG['vendorarchdir']")
%:
- dh $@ --with dpatch
+ dh $@
override_dh_clean:
- dh_dpatch_unpatch
dh_clean
rake clobber
diff -Nru subtle-0.11.3224-xi/debian/source/format
subtle-0.11.3224-xi/debian/source/format
--- subtle-0.11.3224-xi/debian/source/format 2016-03-01 14:51:16.000000000
+0100
+++ subtle-0.11.3224-xi/debian/source/format 2016-03-01 14:48:19.000000000
+0100
@@ -1 +1 @@
-1.0
+3.0 (quilt)
--
,''`. Christian Hofstaedtler <z...@debian.org>
: :' : Debian Developer
`. `' 7D1A CFFA D9E0 806C 9C4C D392 5C13 D6DB 9305 2E03
`-
