Your message dated Sun, 11 Oct 2009 00:17:29 +0000
with message-id <[email protected]>
and subject line Bug#485187: fixed in viewvc 1.0.9-1
has caused the Debian Bug report #485187,
regarding viewvc: FTBFS when converted to new source format 3.0 (quilt):
require -p0 for some patches
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.)
--
485187: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=485187
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: viewvc
Version: 1.0.5-0.1
Severity: wishlist
Usertags: 3.0-quilt-by-default
To prepare a possible switch to the new source package format "3.0
(quilt)" [1], I converted all source packages and tried to rebuild them.
Unfortunately, viewvc failed, you can try yourself with those
commands (and dpkg-dev >= 1.14.19 [2]) :
$ apt-get source viewvc
$ sed -i -e '/^Source:/ aFormat: 3.0 (quilt)' viewvc-1.0.5/debian/control
$ dpkg-source -b viewvc-1.0.5
$ dpkg-source -x viewvc_1.0.5-0.1.dsc
$ cd viewvc-1.0.5 && debuild -us -uc
In this process, if the .diff.gz contains changes to upstream files,
dpkg-source will have created a corresponding patch in
debian/patches/debian-changes-1.0.5-0.1 and will have registered that
patch in a quilt series (debian/patches/series, it is created if needed).
All the patches listed in the "series" file are applied directly during
the extraction (dpkg-source -x). quilt itself is used if available (and
will thus lead to the creation of the .pc directory), otherwise
dpkg-source applies the patches by itself. For more information about the
new source package format see the manual page dpkg-source(1).
In the case of viewvc, it already uses quilt but some of the patches
require the '-p0' option of patch to be properly applied and this
option has been hardcoded in the series file. The new source package
format doesn't support this quilt feature and requires patches
to be applicable with the '-p1' option.
You can use the following command to easily update all the patches
that use the '-p0' option:
$ awk '{ if ($2 == "-p0") print $1 }' debian/patches/series | while read f; do
perl -pi -e 's|^--- (?:\./)?|--- a/|; s|^\+\+\+ (?:\./)?|+++ b/|;'
debian/patches/$f ; done
Not that you can replace "a" by "viewvc-1.0.5.orig" and
"b" by "viewvc-1.0.5" if you prefer.
Then don't forget to strip the "-p0" options from debian/patches/series.
As a side note, you must also pay attention to the following points in your
quilt usage to guarantee compatibility with the new source package
format:
- the patches must be in debian/patches/ together with the "series" file
(you can use QUILT_PATCHES=debian/patches if needed)
- you should not override QUILT_PC to change the location of quilt's
internal directory (".pc" by default)
- the patches should not reference absolute filenames (in +++/--- lines)
- your clean target must work even if the patches are already applied
- your build target must work with patches applied even if the clean
target is supposed to unapply them (because dpkg-source -b might
have applied them back)
Cheers,
[1] http://lists.debian.org/debian-devel-announce/2008/04/msg00004.html
[2] the upcoming dpkg-dev 1.14.20 is more tolerant with patches, you can
grab it here if you want to try with that version:
http://people.debian.org/~hertzog/packages/dpkg-dev_1.14.20_all.deb
--
Raphael Hertzog
--- End Message ---
--- Begin Message ---
Source: viewvc
Source-Version: 1.0.9-1
We believe that the bug you reported is fixed in the latest version of
viewvc, which is due to be installed in the Debian FTP archive:
viewvc-query_1.0.9-1_all.deb
to pool/main/v/viewvc/viewvc-query_1.0.9-1_all.deb
viewvc_1.0.9-1.diff.gz
to pool/main/v/viewvc/viewvc_1.0.9-1.diff.gz
viewvc_1.0.9-1.dsc
to pool/main/v/viewvc/viewvc_1.0.9-1.dsc
viewvc_1.0.9-1_all.deb
to pool/main/v/viewvc/viewvc_1.0.9-1_all.deb
viewvc_1.0.9.orig.tar.gz
to pool/main/v/viewvc/viewvc_1.0.9.orig.tar.gz
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.
David Martínez Moreno <[email protected]> (supplier of updated viewvc 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: SHA1
Format: 1.8
Date: Mon, 28 Sep 2009 05:24:27 +0200
Source: viewvc
Binary: viewvc viewvc-query
Architecture: source all
Version: 1.0.9-1
Distribution: unstable
Urgency: high
Maintainer: David Martínez Moreno <[email protected]>
Changed-By: David Martínez Moreno <[email protected]>
Description:
viewvc - view CVS/SVN repositories via HTTP
viewvc-query - utility to query CVS commit database
Closes: 440188 482323 485187 500779 502257 545779
Changes:
viewvc (1.0.9-1) unstable; urgency=high
.
* New upstream release (closes: #502257):
- Ignore arbitrary user-provided MIME types (closes: #500779).
- Fixed bug in regexp searches.
- Fixed bug in handling of certain 'co' output.
- Fixed annotate code syntax error.
- Fixed mod_python import cycle.
- Fixed directory view sorting UI.
- Tolerate malformed Accept-Language headers.
- Fixed directory log views in revision-less Subversion repositories.
- Fixed exception in rev-sorted remote Subversion directory views.
- Security fixes: validate the 'view' parameter to avoid XSS attack
and avoid printing illegal parameter names and values (closes:
#545779).
* debian/control:
- Moved docbook-to-man from B-D-I to B-D, as it is in build target
(closes: #440188).
- Added B-D on quilt (>= 0.46-7) in order to have dh_quilt_*.
- Upgraded Standards-Version to 3.8.3.
- Added ${misc:Depends} to viewvc and viewvc-query.
- Bumped dependency on debhelper to >=6.
- Added Homepage.
* debian/rules:
- Moved patch targets into the XXI century: removed lots of old lines
by a couple of calls to dh_quilt_* helpers.
* debian/patches:
- Refreshed everything to get rid of errors and removed additional
options like -p0 (closes: #485187).
- 04_tarball_permission_fix: Added to series, closes: #482323.
* debian/viewvc.config: Removed prepended path to debconf-show.
* debian/compat: Upgraded to v6.
* debian/viewvc.postinst: Added set -e to catch up errors.
Checksums-Sha1:
f618627d1aba16561743201141c69d4dc102fa78 1152 viewvc_1.0.9-1.dsc
a985496ad577e2c4c75bac915eb203da790d7f3e 522905 viewvc_1.0.9.orig.tar.gz
933dcf44cf9117ef829143eaf79c65e1dabbf569 41961 viewvc_1.0.9-1.diff.gz
7403570e842a4783ca1c7551810ddc578b52309c 518312 viewvc_1.0.9-1_all.deb
3e9186a2bf5142204637ac0e5209111e729320b7 23630 viewvc-query_1.0.9-1_all.deb
Checksums-Sha256:
13496713e173c27322f97e904a6e6220d54a62c81426bbb46e8821948b948cdc 1152
viewvc_1.0.9-1.dsc
399f2813d89457c1dcd9056af2db8c693bfe4ebf801b4c8bb2e4928667b4e322 522905
viewvc_1.0.9.orig.tar.gz
50cac0328b542bcde99ff3f6aace2cdfe5c3be6e58b0f685c715b082fabd69e5 41961
viewvc_1.0.9-1.diff.gz
0098967cfa5f3b30d3d58f43a57ebf9f00f4046a310bce3ff4b42a5f2e080902 518312
viewvc_1.0.9-1_all.deb
ddd2a77974b7a39ab0eb103c556a780fe397b426bc910c8a0f314899a5f9b9c8 23630
viewvc-query_1.0.9-1_all.deb
Files:
b9c947f9fc813bc5d71e6a42b7b15fe0 1152 devel optional viewvc_1.0.9-1.dsc
5aa48bb866f65bfcf32aa0cd581bf7d3 522905 devel optional viewvc_1.0.9.orig.tar.gz
352f4d83751db575358b642b3f7559dd 41961 devel optional viewvc_1.0.9-1.diff.gz
d3d68d0935d755bc6cab733281c9792f 518312 devel optional viewvc_1.0.9-1_all.deb
7b0a599c94de3d4d22de5b041dfe6923 23630 devel optional
viewvc-query_1.0.9-1_all.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
iEYEARECAAYFAkrBQoUACgkQWs/EhA1iABtnzACgnaaLIMlfk1OVteW6o8J6WFT2
dsgAoM1Fbvph3QEmH2/j2LD98HBLqLlk
=sKeZ
-----END PGP SIGNATURE-----
--- End Message ---
