Your message dated Tue, 20 Jul 2010 20:48:00 +0000
with message-id <[email protected]>
and subject line Bug#506211: fixed in git-buildpackage 0.5.1
has caused the Debian Bug report #506211,
regarding git-buildpackage: git-import-dsc[s] doesn't handle merge failures
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.)
--
506211: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=506211
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: git-buildpackage
Version: 0.4.43
Severity: important
Using the files at
http://people.debian.org/~rleigh/gp-archive/
The import fails with merge failure. While it is true that there are
conflicts in the merge, we already have the means to resolve it: the
result of the merge is the orig.tar.gz with the .diff.gz applied--
the maintainer has already resolved the conflicts for us, so it shouldn't
be too difficult to fix up the failure and continue.
My "by-hand" approach to this was to remove all changed files from the
index, copy the unpacked Debian sources on top, check all added/deleted
files are correctly added/deleted, then add everything to the index and
commit. Since we know the sources with the diff applied are the
definitive result of the merge, this is not too hard to fix.
Thanks,
Roger
% git-import-dscs ~/gp-archive/*.dsc
No git repository found, creating one.
Initialized empty Git repository in /tmp/tmp1_oylT/gimp-print-4.2.0.orig/.git/
Everything imported under gimp-print
tag upstream/4.2.7 not found, importing Upstream tarball
Switched to branch "upstream"
rm '.cvsignore'
rm 'Matgen/dither-distance.c'
rm 'Matgen/quickaspect.c'
rm 'Matgen/quickdistance.c'
rm 'RedHat/ghostscript-5.50.spec'
rm 'RedHat/gimp-print.spec'
rm 'RedHat/gs.spec.diff'
rm 'debian/.cvsignore'
rm 'debian/cupsys-driver-gimpprint.conffiles'
rm 'debian/cupsys-driver-gimpprint.files'
rm 'debian/escputil.files'
rm 'debian/libgimpprint-dev.files'
rm 'debian/libgimpprint.files'
rm 'debian/libgimpprint.postinst'
rm 'doc/.cvsignore'
rm 'doc/users_guide/.cvsignore'
rm 'doc/users_guide/figures/.cvsignore'
rm 'gimp.m4'
rm 'include/.cvsignore'
rm 'include/gimp-print/.cvsignore'
rm 'jmv/README'
rm 'lib/.cvsignore'
rm 'man/.cvsignore'
rm 'po/.cvsignore'
rm 'samples/.cvsignore'
rm 'scripts/.cvsignore'
rm 'src/.cvsignore'
rm 'src/cups/.cvsignore'
rm 'src/escputil/.cvsignore'
rm 'src/foomatic/.cvsignore'
rm 'src/foomatic/foomatic-templates/Brightness.xml'
rm 'src/foomatic/foomatic-templates/Color.xml'
rm 'src/foomatic/foomatic-templates/Contrast.xml'
rm 'src/foomatic/foomatic-templates/Cyan.xml'
rm 'src/foomatic/foomatic-templates/Density.xml'
rm 'src/foomatic/foomatic-templates/Dither.xml'
rm 'src/foomatic/foomatic-templates/Gamma.xml'
rm 'src/foomatic/foomatic-templates/ImageType.xml'
rm 'src/foomatic/foomatic-templates/InkType.xml'
rm 'src/foomatic/foomatic-templates/InputSlot.xml'
rm 'src/foomatic/foomatic-templates/Magenta.xml'
rm 'src/foomatic/foomatic-templates/MediaType.xml'
rm 'src/foomatic/foomatic-templates/Model.xml'
rm 'src/foomatic/foomatic-templates/PageSize.xml'
rm 'src/foomatic/foomatic-templates/Quality.xml'
rm 'src/foomatic/foomatic-templates/Resolution.xml'
rm 'src/foomatic/foomatic-templates/Saturation.xml'
rm 'src/foomatic/foomatic-templates/Yellow.xml'
rm 'src/foomatic/foomatic-templates/gimp-print.xml'
rm 'src/ghost/.cvsignore'
rm 'src/gimp/.cvsignore'
rm 'src/main/.cvsignore'
rm 'src/printdef/.cvsignore'
rm 'src/testpattern/.cvsignore'
rm 'test/.cvsignore'
rm 'test/parse-bjc'
Switched to branch "master"
Merging to master
Renamed debian/libgimpprint.postinst => debian/cupsys-driver-gimpprint.postinst
Auto-merged debian/cupsys-driver-gimpprint.postinst
CONFLICT (rename/modify): Merge conflict in
debian/cupsys-driver-gimpprint.postinst
Removed .cvsignore
Auto-merged Makefile.am
CONFLICT (content): Merge conflict in Makefile.am
Removed Matgen/dither-distance.c
Removed Matgen/quickaspect.c
Removed Matgen/quickdistance.c
Removed RedHat/ghostscript-5.50.spec
Removed RedHat/gimp-print.spec
Removed RedHat/gs.spec.diff
Auto-merged configure.in.in
CONFLICT (content): Merge conflict in configure.in.in
CONFLICT (delete/modify): debian/.cvsignore deleted in upstream and modified in
HEAD. Version HEAD of debian/.cvsignore left in tree.
Auto-merged debian/changelog
CONFLICT (content): Merge conflict in debian/changelog
Auto-merged debian/control
CONFLICT (add/add): Merge conflict in debian/control
Auto-merged debian/control.in
CONFLICT (content): Merge conflict in debian/control.in
Removed debian/cupsys-driver-gimpprint.conffiles
Removed debian/cupsys-driver-gimpprint.files
Removed debian/escputil.files
Removed debian/libgimpprint-dev.files
CONFLICT (delete/modify): debian/libgimpprint.files deleted in upstream and
modified in HEAD. Version HEAD of debian/libgimpprint.files left in tree.
Auto-merged debian/rules
CONFLICT (content): Merge conflict in debian/rules
Removed doc/.cvsignore
Auto-merged doc/Makefile.am
CONFLICT (content): Merge conflict in doc/Makefile.am
Auto-merged doc/README.maintaining
CONFLICT (content): Merge conflict in doc/README.maintaining
Removed doc/users_guide/.cvsignore
Auto-merged doc/users_guide/Makefile.am
CONFLICT (content): Merge conflict in doc/users_guide/Makefile.am
Removed doc/users_guide/figures/.cvsignore
Removed gimp.m4
Removed include/.cvsignore
Removed include/gimp-print/.cvsignore
Auto-merged include/gimp-print/Makefile.am
CONFLICT (content): Merge conflict in include/gimp-print/Makefile.am
Auto-merged include/gimp-print/gimp-print.h.in
CONFLICT (content): Merge conflict in include/gimp-print/gimp-print.h.in
Removed jmv/README
Removed lib/.cvsignore
Removed man/.cvsignore
Auto-merged man/Makefile.am
CONFLICT (content): Merge conflict in man/Makefile.am
Auto-merged man/cups-calibrate.8.in
CONFLICT (content): Merge conflict in man/cups-calibrate.8.in
Auto-merged man/escputil.1.in
CONFLICT (content): Merge conflict in man/escputil.1.in
Auto-merged man/gimpprint-config.1.in
CONFLICT (content): Merge conflict in man/gimpprint-config.1.in
Auto-merged man/gimpprint.3.in
CONFLICT (content): Merge conflict in man/gimpprint.3.in
Removed po/.cvsignore
Auto-merged po/en_GB.po
CONFLICT (content): Merge conflict in po/en_GB.po
Removed samples/.cvsignore
Removed scripts/.cvsignore
Removed src/.cvsignore
Auto-merged src/Makefile.am
CONFLICT (content): Merge conflict in src/Makefile.am
Removed src/cups/.cvsignore
Auto-merged src/cups/Makefile.am
CONFLICT (content): Merge conflict in src/cups/Makefile.am
Auto-merged src/cups/epson.c
CONFLICT (content): Merge conflict in src/cups/epson.c
Auto-merged src/cups/genppd.c
CONFLICT (content): Merge conflict in src/cups/genppd.c
Auto-merged src/cups/rastertoprinter.c
CONFLICT (content): Merge conflict in src/cups/rastertoprinter.c
Removed src/escputil/.cvsignore
Auto-merged src/escputil/Makefile.am
Auto-merged src/escputil/escputil.c
CONFLICT (content): Merge conflict in src/escputil/escputil.c
Removed src/foomatic/.cvsignore
Auto-merged src/foomatic/Makefile.am
CONFLICT (content): Merge conflict in src/foomatic/Makefile.am
Removed src/foomatic/foomatic-templates/gimp-print.xml
Auto-merged src/foomatic/printer_options.c
CONFLICT (content): Merge conflict in src/foomatic/printer_options.c
Removed src/ghost/.cvsignore
Auto-merged src/ghost/Makefile.am
CONFLICT (content): Merge conflict in src/ghost/Makefile.am
Auto-merged src/ghost/gdevstp.c
CONFLICT (content): Merge conflict in src/ghost/gdevstp.c
Removed src/gimp/.cvsignore
Auto-merged src/gimp/Makefile.am
CONFLICT (content): Merge conflict in src/gimp/Makefile.am
Auto-merged src/gimp/print.c
CONFLICT (content): Merge conflict in src/gimp/print.c
Removed src/main/.cvsignore
Auto-merged src/main/Makefile.am
CONFLICT (content): Merge conflict in src/main/Makefile.am
Auto-merged src/main/gimp-print-internal.h
CONFLICT (content): Merge conflict in src/main/gimp-print-internal.h
Auto-merged src/main/print-canon.c
CONFLICT (content): Merge conflict in src/main/print-canon.c
Auto-merged src/main/print-color.c
CONFLICT (content): Merge conflict in src/main/print-color.c
Auto-merged src/main/print-dither-matrices.c
CONFLICT (content): Merge conflict in src/main/print-dither-matrices.c
Auto-merged src/main/print-dither.c
CONFLICT (content): Merge conflict in src/main/print-dither.c
Auto-merged src/main/print-escp2.c
CONFLICT (content): Merge conflict in src/main/print-escp2.c
Auto-merged src/main/print-lexmark.c
CONFLICT (content): Merge conflict in src/main/print-lexmark.c
Auto-merged src/main/print-pcl.c
CONFLICT (content): Merge conflict in src/main/print-pcl.c
Auto-merged src/main/print-ps.c
CONFLICT (content): Merge conflict in src/main/print-ps.c
Auto-merged src/main/print-util.c
CONFLICT (content): Merge conflict in src/main/print-util.c
Auto-merged src/main/print-weave.c
CONFLICT (content): Merge conflict in src/main/print-weave.c
Auto-merged src/main/printers.xml
CONFLICT (content): Merge conflict in src/main/printers.xml
Removed src/printdef/.cvsignore
Auto-merged src/printdef/printdefy.y
CONFLICT (content): Merge conflict in src/printdef/printdefy.y
Removed src/testpattern/.cvsignore
Auto-merged src/testpattern/Makefile.am
CONFLICT (content): Merge conflict in src/testpattern/Makefile.am
Auto-merged src/testpattern/testpattern.c
CONFLICT (content): Merge conflict in src/testpattern/testpattern.c
Auto-merged src/testpattern/testpattern.h
CONFLICT (content): Merge conflict in src/testpattern/testpattern.h
Auto-merged src/testpattern/testpatternl.l
CONFLICT (content): Merge conflict in src/testpattern/testpatternl.l
Auto-merged src/testpattern/testpatterny.y
CONFLICT (content): Merge conflict in src/testpattern/testpatterny.y
Removed test/.cvsignore
Auto-merged test/Makefile.am
CONFLICT (content): Merge conflict in test/Makefile.am
Auto-merged test/escp2-weavetest.c
CONFLICT (content): Merge conflict in test/escp2-weavetest.c
Removed test/parse-bjc
Auto-merged test/pcl-unprint.c
CONFLICT (content): Merge conflict in test/pcl-unprint.c
Auto-merged test/testdither.c
CONFLICT (content): Merge conflict in test/testdither.c
Auto-merged test/unprint.c
CONFLICT (content): Merge conflict in test/unprint.c
Automatic merge failed; fix conflicts and then commit the result.
git returned 1
Couldn't merge from "upstream"
Merge of upstream failed, please resolve manually
/usr/bin/git-import-dsc returned 1
Couldn't run '/usr/bin/git-import-dsc'
-- System Information:
Debian Release: lenny/sid
APT prefers testing
APT policy: (500, 'testing')
Architecture: i386 (i686)
Kernel: Linux 2.6.23.1-bytemark-uml
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
Versions of packages git-buildpackage depends on:
ii devscripts 2.10.35 scripts to make the life of a Debi
ii git-core 1:1.5.6.5-1 fast, scalable, distributed revisi
ii python 2.5.2-3 An interactive high-level object-o
ii python-dateutil 1.4.1-2 powerful extensions to the standar
ii python-support 0.8.4 automated rebuilding support for P
git-buildpackage recommends no packages.
Versions of packages git-buildpackage suggests:
pn git-load-dirs <none> (no description available)
pn pristine-tar <none> (no description available)
-- no debconf information
--- End Message ---
--- Begin Message ---
Source: git-buildpackage
Source-Version: 0.5.1
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:
git-buildpackage_0.5.1.dsc
to main/g/git-buildpackage/git-buildpackage_0.5.1.dsc
git-buildpackage_0.5.1.tar.gz
to main/g/git-buildpackage/git-buildpackage_0.5.1.tar.gz
git-buildpackage_0.5.1_all.deb
to main/g/git-buildpackage/git-buildpackage_0.5.1_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.
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: SHA1
Format: 1.8
Date: Tue, 20 Jul 2010 21:31:30 +0200
Source: git-buildpackage
Binary: git-buildpackage
Architecture: source all
Version: 0.5.1
Distribution: experimental
Urgency: low
Maintainer: Guido Günther <[email protected]>
Changed-By: Guido Günther <[email protected]>
Description:
git-buildpackage - Suite to help with Debian packages in Git repositories
Closes: 506211 526022 566993 569031 571717 587456 587652 587673 588061
Changes:
git-buildpackage (0.5.1) experimental; urgency=low
.
[ Jonathan Nieder ]
* [a650ce3] Add prebuild hook Can be used to add an upstream changelog
generated from the git repository to the build dir. (Closes: #587652)
.
[ Guido Günther ]
* [9b8bc60] Bump standards version
.
git-buildpackage (0.5.0) experimental; urgency=low
.
[ Guido Günther ]
* [bd1ad03] Drop dependency on python-dev since it's not needed for arch all
packages. Depend on python instead.
* [077bdb0] git-buildpackage: Add compression=auto to guess compression type
of upstream tarball from pristine-tar branch. This is now the default.
(Closes: #566993)
* [3bcb1ef] Abort if upstream tarball contains git metadata
(Closes: #571717)
* [24410e9] docs: Mention patch-queue branches
* [877166c] docs: Don't document Git-Dch: twice. Thanks to Matthijs Kooijman
(Closes: #587456)
* [719f1ae] git-import-dsc: Use commit_dir to write directly commit the
content of the unpacked orig tarball and the patched Debian tree instead
of using replace_tree. Thanks to Roger Leigh for his nice explantion on
howto do this.
(Closes: #506211, #588061)
* [fc270b5] git-import-dsc: Drop --no-merge We don't invoke 'git merge'
anymore.
* [d35ee45] git-import-orig: Use commit_dir instead of replace_tree
(Closes: #526022, #569031)
.
[ Torsten Werner ]
* [d3c0901] fix typo in gbp-pq
(Closes: #587673)
Checksums-Sha1:
7d858e2e59eb142f7840cff578c47d1b1b941494 1072 git-buildpackage_0.5.1.dsc
945c213ffa446cef27b7ec06192afadba4843ae8 74106 git-buildpackage_0.5.1.tar.gz
06a9f86534169e38845c5c4e564c1328be1517c6 94114 git-buildpackage_0.5.1_all.deb
Checksums-Sha256:
9ab946b5d0ead0a98a54379c5e943f78dd65fc240a97e82a4cd04a71ab1d9c12 1072
git-buildpackage_0.5.1.dsc
2b75d853f3e47ecfbabe6c33c1b1a7165b01bb7319be6018fa080a85c5651572 74106
git-buildpackage_0.5.1.tar.gz
b1921299d8c236ba692253e4397373fca1b3b80a21b90cbcc6e1eba939c873b7 94114
git-buildpackage_0.5.1_all.deb
Files:
18c54bfe6cc04616ebf475483394502e 1072 vcs optional git-buildpackage_0.5.1.dsc
ad004d8f37af47b8b4288afff125c0d1 74106 vcs optional
git-buildpackage_0.5.1.tar.gz
fbbf20788c994095b223da5a07ee120f 94114 vcs optional
git-buildpackage_0.5.1_all.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
iD8DBQFMRgG+n88szT8+ZCYRArzqAJ0TiuSAhY/btYztu5aSYyPLdi/LfACfSMam
wEfk/4pSDpDZtMU0Zv0NNiU=
=ndZt
-----END PGP SIGNATURE-----
--- End Message ---
