Your message dated Wed, 12 Apr 2017 12:18:53 +0000
with message-id <[email protected]>
and subject line Bug#700411: fixed in git-buildpackage 0.8.14
has caused the Debian Bug report #700411,
regarding gbp impor-orig: make --merge-mode replace the default?
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.)
--
700411: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=700411
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: git-buildpackage
Version: 0.6.0~git20121124
Severity: normal
git-import-orig will happily import upstream tarballs that contain a
debian directory and when the upstream debian dir changes, git-import-orig
will try to merge those changes in the real debian packaging available on
the master branch.
In the best case, it fails, in the worst case it leads to indesirable
changes.
I tried to work-around this problem with --filter='debian/*' but there's
no safe pattern to use... because this one will also strip
"src/plugins/debian" from the upstream tarball and we don't really want
this by default.
So I would suggest that git-import-orig should automatically remove the
top-level "debian" directory when it does its work.
I'm not sure how git-import-dsc behaves in the same situation but it
should probably adjust its behaviour depending on the source format.
With 3.0 (quilt), you want this behaviour since the debian directory
is always coming from a separate tarball and thus both debian directories
are entirely unrelated. With "3.0 (native)" you want to keep the debian
directory because it only exists in the upstream tarball. With "1.0" it
depends...
-- System Information:
Debian Release: 7.0
APT prefers unstable
APT policy: (500, 'unstable'), (500, 'testing'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.7-trunk-amd64 (SMP w/4 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages git-buildpackage depends on:
ii devscripts 2.12.6
ii git 1:1.7.10.4-2
ii python 2.7.3-4
ii python-dateutil 1.5+dfsg-0.1
Versions of packages git-buildpackage recommends:
ii cowbuilder 0.71
ii pristine-tar 1.26
Versions of packages git-buildpackage suggests:
ii python-notify 0.1.1-3
ii unzip 6.0-8
-- no debconf information
--- End Message ---
--- Begin Message ---
Source: git-buildpackage
Source-Version: 0.8.14
We believe that the bug you reported is fixed in the latest version of
git-buildpackage, which is due to be installed in the Debian FTP archive.
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.
Guido Günther <[email protected]> (supplier of updated git-buildpackage 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: SHA256
Format: 1.8
Date: Wed, 12 Apr 2017 13:53:52 +0200
Source: git-buildpackage
Binary: git-buildpackage git-buildpackage-rpm
Architecture: all source
Version: 0.8.14
Distribution: experimental
Urgency: medium
Maintainer: Guido Günther <[email protected]>
Changed-By: Guido Günther <[email protected]>
Closes: 700411 859439 859594
Description:
git-buildpackage-rpm - Suite to help with RPM packages in Git repositories
git-buildpackage - Suite to help with Debian packages in Git repositories
Changes:
git-buildpackage (0.8.14) experimental; urgency=medium
.
* [fe821e2] GitRepository: use stdout as last resort if stderr is empty.
This e.g. gives:
GitRepositoryError: Error running git commit: On branch master
Untracked files:
debian/
nothing added to commit but untracked files present
Instead of
GitRepositoryError: Error running git commit:
* [1dd290a] pq: unbreak --commit when patch series becomes empty. We
skipped the commit when the patch series became completely empty but we
want to commit that change too.
* [75bf793] posttag-push: Use named parameter for dry_run
* [844e4f8] import-orig: only abort merge if it got started.
This isn't be the case when there are e.g. files that would be overwritten
by the merge in the workig copy (Closes: #859439)
* [3b70ad2] GitRepository: add is_in_merge()
* [5d414c1] buildpackage: cleaner does not default to debuild since ages
(Closes: #859594)
* [e890ce3] ipmort_orig: pick best way to import upstream tarball
automatically. Add new value --merge-mode=auto that selects either
'replace' or 'merge' depending on the source format version.
(Closes: #700411)
Checksums-Sha1:
4a4cf434f2b9a60897c7abe8f8f650f1d281e924 2171 git-buildpackage_0.8.14.dsc
5915e833d09abd286e3f475beb024b843dcbfa0c 1758228 git-buildpackage_0.8.14.tar.xz
b51ea0b3f6f58e51c7c1a45d2db0f93dfb66d77a 104526
git-buildpackage-rpm_0.8.14_all.deb
587dda30de68d999c7e02aeb52eaea79fdb74367 352368 git-buildpackage_0.8.14_all.deb
Checksums-Sha256:
ff5cf953995aa0287ce1a7b7e1b2ce189247e4fa96a5b912de7545000472f9b2 2171
git-buildpackage_0.8.14.dsc
00a852a26147961b9e9954ee2137f7c60f363e721f517123ac876a7309200782 1758228
git-buildpackage_0.8.14.tar.xz
d4ddaa178c6b4ab370401be2ede54fb24b20f208c3df206fb955f5676eb3e5bd 104526
git-buildpackage-rpm_0.8.14_all.deb
c849ebcae1b7d3f06b41922f07995640fbd40bdb9b563e3ec7b62f717d42270d 352368
git-buildpackage_0.8.14_all.deb
Files:
727f8cd772afa5a2e833a1dbe8bb86d3 2171 vcs optional git-buildpackage_0.8.14.dsc
8bf67b98f29b9401585b0dbbab370da8 1758228 vcs optional
git-buildpackage_0.8.14.tar.xz
0421d78fd04c19e86f9f01bc2c6329cb 104526 vcs optional
git-buildpackage-rpm_0.8.14_all.deb
91a1e9dd731e5be1f055242e62008748 352368 vcs optional
git-buildpackage_0.8.14_all.deb
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCAAdFiEEvHzQcjh1660F3xzZB7i3sOqYEgsFAljuGFsACgkQB7i3sOqY
EgtxMA//a+nMGxjT7hvyG5f7TnXs2gRIWm3rXtStiBKRrv6CXyec9h7g+XW1IphB
4ximeWzvpTaoVQAobF3LxoX6UNSph1nl5GJyr1OUihTbgrtE6zg/Zc2cO9ABp5Jk
p/5lesOSZgRLf1RtM//gHgOhzPszPOHY9whS6lzbqW3d5aZZ7guxY58lvp5z02vq
XvfOhJdSjxZvsoXaVMVkFw/wsmjhzF3ICOhCHQtd7ZpTf0+KtKA9XQz75ygj109N
RW51/rhI5KdpyygYZHj793q8nztfH0Sn0f+xxSstNdIW3sASlrDiWPWCzitBQHHB
DsmmXAnf55uMwgSBVX+gYALd/dXVNGpeAhN2+iJitab/tp19dgvR/kKDXa6gR8NF
deFylaemZsBXgvECEnOW/+iAkdIszZeK1A+i2+enTJZJ9jInyMOCUY/Ay2LdMlVm
3UIAZeaGtncAHbBFYXOrRLWFHToNivq0OV/Kpt+2ZwX4YB6SB3bShsyurwR2lX1t
pgf1BbnywHZAZeMTtwIGfdLI2hUAmlccjjx20M+x6ejv8r32PmikldBI2xVXKBJd
ZOKIPKmxIAW8DCL9RlcPR9sGnMS8CHH8Bk+Dh9jkJiYF4DvFTtmtZUNRR+k9zsFT
6DTwDWAV73SazFvqSX2VXOQzn7ETBzdFTEmk9tAi284ykQ+PbKk=
=7Alu
-----END PGP SIGNATURE-----
--- End Message ---
