Bug#315840: [Pkg-shadow-devel] Bug#315840: INTL:vi

Christian Perrier Christian Perrier <bubulle@debian.org>, 315840@bugs.debian.org
Tue, 28 Jun 2005 07:15:09 +0200


> > Christine, do you want to take care of it?
>=20
> Okay, I was just looking at this, and it looks like everyone's away on
> IRC...

We need you to move in our timezone..:-)


> I get this far. However, when I attempt to push the patch, I get the
> following error:
>=20
> christine@Freyja:~/shadow-4.0.3/debian$ quilt push 132_vi.dpatch
> Applying patch 001_Makefile.in.in.dpatch
> can't find file to patch at input line 30
> Perhaps you used the wrong -p or --strip option?
> The text leading up to this was:
> --------------------------
>=20
> <snip patch spam>
>=20
> |--- shadow-4.0.3.orig/po/Makefile.in.in
> |+++ shadow-4.0.3/po/Makefile.in.in
> --------------------------
> No file to patch.  Skipping patch.
> 3 out of 3 hunks ignored
> Patch 001_Makefile.in.in.dpatch does not apply (enforce with -f)

You need to run "quilt push" from the top source directory, ie
"shadow-4.0.3" in your case.


>=20
>=20
> So, when I untar the orig.tar.gz file in a fresh dir, where does the
> copied debian/ go in relationship to the new folder containing the
> shadow source? I've tried in a couple different places - in the fresh
> dir, e.g. 'foo/debian' where the shadow source is 'foo/shadow-4.0.3',
> placing the copied debian/ in the untarred source like it would appear
> normally, i.e. 'shadow-4.0.3/debian' (as in above), etc.


The right place to put debian/ is under shadow-4.0.3.

You should see this as a two pieces puzzle=A0: shadow-4.0.3/ comes from
the orig.tar.gz file and is never modified and shadow-4.0.3/debian
comes from our SVN.

>=20
> Is there something else to the command that I've missed, or am I doing
> something wrong in another way?


Just the current directory while running the quilt command.