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 -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
