On Sat, Jul 23, 2005 at 11:12:22PM -0700, Junio C Hamano wrote:
> Alexey Nezhdanov <snake@xxxxxxxxxxxx> writes:
>
> > Satturday, 23 July 2005 23:26 Ryan Anderson wrote:
> >> -Depends: ${misc:Depends}, shellutils, diff, rsync, rcs
> >> +Depends: ${misc:Depends}, patch, diff, rsync, rcs, ssh
> > Did I missed something or you forgot about libcurl3 dependency?
>
> I think you are right. In the build process, dh_shlibdeps is
> used and shlib:Depends is created to include the libcurl3 (among
> other things) in debian/git-core.substvars, but it is not
> actually used in the resulting binary package because the line
> misses ${shlibs:Depends} there.
>
> Ryan, would this change be enough? I do not know what I am
> doing (${misc:Depends} is new to me), but this patch seems to
> fix it on my box.
Yes - this looks like the right idea - but you're missing a comma
between the two variables. (That will cause the *entire* depends line
to get dropped, btw.)
I changed it from shlibs:Depends to misc:Depends because I saw something
when I was tracking down exactly what I needed to put into debian/compat
(in fact, man debhelper, then search for "compat" and look under V4),
but I misread "supplements" to be something else.
So, Acked-By: me, if you put the comma in. :)
> ------------
> Make sure binary debian package depends on shlibs it uses.
>
> The "Depends:" line in debian/control lacked ${shlibs:Depends},
> which caused the resulting binary package not to depend on
> libcurl3 nor even libc6 ;-).
>
> Signed-off-by: Junio C Hamano <junkio@xxxxxxx>
> ---
>
> # - linus: Fix up applymbox script for the addition of "git-" prefix
> # + (working tree)
> diff --git a/debian/control b/debian/control
> --- a/debian/control
> +++ b/debian/control
> @@ -7,7 +7,7 @@ Standards-Version: 3.6.1
>
> Package: git-core
> Architecture: any
> -Depends: ${misc:Depends}, shellutils, diff, rsync, rcs
> +Depends: ${shlibs:Depends} ${misc:Depends}, shellutils, diff, rsync, rcs
> Description: The git content addressable filesystem
> GIT comes in two layers. The bottom layer is merely an extremely fast
> and flexible filesystem-based database designed to store directory trees
>
>
>
> -
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
--
Ryan Anderson
sometimes Pug Majere
|
