Trying to update Gutenprint on the Debian GIT repository
Hi,
I am trying to update Gutenprint to 5.2.11 final but have problem to
import the new source tarball.
First, uscan does not work for me because it considers 5.2.11-pre2 newer
than 5.2.11.
After downloading the source tarball and linking it to
gutenprint_5.2.11.orig.tar.bz2 manually I try to import, but it
complains about practically all files having local changes which would
get overwritten. See below.
Can you update the source and tell me what I did wrong? Thanks.
Till
----------
till@till-x1carbon:~/ubuntu/gutenprint/git$ git clone
https://anonscm.debian.org/git/printing/gutenprint.git
Cloning into 'gutenprint'...
remote: Counting objects: 9876, done.
remote: Compressing objects: 100% (2684/2684), done.
remote: Total 9876 (delta 8152), reused 8758 (delta 7115)
Receiving objects: 100% (9876/9876), 27.60 MiB | 5.32 MiB/s, done.
Resolving deltas: 100% (8152/8152), done.
Checking connectivity... done.
till@till-x1carbon:~/ubuntu/gutenprint/git$ cd gutenprint/
till@till-x1carbon:~/ubuntu/gutenprint/git/gutenprint$ git branch -r
origin/HEAD -> origin/debian/master
origin/debian/experimental
origin/debian/master
origin/patches
origin/pristine-tar
origin/upstream/latest
till@till-x1carbon:~/ubuntu/gutenprint/git/gutenprint$ git branch
* debian/master
till@till-x1carbon:~/ubuntu/gutenprint/git/gutenprint$ git checkout
--track -b upstream/latest origin/upstream/latest
Branch upstream/latest set up to track remote branch upstream/latest
from origin.
Switched to a new branch 'upstream/latest'
till@till-x1carbon:~/ubuntu/gutenprint/git/gutenprint$ git branch
debian/master
* upstream/latest
till@till-x1carbon:~/ubuntu/gutenprint/git/gutenprint$ git checkout
--track -b pristine-tar origin/pristine-tar
Branch pristine-tar set up to track remote branch pristine-tar from origin.
Switched to a new branch 'pristine-tar'
till@till-x1carbon:~/ubuntu/gutenprint/git/gutenprint$ git branch
debian/master
* pristine-tar
upstream/latest
till@till-x1carbon:~/ubuntu/gutenprint/git/gutenprint$ git checkout
debian/master
Switched to branch 'debian/master'
Your branch is up-to-date with 'origin/debian/master'.
till@till-x1carbon:~/ubuntu/gutenprint/git/gutenprint$ git branch
* debian/master
pristine-tar
upstream/latest
till@till-x1carbon:~/ubuntu/gutenprint/git/gutenprint$ cd ..
till@till-x1carbon:~/ubuntu/gutenprint/git$ ls
gutenprint gutenprint_5.2.11.orig.tar.bz2 gutenprint-5.2.11.tar.bz2
till@till-x1carbon:~/ubuntu/gutenprint/git$ cd gutenprint/
till@till-x1carbon:~/ubuntu/gutenprint/git/gutenprint$ ls -a
. ChangeLog debian m4 po test
.. ChangeLogStamp doc m4extra README
ABOUT-NLS config.h.in .git Makefile.am README.package
aclocal.m4 configure .gitignore Makefile.in samples
AUTHORS configure.ac include man scripts
autogen.sh COPYING INSTALL NEWS src
till@till-x1carbon:~/ubuntu/gutenprint/git/gutenprint$ git checkout
upstream/latest
Switched to branch 'upstream/latest'
Your branch is up-to-date with 'origin/upstream/latest'.
till@till-x1carbon:~/ubuntu/gutenprint/git/gutenprint$ git pull
Already up-to-date.
till@till-x1carbon:~/ubuntu/gutenprint/git/gutenprint$ gbp import-orig
--pristine-tar --upstream-branch=upstream/latest
--debian-branch=debian/master ../gutenprint_5.2.11.orig.tar.bz2
What is the upstream version? [5.2.11]
gbp:info: Importing '../gutenprint_5.2.11.orig.tar.bz2' to branch
'upstream/latest'...
gbp:info: Source package is gutenprint
gbp:info: Upstream version is 5.2.11
gbp:info: Merging to 'debian/master'
gbp:error: Import of ../gutenprint_5.2.11.orig.tar.bz2 failed: Error
running git checkout: error: Your local changes to the following files
would be overwritten by checkout:
ChangeLog
NEWS
README
configure
configure.ac
doc/developer/gutenprint.pdf
doc/gutenprint/gutenprint.tag
doc/gutenprint/html/annotated.html
doc/gutenprint/html/array_8h.html
doc/gutenprint/html/bit-ops_8h.html
doc/gutenprint/html/channel_8h.html
doc/gutenprint/html/classes.html
doc/gutenprint/html/color_8h.html
doc/gutenprint/html/curve-cache_8h.html
doc/gutenprint/html/curve_8h.html
doc/gutenprint/html/deprecated.html
doc/gutenprint/html/dir_1aca62f7c2d1ca2bd7aa79274e259f3c.html
doc/gutenprint/html/dir_d44c64559bbebec7f509842c48db8b23.html
doc/gutenprint/html/dither_8h.html
doc/gutenprint/html/doxygen.css
doc/gutenprint/html/files.html
doc/gutenprint/html/functions.html
doc/gutenprint/html/functions_vars.html
doc/gutenprint/html/globals.html
doc/gutenprint/html/globals_b.html
doc/gutenprint/html/globals_c.html
doc/gutenprint/html/globals_d.html
doc/gutenprint/html/globals_defs.html
doc/gutenprint/html/globals_enum.html
doc/gutenprint/html/globals_eval.html
doc/gutenprint/html/globals_func.html
doc/gutenprint/html/globals_g.html
doc/gutenprint/html/globals_n.html
doc/gutenprint/html/globals_p.html
doc/gutenprint/html/globals_s.html
doc/gutenprint/html/globals_t.html
doc/gutenprint/html/globals_type.html
doc/gutenprint/html/globals_vars.html
doc/gutenprint/html/group__array.html
doc/gutenprint/html/group__color.html
doc/gutenprint/html/group__curve.html
doc/gutenprint/html/group__image.html
doc/gutenprint/html/group__intl.html
doc/gutenprint/html/group__intl__internal.html
doc/gutenprint/html/group__list.html
doc/gutenprint/html/group__papersize.html
doc/gutenprint/html/group__printer.html
doc/gutenprint/html/group__sequence.html
doc/gutenprint/html/group__util.html
doc/gutenprint/html/group__vars.html
doc/gutenprint/html/group__version.html
doc/gutenprint/html/gutenprint-intl-internal_8h.html
doc/gutenprint/html/gutenprint-intl_8h.html
doc/gutenprint/html/gutenprint-module_8h.html
doc/gutenprint/html/gutenprint-version_8h.html
doc/gutenprint/html/gutenprint_8h.html
doc/gutenprint/html/image_8h.html
doc/gutenprint/html/index.html
doc/gutenprint/html/list_8h.html
doc/gutenprint/html/module_8h.html
doc/gutenprint/html/modules.html
doc/gutenprint/html/mxml_8h.html
doc/gutenprint/html/pages.html
doc/gutenprint/html/paper_8h.html
doc/gutenprint/html/path_8h.html
doc/gutenprint/html/printers_8h.html
doc/gutenprint/html/sequence_8h.html
doc/gutenprint/html/string-list_8h.html
doc/gutenprint/html/structdither__matrix__impl.html
doc/gutenprint/html/structstp__cached__curve__t.html
doc/gutenprint/html/structstp__color.html
doc/gutenprint/html/structstp__colorfuncs__t.html
doc/gutenprint/html/structstp__curve__point__t.html
doc/gutenprint/html/structstp__dither__matrix__generic.html
doc/gutenprint/html/structstp__dither__matrix__normal.html
doc/gutenprint/html/structstp__dither__matrix__short.html
doc/gutenprint/html/structstp__dotsize.html
doc/gutenprint/html/structstp__double__bound__t.html
doc/gutenprint/html/structstp__family.html
doc/gutenprint/html/structstp__image.html
doc/gutenprint/html/structstp__int__bound__t.html
doc/gutenprint/html/structstp__lineactive__t.html
doc/gutenprint/html/structstp__linebounds__t.html
doc/gutenprint/html/structstp__linebufs__t.html
doc/gutenprint/html/structstp__linecount__t.html
doc/gutenprint/html/structstp__lineoff__t.html
doc/gutenprint/html/structstp__module.html
doc/gutenprint/html/structstp__module__version.html
doc/gutenprint/html/structstp__mxml__attr__s.html
doc/gutenprint/html/structstp__mxml__node__s.html
doc/gutenprint/html/structstp__mxml__text__s.html
doc/gutenprint/html/structstp__mxml__value__s.html
doc/gutenprint/html/structstp__papersize__t.html
doc/gutenprint/html/structstp__param__string__t.html
doc/gutenprint/html/structstp__parameter__t.html
doc/gutenprint/html/structstp__pass__t.html
doc/gutenprint/html/structstp__printfuncs__t.html
doc/gutenprint/html/structstp__raw__t.html
doc/gutenprint/html/stru
Aborting
till@till-x1carbon:~/ubuntu/gutenprint/git/gutenprint$
Reply to: