Package: libheckle-ruby
Severity: wishlist
Tags: patch
Hi,
The dpatch patch management system has been deprecated for some time. The
Lintian currently flags use of dpatch packages as an error. The new 3.0
packaging format is an improved version which, among other things, contains
patch management built-in. For more information, see:
http://wiki.debian.org/Projects/DebSrc3.0
I had some free time; see attached patch to migrate to new package
format. Note that all files in debian/patches/* are canocalized to
*.patch.
Let me know if there is anything that needs adjusting or if it is ok
to upload this version in a NMU in case you are working on other
issues needing attention.
Thanks,
Jari
>From e9b5b793d47c6a5b56e4f70a9a30c9751d9df833 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Sat, 28 Apr 2012 22:59:08 +0300
Subject: [PATCH] format-3.0
Organization: Private
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
Signed-off-by: Jari Aalto <jari.aa...@cante.net>
---
debian/README.source | 4 ----
debian/changelog | 10 ++++++++++
debian/compat | 2 +-
debian/control | 4 ++--
debian/patches/00list | 3 ---
...atch => 10-correct-path-for-ruby-interpreter.patch} | 8 ++------
debian/patches/11-no-rubygems.patch | 15 +++++++++++++++
debian/patches/11_no-rubygems.dpatch | 16 ----------------
...tional-zentest.dpatch => 13-optional-zentest.patch} | 10 +++-------
debian/patches/series | 3 +++
debian/rules | 5 ++++-
debian/source/format | 1 +
12 files changed, 41 insertions(+), 40 deletions(-)
delete mode 100644 debian/README.source
delete mode 100644 debian/patches/00list
rename debian/patches/{10_correct-path-for-ruby-interpreter.dpatch => 10-correct-path-for-ruby-interpreter.patch} (57%)
create mode 100644 debian/patches/11-no-rubygems.patch
delete mode 100644 debian/patches/11_no-rubygems.dpatch
rename debian/patches/{13_optional-zentest.dpatch => 13-optional-zentest.patch} (73%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 096d38b..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,4 +0,0 @@
-Please refer to /usr/share/doc/dpatch/README.source.gz for more
-information about dpatch.
-
- -- Sebastien Delafond <s...@debian.org> Mon, 28 Sep 2009 18:12:26 +0200
diff --git a/debian/changelog b/debian/changelog
index e398a72..927403c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+libheckle-ruby (1.4.3-2.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt".
+ * Update to Standards-Version to 3.9.3 and debhelper to 9.
+ * Add required build-arch and build-indep targets to rules file.
+ * Patch 11; update with "quilt refresh" to make it apply cleanly.
+
+ -- Jari Aalto <jari.aa...@cante.net> Sat, 28 Apr 2012 22:57:21 +0300
+
libheckle-ruby (1.4.3-2.1) unstable; urgency=low
* Non-maintainer upload.
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index bde8897..a9417c4 100644
--- a/debian/control
+++ b/debian/control
@@ -3,9 +3,9 @@ Section: ruby
Priority: optional
Maintainer: Tobias Grimm <et...@debian.org>
Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintain...@lists.alioth.debian.org>
-Build-Depends: debhelper (>= 5), cdbs, dpatch, ruby1.8, help2man, rubygems
+Build-Depends: debhelper (>= 9), cdbs, ruby1.8, help2man, rubygems
Build-Depends-Indep: libruby2ruby-ruby1.8 (>= 1.2.4), libparsetree-ruby1.8 (>= 3.0.4)
-Standards-Version: 3.8.3
+Standards-Version: 3.9.3
Homepage: http://seattlerb.rubyforge.org/heckle
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-ruby-extras/trunk/libheckle-ruby/
Vcs-Svn: svn://svn.debian.org/svn/pkg-ruby-extras/trunk/libheckle-ruby/
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index d1cb8c8..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,3 +0,0 @@
-10_correct-path-for-ruby-interpreter
-11_no-rubygems
-13_optional-zentest
diff --git a/debian/patches/10_correct-path-for-ruby-interpreter.dpatch b/debian/patches/10-correct-path-for-ruby-interpreter.patch
similarity index 57%
rename from debian/patches/10_correct-path-for-ruby-interpreter.dpatch
rename to debian/patches/10-correct-path-for-ruby-interpreter.patch
index 3e366fb..79c7df8 100644
--- a/debian/patches/10_correct-path-for-ruby-interpreter.dpatch
+++ b/debian/patches/10-correct-path-for-ruby-interpreter.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_correct-path-for-ruby-interpreter.dpatch by Sebastien Delafond <s...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Correct path to Ruby interpreter.
+From: Sebastien Delafond <s...@debian.org>
+Subject: Correct path to Ruby interpreter.
-@DPATCH@
diff -urNad heckle-1.4.1~/bin/heckle heckle-1.4.1/bin/heckle
--- heckle-1.4.1~/bin/heckle 2007-06-05 19:52:31.000000000 -0700
+++ heckle-1.4.1/bin/heckle 2008-05-11 09:14:52.000000000 -0700
diff --git a/debian/patches/11-no-rubygems.patch b/debian/patches/11-no-rubygems.patch
new file mode 100644
index 0000000..18fddb4
--- /dev/null
+++ b/debian/patches/11-no-rubygems.patch
@@ -0,0 +1,15 @@
+From: Tobias Grimm <et...@debian.org>
+Subject: Don't require rubygems - all required libs are available in
+ depending packages.
+
+---
+ lib/heckle.rb | 1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/lib/heckle.rb
++++ b/lib/heckle.rb
+@@ -1,4 +1,3 @@
+-require 'rubygems'
+ require 'parse_tree'
+ require 'sexp_processor'
+ require 'ruby2ruby'
diff --git a/debian/patches/11_no-rubygems.dpatch b/debian/patches/11_no-rubygems.dpatch
deleted file mode 100644
index 4b5cf62..0000000
--- a/debian/patches/11_no-rubygems.dpatch
+++ /dev/null
@@ -1,16 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 11_no-rubygems.dpatch by Tobias Grimm <et...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Don't require rubygems - all required libs are available in
-## DP: depending packages.
-
-@DPATCH@
-diff -urNad libheckle-ruby-1.4.1~/lib/heckle.rb libheckle-ruby-1.4.1/lib/heckle.rb
---- libheckle-ruby-1.4.1~/lib/heckle.rb 2007-06-06 04:52:31.000000000 +0200
-+++ libheckle-ruby-1.4.1/lib/heckle.rb 2009-03-24 23:27:45.000000000 +0100
-@@ -1,4 +1,3 @@
--require 'rubygems'
- require 'parse_tree'
- require 'ruby2ruby'
- require 'timeout'
diff --git a/debian/patches/13_optional-zentest.dpatch b/debian/patches/13-optional-zentest.patch
similarity index 73%
rename from debian/patches/13_optional-zentest.dpatch
rename to debian/patches/13-optional-zentest.patch
index c59d426..56f2053 100644
--- a/debian/patches/13_optional-zentest.dpatch
+++ b/debian/patches/13-optional-zentest.patch
@@ -1,11 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 13_optional-zentest.dpatch by Tobias Grimm <et...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Debian doesn't have ZenTest packaged, so use it only if it is
-## DP: available via rubygems.
+From: Tobias Grimm <et...@debian.org>
+Subject: Debian doesn't have ZenTest packaged, so use it only if it is
+ available via rubygems.
-@DPATCH@
diff -urNad libheckle-ruby-1.4.2~/lib/test_unit_heckler.rb libheckle-ruby-1.4.2/lib/test_unit_heckler.rb
--- libheckle-ruby-1.4.2~/lib/test_unit_heckler.rb 2009-02-09 01:47:07.000000000 +0100
+++ libheckle-ruby-1.4.2/lib/test_unit_heckler.rb 2009-04-26 13:33:24.000000000 +0200
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..0036ed4
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+10-correct-path-for-ruby-interpreter.patch
+11-no-rubygems.patch
+13-optional-zentest.patch
diff --git a/debian/rules b/debian/rules
index 192eca0..dfc2e91 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,13 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
DEB_INSTALL_CHANGELOGS_ALL := History.txt
+
+build-arch: build
+build-indep: build
+
build: build-stamp
build-stamp:
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
--
1.7.10
