Your message dated Sat, 30 Jun 2012 11:17:43 +0000
with message-id <[email protected]>
and subject line Bug#670272: fixed in docdiff 0.4.0-2
has caused the Debian Bug report #670272,
regarding [PATCH] docdiff: Helping to update to packaging format 3.0
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
670272: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=670272
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: docdiff
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 a39e1a34c78a79e048e327430b39b9c81ef09a37 Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Tue, 24 Apr 2012 18:51:59 +0300
Subject: [PATCH] format-3.0
Organization: Private
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
Signed-off-by: Jari Aalto <[email protected]>
---
debian/changelog | 11 +++++++++++
debian/compat | 2 +-
debian/control | 8 +++++---
debian/copyright | 2 +-
debian/patches/00list | 3 ---
debian/patches/{01svn-r196.dpatch => 01-svn-r196.patch} | 8 ++------
debian/patches/{02svndocdiff.dpatch => 02-svndocdiff.patch} | 8 ++------
debian/patches/{03cgipath.dpatch => 03-cgipath.patch} | 8 ++------
debian/patches/series | 3 +++
debian/rules | 1 -
debian/source/format | 1 +
11 files changed, 28 insertions(+), 27 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{01svn-r196.dpatch => 01-svn-r196.patch} (96%)
rename debian/patches/{02svndocdiff.dpatch => 02-svndocdiff.patch} (79%)
rename debian/patches/{03cgipath.dpatch => 03-cgipath.patch} (82%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index 8270188..7cf5515 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+docdiff (0.4.0-1.1) 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.
+ * Fix clean-should-be-satisfied-by-build-depends cdbs debhelper (Lintian).
+ * Fix copyright-without-copyright-notice (Lintian).
+ * Fix no-homepage-field (Lintian).
+
+ -- Jari Aalto <[email protected]> Tue, 24 Apr 2012 18:51:46 +0300
+
docdiff (0.4.0-1) unstable; urgency=low
* New upstream release
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 85bbeb4..2aef45f 100644
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,14 @@ Source: docdiff
Section: text
Priority: optional
Maintainer: Kenshi Muto <[email protected]>
-Build-Depends-Indep: debhelper (>> 5.0), cdbs (>= 0.4.27), dpatch (>= 1.11), ruby, ruby-dev, docbook-to-man
-Standards-Version: 3.7.3
+Build-Depends: debhelper (>= 9), cdbs (>= 0.4.27)
+Build-Depends-Indep: ruby, ruby-dev, docbook-to-man
+Standards-Version: 3.9.3
+Homepage: http://sourceforge.net/projects/docdiff
Package: docdiff
Architecture: all
-Depends: ruby | ruby1.9.1
+Depends: ${misc:Depends}, ruby | ruby-interpreter
Suggests: httpd
Description: Compares two files word by word / char by char
DocDiff compares two files and shows the difference. It can compare files
diff --git a/debian/copyright b/debian/copyright
index ae625ca..cbcb40f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -14,7 +14,7 @@ that your contribution may be incorporated under the same license.
Copyright and condition of use of main portion of the source:
- Copyright (C) Hisashi MORITA. All rights reserved.
+ Copyright (C) 2000-2011 Hisashi MORITA. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index fa90377..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,3 +0,0 @@
-01svn-r196.dpatch
-02svndocdiff.dpatch
-03cgipath.dpatch
diff --git a/debian/patches/01svn-r196.dpatch b/debian/patches/01-svn-r196.patch
similarity index 96%
rename from debian/patches/01svn-r196.dpatch
rename to debian/patches/01-svn-r196.patch
index 8f1c95e..57a1109 100644
--- a/debian/patches/01svn-r196.dpatch
+++ b/debian/patches/01-svn-r196.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01svn-r196.dpatch by Kenshi Muto <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: Kenshi Muto <[email protected]>
+Subject: No description.
-@DPATCH@
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' docdiff-0.4.0~/Makefile docdiff-0.4.0/Makefile
--- docdiff-0.4.0~/Makefile 2011-02-23 02:03:17.000000000 +0900
+++ docdiff-0.4.0/Makefile 2011-02-26 17:48:10.956690655 +0900
diff --git a/debian/patches/02svndocdiff.dpatch b/debian/patches/02-svndocdiff.patch
similarity index 79%
rename from debian/patches/02svndocdiff.dpatch
rename to debian/patches/02-svndocdiff.patch
index ed2873a..498b5cb 100644
--- a/debian/patches/02svndocdiff.dpatch
+++ b/debian/patches/02-svndocdiff.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02svndocdiff.dpatch by Kenshi Muto <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: Kenshi Muto <[email protected]>
+Subject: No description.
-@DPATCH@
diff -urNad docdiff-0.3.4~/docdiff/view.rb docdiff-0.3.4/docdiff/view.rb
--- docdiff-0.3.4~/docdiff/view.rb 2007-12-09 08:14:09.000000000 +0000
+++ docdiff-0.3.4/docdiff/view.rb 2007-12-10 05:54:55.000000000 +0000
diff --git a/debian/patches/03cgipath.dpatch b/debian/patches/03-cgipath.patch
similarity index 82%
rename from debian/patches/03cgipath.dpatch
rename to debian/patches/03-cgipath.patch
index ad68790..fc7eb19 100644
--- a/debian/patches/03cgipath.dpatch
+++ b/debian/patches/03-cgipath.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03cgipath.dpatch by Kenshi Muto <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: Kenshi Muto <[email protected]>
+Subject: No description.
-@DPATCH@
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' docdiff-0.4.0~/docdiffwebui.html docdiff-0.4.0/docdiffwebui.html
--- docdiff-0.4.0~/docdiffwebui.html 2011-02-23 02:03:17.000000000 +0900
+++ docdiff-0.4.0/docdiffwebui.html 2011-02-26 17:38:06.948692616 +0900
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..b958661
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+01-svn-r196.patch
+02-svndocdiff.patch
+03-cgipath.patch
diff --git a/debian/rules b/debian/rules
index 1daf97a..5aa0a03 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,5 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
DEB_MAKE_CLEAN_TARGET =
DEB_MAKE_BUILD_TARGET =
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
--- End Message ---
--- Begin Message ---
Source: docdiff
Source-Version: 0.4.0-2
We believe that the bug you reported is fixed in the latest version of
docdiff, which is due to be installed in the Debian FTP archive:
docdiff_0.4.0-2.debian.tar.gz
to main/d/docdiff/docdiff_0.4.0-2.debian.tar.gz
docdiff_0.4.0-2.dsc
to main/d/docdiff/docdiff_0.4.0-2.dsc
docdiff_0.4.0-2_all.deb
to main/d/docdiff/docdiff_0.4.0-2_all.deb
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Kenshi Muto <[email protected]> (supplier of updated docdiff package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Sat, 30 Jun 2012 20:07:46 +0900
Source: docdiff
Binary: docdiff
Architecture: source all
Version: 0.4.0-2
Distribution: unstable
Urgency: low
Maintainer: Kenshi Muto <[email protected]>
Changed-By: Kenshi Muto <[email protected]>
Description:
docdiff - Compares two files word by word / char by char
Closes: 670272
Changes:
docdiff (0.4.0-2) unstable; urgency=low
.
* Switch rubylibdir to /usr/lib/ruby/vendor_ruby to follow new Ruby policy.
* Applied Jari's 'Helping to update to packaging format 3.0' patch.
Thanks. (Closes: #670272)
* Remove deprecated dpatch and upgrade to packaging format "3.0 quilt".
* Update to Standards-Version to 3.9.3 and debhelper to 9.
* Fix clean-should-be-satisfied-by-build-depends cdbs debhelper (Lintian).
* Fix copyright-without-copyright-notice (Lintian).
* Fix no-homepage-field (Lintian).
Checksums-Sha1:
1bc0bbb74462b21200e4de0b3e739610af58c190 1767 docdiff_0.4.0-2.dsc
e96d6a4239d3f90c1bad09a576844218c0cd471f 8668 docdiff_0.4.0-2.debian.tar.gz
842e88c2be661faa5ba960ae7b784e666ac992cc 131642 docdiff_0.4.0-2_all.deb
Checksums-Sha256:
69676bd7b6bc2e4ced8255124bce48a0c5703fed6ff76a017a8de2dd33bd9c00 1767
docdiff_0.4.0-2.dsc
b11d4ac8b312e0b939ce94d3fbf1a2c9ca2a008871b03b315e64abef00f99dae 8668
docdiff_0.4.0-2.debian.tar.gz
13d4975209e002fa82edad9f4bcb47c0a3c093b58e4d3bf1ba0f249a3835a4a5 131642
docdiff_0.4.0-2_all.deb
Files:
68bbd500b39fba752f124c6f41b5f1f3 1767 text optional docdiff_0.4.0-2.dsc
93668b0ccb591b3123ce851b1479b114 8668 text optional
docdiff_0.4.0-2.debian.tar.gz
4d9fc4c44747e19e80d33a360b356e00 131642 text optional docdiff_0.4.0-2_all.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iQIcBAEBCgAGBQJP7t7gAAoJEB0hyD3EUuD8mcUQAK3AKi3F/Qv2IAr7HXedf/H9
ZnpTPyoj+hDv2BVE+UFpevbsoh29nsWRimfn3ttG77HV1yFQtroHeOuuV21ymSgp
kckwl5T/sv5pKwvGWPG5/foUCHsUBlhEOFAm/cnWlnWDczaMAVzjj/scYy7wSzuD
PYFDmzoeAMmLoVCF7W/2hyMlXPObwdXDbzO4YCI2Nyjh64sleu5mWbmoPMtTjMZH
F2+sBERBY18erbz/Ls6+QZs/X6JyhmCOV3vXp9BJTQaE6AM/msM+sO4d3kFnuXFL
+1koXkI3FLI4V+pRJczOBQXweKXOco3RUWu5jP4LNo8wztAa1Q7t9ZCqsEBxxb4a
CRkDX7Pb35+Fg6Gs2l+1dMX+213/mNsllbQZCZdkJ5+LdEgtPt5K6uhjYz3HK4fQ
4vUIR77BBKLVKpOo0VdgVpPIc/YHNOh0Bvia+IGyJMs7/lmPbGju6vTlRqrEP79V
hLPfjM8m09UsJK9fHb92dso6Sl11+CHeZwla+oSy9NHh5sG70o/FX/CpG5mugThh
yBTT5hQQgVxJMBeV/lWKfUgDzJ/lMB2VaSxr9Egu/yMJsx/lnxRAlqgJL+FK/HTJ
4bYZgzl7daDSwTz0QxeneJFv6+g/nF0F5HmN/scsFX1S+jqo7wdxpkRsTfcrITJh
DxlOAhnfFHxgW7a3owR5
=nnyv
-----END PGP SIGNATURE-----
--- End Message ---
