Re: git-buildpackage automatically signs + other questions
Thomas Koch <thomas@koch.ro> writes:
hello Thomas,
> Felix Natter:
>> hi,
>>
>> finally I've imported the source, slightly updated the wiki and fixed
>> the patches for freeplane-1.2.20, but I have some questions:
> It seems that your source tarball contains .class files. Could you please push
> your git repo to github (or somewhere else) for review?
https://github.com/fnatter/freeplane-debian/
(now contains all branches)
The problem is that the upstream source tarball
(freeplane_srcpure-1.2.20.tar.gz) contains class files:
./freeplane_framework/launcher_build/org/freeplane/launcher/Launcher.class
./freeplane_plugin_script/build-nodehighlighter/org/freeplane/plugin/script/NodeIdHighLighter$1$1.class
./freeplane_plugin_script/build-nodehighlighter/org/freeplane/plugin/script/NodeIdHighLighter$1.class
./freeplane_plugin_script/build-nodehighlighter/org/freeplane/plugin/script/NodeIdHighLighter.class
./freeplane_plugin_script/build-nodehighlighter/org/freeplane/plugin/script/NodeIdHighLighter$Status.class
I tried "git rm" to fix this on master and upstream branches, but I
still get the original problem when I run git-buildpackage the second
time :-( Do I need to fix something in the pristine-tar branch?
I tried to re-run git-import-orig while filtering *.class:
$ git-import-orig --filter "*.class" --pristine-tar -u1.2.20 .../freeplane_srcpure-1.2.20.tar.gz
=>
$ git-import-orig --filter "*.class" --pristine-tar -u1.2.20 ~/Freeplane-Debian-Package/freeplane_srcpure-1.2.20.tar.gz
gbp:info: Importing '/home/felix/Freeplane-Debian-Package/freeplane_srcpure-1.2.20.tar.gz' to branch 'upstream' (filtering out ['*.class'])...
gbp:info: Source package is freeplane
gbp:info: Upstream version is 1.2.20
pristine-tar: committed freeplane_1.2.20.orig.tar.gz.delta to branch pristine-tar
fatal: tag 'upstream/1.2.20' already exists
gbp:error: Couldn't run git tag: git returned 128
gbp:error: Import of /home/felix/Freeplane-Debian-Package/freeplane_srcpure-1.2.20.tar.gz failed
=> how can I fix this?
Many Thanks and Best Regards,
--
Felix Natter
Reply to: