[darcs-users] Re: ANN: darcs-buildpackage
Christoph Wegscheider
wegi at despammed.com
Fri Apr 22 13:29:56 UTC 2005
John Goerzen <jgoerzen at complete.org> wrote:
> On 2005-04-20, Christoph Wegscheider <wegi at despammed.com> wrote:
> No, it does run debuild, but debuild itself calls dpkg-buildpackage.
My fault, a script with the same name was still in ~/bin
>> 2.) it creates a native debian package if no .orig.tar.gz is present,
>> but according to manpage it should extract one from the repos.
>
> Now, if your version numbers do contain dashes, then you have found a
> bug. Please let me know.
It does of course. If I run darcs-buildpackage (yes yours this time ;) I
get the following (starting point is like in the typescript which I
attached, but with dbp-importdsc instead of dbp-importorig):
darcs-buildpackage -uc -us
Copying patch 4 of 4... done!
Applying patches to the "working" directory...
........
Fail: Couldn't find a tag matching "tag-name ^UPSTREAM_wmii_0.99+20050420$"
Command darcs ["get","--partial","--tag=^UPSTREAM_wmii_0.99+20050420$","/home/cweg/devel/debian/wmii/upstream","wmii-0.99+20050420.orig"] failed; exit code 1
Fail: user error (Command darcs ["get","--partial","--tag=^UPSTREAM_wmii_0.99+20050420$","/home/cweg/devel/debian/wmii/upstream","wmii-0.99+20050420.orig"] failed; exit code 1)
The curios thing is the get was successful the wmii-0.99+20050420.orig
dir exists and contains all files, I tried this darcs command manually
and it also failed, so I guess it's a darcs issue.
If I run darcs-buildpackage again, it detects the existing upstream
directory:
Upstream file or directory already exists; not re-building
but nonetheless a debian native package is build.
> Yes, and in fact that is what it does. I'm not sure why you're seeing
> anything different. Can you send me a typescript of your session (see
> script(1)), complete from initial creation through this problem? I
> haven't seen it.
It's at the end of this mail
As you can see there are different patches in upstream/ and debian/,
pulling from upstream after a dbp-importorig require me to pull ALL
patches from upstream, the changes are still present in debian/. This
is a worst case scenario for darcs as everything is conflicting and the
result is darcs trying to melt my CPU.
You can find the packages at
deb-src http://wegi.net/debian experimental/
if you wanna test yourself.
Christoph
-----------------------------------------------------------------------
Script started on Fri Apr 22 14:49:32 2005
sh-2.05b$ dbp-importdsc 0.99+20050409/wmii_0.99+20050409-1.dsc
TLACMD: darcs
LOGTEXT Imported wmii-0.99+20050409
into Darcs repository
Finished recording patch 'Import upstream wmii version 0.99+20050409'
Finished tagging patch 'TAG UPSTREAM_wmii_0.99+20050409'
You don't want to pull any patches, and that's fine with me!
dpkg-source: extracting wmii in wmii-0.99+20050409
TLACMD: darcs
LOGTEXT Imported wmii-0.99+20050409
into Darcs repository
Finished recording patch 'Import Debian wmii version 0.99+20050409-1'
Finished tagging patch 'TAG DEBIAN_wmii_0.99+20050409-1'
sh-2.05b$ dbp-importdsc 0.99+20050409/wmii_0.99+20050409-1.dsc
Not importing orig; version 0.99+20050409 already exists in repository.
Pulling from "/home/cweg/devel/debian/wmii/upstream"...
You don't want to pull any patches, and that's fine with me!
dpkg-source: extracting wmii in wmii-0.99+20050409
TLACMD: darcs
Num Source Files Num Destination Files
--- ----------------------------------- --- -----------------------------------
0 debian/conffiles.ex 0 debian/desktop
1 debian/cron.d.ex 1 debian/python2.3-ixplib.examples
2 debian/dirs 2 debian/wmii-cairo.copyright
3 debian/docs 3 debian/wmii-cairo.dirs
4 debian/emacsen-install.ex 4 debian/wmii-cairo.docs
5 debian/emacsen-remove.ex 5 debian/wmii-cairo.menu
6 debian/emacsen-startup.ex 6 debian/wmii-cairo.wm
7 debian/init.d.ex 7 debian/wmii.dirs
8 debian/manpage.1.ex 8 debian/wmii.docs
9 debian/manpage.sgml.ex 9 debian/wmii.menu
a debian/manpage.xml.ex a debian/wmii.wm
b debian/menu b
c debian/menu.ex c
d debian/postinst.ex d
e debian/postrm.ex e
f debian/preinst.ex f
10 debian/prerm.ex 10
11 debian/watch.ex 11
12 debian/wmii-default.ex 12
13 debian/wmii.desktop 13
14 debian/wmii.doc-base.EX 14
Syntax: src dest [,src dest [,...]] to move, q to accept, r to redraw:
Command: q
LOGTEXT Imported wmii-0.99+20050409
into Darcs repository
Finished recording patch 'Import Debian wmii version 0.99+20050409-2'
Finished tagging patch 'TAG DEBIAN_wmii_0.99+20050409-2'
sh-2.05b$ importorig wmiisnaprepo/wmii/wmii-0.99+20050420.tar.gz wmii 0.99+200504020
TLACMD: darcs
Num Source Files Num Destination Files
--- ----------------------------------- --- -----------------------------------
0 version.h 0 contrib/
1 1 docs/
2 2 tests/
3 3 NOTES
4 4 TODO
5 5 contrib/expand_actions.py
6 6 contrib/ixpbrowser.py
7 7 contrib/wmiikeys.py
8 8 contrib/wmiilib.py
9 9 docs/Makefile
a a docs/wmii.tex
b b tests/Makefile
c c tests/testclient.c
d d tests/testlayout.c
e e tests/testserver.c
Syntax: src dest [,src dest [,...]] to move, q to accept, r to redraw:
Command: q
LOGTEXT Imported wmii-0.99+20050420
into Darcs repository
Finished recording patch 'Import upstream wmii version 0.99+20050420'
Finished tagging patch 'TAG UPSTREAM_wmii_0.99+20050420'
sh-2.05b$ cd upstream/
sh-2.05b$ ls -l
total 84
-rw-r--r-- 1 cweg users 34 Mar 2 23:19 CHANGES
-rw-r--r-- 1 cweg users 1178 Apr 20 18:33 LICENSE
-rw-r--r-- 1 cweg users 4485 Apr 20 18:42 Makefile
-rw-r--r-- 1 cweg users 10098 Mar 25 01:03 NOTES
-rw-r--r-- 1 cweg users 2829 Apr 20 18:33 README
-rw-r--r-- 1 cweg users 8807 Apr 20 18:33 TODO
drwxr-xr-x 6 cweg users 4096 Apr 22 14:50 _darcs
drwxr-xr-x 2 cweg users 4096 Apr 20 18:45 base
-rw-r--r-- 1 cweg users 1086 Apr 20 18:33 config.mk
drwxr-xr-x 2 cweg users 4096 Apr 20 18:45 contrib
drwxr-xr-x 2 cweg users 4096 Apr 20 18:45 docs
drwxr-xr-x 3 cweg users 4096 Apr 20 18:45 libixp
drwxr-xr-x 2 cweg users 4096 Apr 20 18:45 libwmii
drwxr-xr-x 2 cweg users 4096 Apr 20 18:45 rc
drwxr-xr-x 2 cweg users 4096 Apr 20 18:45 tests
drwxr-xr-x 2 cweg users 4096 Apr 20 18:45 util
sh-2.05b$ darcs cha
Fri Apr 22 14:49:55 CEST 2005 Christoph Wegscheider <cw at wegi.net>
* Import upstream wmii version 0.99+20050409
Fri Apr 22 14:49:55 CEST 2005 Christoph Wegscheider <cw at wegi.net>
tagged UPSTREAM_wmii_0.99+20050409
Fri Apr 22 14:50:56 CEST 2005 Christoph Wegscheider <cw at wegi.net>
* Import upstream wmii version 0.99+20050420
Fri Apr 22 14:50:57 CEST 2005 Christoph Wegscheider <cw at wegi.net>
tagged UPSTREAM_wmii_0.99+20050420
sh-2.05b$ cd ../debian/
sh-2.05b$ ls -l
total 56
-rw------- 1 cweg users 34 Apr 9 14:34 CHANGES
-rw------- 1 cweg users 1125 Apr 9 14:34 LICENSE
-rw------- 1 cweg users 4322 Apr 9 14:34 Makefile
-rw------- 1 cweg users 2592 Apr 9 14:34 README
drwxr-xr-x 6 cweg users 4096 Apr 22 14:50 _darcs
drwxr-xr-x 2 cweg users 4096 Apr 9 14:34 base
-rw------- 1 cweg users 1070 Apr 22 14:50 config.mk
drwxr-xr-x 2 cweg users 4096 Apr 22 14:50 debian
drwxr-xr-x 3 cweg users 4096 Apr 9 14:34 libixp
drwxr-xr-x 2 cweg users 4096 Apr 9 14:34 libwmii
drwxr-xr-x 2 cweg users 4096 Apr 9 14:34 rc
drwxr-xr-x 2 cweg users 4096 Apr 9 14:34 util
-rw-r--r-- 1 cweg users 32 Apr 9 14:34 version.h
sh-2.05b$ darcs cha
Fri Apr 22 14:49:59 CEST 2005 Christoph Wegscheider <cw at wegi.net>
* Import Debian wmii version 0.99+20050409-1
Fri Apr 22 14:49:59 CEST 2005 Christoph Wegscheider <cw at wegi.net>
tagged DEBIAN_wmii_0.99+20050409-1
Fri Apr 22 14:50:05 CEST 2005 Christoph Wegscheider <cw at wegi.net>
* Import Debian wmii version 0.99+20050409-2
Fri Apr 22 14:50:05 CEST 2005 Christoph Wegscheider <cw at wegi.net>
tagged DEBIAN_wmii_0.99+20050409-2
sh-2.05b$ darcs pull ../upstream/
Fri Apr 22 14:49:55 CEST 2005 Christoph Wegscheider <cw at wegi.net>
* Import upstream wmii version 0.99+20050409
Shall I pull this patch? (1/4) [ynWvxqadjk], or ? for help: y
Fri Apr 22 14:49:55 CEST 2005 Christoph Wegscheider <cw at wegi.net>
tagged UPSTREAM_wmii_0.99+20050409
Shall I pull this patch? (2/4) [ynWvxqadjk], or ? for help: y
Fri Apr 22 14:50:56 CEST 2005 Christoph Wegscheider <cw at wegi.net>
* Import upstream wmii version 0.99+20050420
Shall I pull this patch? (3/4) [ynWvxqadjk], or ? for help: y
Fri Apr 22 14:50:57 CEST 2005 Christoph Wegscheider <cw at wegi.net>
tagged UPSTREAM_wmii_0.99+20050420
Shall I pull this patch? (4/4) [ynWvxqadjk], or ? for help: y
Interrupted!
sh-2.05b$
Script done on Fri Apr 22 14:52:15 2005
More information about the darcs-users
mailing list