yacs dependency
Appended here is a patch for yacs 0.4 which fixes two dependencies if
you'll want to build the .deb on slink.
Raphaël, feel free to add this -or not- to the tarball.
Also changed are five of the scripts in the tools/ subdirectory, to cope
with the slink layout of non-US.
Beware: three of them are shell scripts, I've changed these so that they
still work when building for potato. But two are perl scripts; I don't
know anything (well almost nothing) about perl, so I've not been able to
work around the same way here. Can someone with better perl knowledge
fix them?
I also wanted to point this out: the shell script all point to /bin/sh;
this is fine if you have /bin/sh symlinked from bash, but the scripts
don't work with ash...
thanks
Filip Van Raemdonck
diff -urN yacs/debian/control yacs.slink/debian/control
--- yacs/debian/control Mon Aug 16 23:31:33 1999
+++ yacs.slink/debian/control Tue Aug 24 21:46:33 1999
@@ -6,7 +6,7 @@
Package: debian-cd
Architecture: all
-Depends: perl5, libdigest-md5-perl, sysutils, apt (>= 0.3.11.1), dpkg-dev (>= 1.4.1.6)
+Depends: perl5 | perl, libdigest-md5-perl | libmd5-perl , sysutils, apt (>= 0.3.11.1), dpkg-dev (>= 1.4.1.6)
Recommends: lha, unzip
Description: Tools for building (Official) Debian CD set
This package was formerly called YACS (for Yet Another CD
diff -urN yacs/tools/add_dirs yacs.slink/tools/add_dirs
--- yacs/tools/add_dirs Wed Jul 28 19:48:45 1999
+++ yacs.slink/tools/add_dirs Tue Aug 24 20:38:32 1999
@@ -29,7 +29,7 @@
mkdir -p dists/$CODENAME/non-free/binary-all/$i
mkdir -p dists/$CODENAME/non-free/source/$i
fi
- if [ -n "$NONUS" ]; then
+ if [ -n "$NONUS" -a "x"$CODENAME != "xslink" ]; then
mkdir -p dists/$CODENAME/non-US/main/binary-$ARCH/$i
mkdir -p dists/$CODENAME/non-US/main/binary-all/$i
mkdir -p dists/$CODENAME/non-US/main/source/$i
@@ -43,6 +43,11 @@
fi
fi
done
+if [ -n "$NONUS" -a "x"$CODENAME = "xslink" ]; then
+ mkdir -p dists/$CODENAME/non-US/binary-$ARCH/
+ mkdir -p dists/$CODENAME/non-US/binary-all/
+ mkdir -p dists/$CODENAME/non-US/source/
+fi
mkdir .disk
diff -urN yacs/tools/cds2src yacs.slink/tools/cds2src
--- yacs/tools/cds2src Sun Aug 22 00:00:58 1999
+++ yacs.slink/tools/cds2src Tue Aug 24 19:24:42 1999
@@ -47,15 +47,10 @@
if ($nonus) {
push @SOURCES,
- "$nonus/dists/$codename/non-US/main/source/Sources.gz",
- "$nonus/dists/$codename/non-US/contrib/source/Sources.gz";
+ "$nonus/dists/$codename/non-US/source/Sources.gz",
}
if ($nonfree) {
push @SOURCES, "$mirror/dists/$codename/non-free/source/Sources.gz";
- if ($nonus) {
- push @SOURCES,
- "$nonus/dists/$codename/non-US/non-free/source/Sources.gz";
- }
}
foreach (@SOURCES) {
diff -urN yacs/tools/mirror_check yacs.slink/tools/mirror_check
--- yacs/tools/mirror_check Thu Jul 15 12:15:53 1999
+++ yacs.slink/tools/mirror_check Tue Aug 24 21:44:03 1999
@@ -1,6 +1,6 @@
#!/usr/bin/perl -w
-use Digest::MD5;
+use MD5;
my $mirror = shift || $ENV{'MIRROR'};
my $nonus = shift || $ENV{'NONUS'};
@@ -39,7 +39,7 @@
# Compute the MD5sum
open(FILE, "< $file") || die "Can't open $file : $!\n";
- $ctx = Digest::MD5->new;
+ $ctx = MD5->new;
$ctx->addfile(*FILE);
$digest = $ctx->hexdigest;
undef $ctx;
diff -urN yacs/tools/scanpackages yacs.slink/tools/scanpackages
--- yacs/tools/scanpackages Thu Jul 29 17:54:30 1999
+++ yacs.slink/tools/scanpackages Tue Aug 24 20:12:20 1999
@@ -25,7 +25,7 @@
# Install the release files
cp $MIRROR/dists/$CODENAME/$SECT/binary-$ARCH/Release \
dists/$CODENAME/$SECT/binary-$ARCH/
- if [ -n "$NONUS" ]; then
+ if [ -n "$NONUS" -a "x"$CODENAME != "xslink" ]; then
cp $NONUS/dists/$CODENAME/non-US/$SECT/binary-$ARCH/Release \
dists/$CODENAME/non-US/$SECT/binary-$ARCH/
fi
@@ -34,7 +34,7 @@
>dists/$CODENAME/$SECT/binary-$ARCH/Packages
grep -v ^X-Medium $PREFIX.Packages-$SECT | gzip --best \
>dists/$CODENAME/$SECT/binary-$ARCH/Packages.gz
- if [ -n "$NONUS" ]; then
+ if [ -n "$NONUS" -a "x"$CODENAME != "xslink" ]; then
grep -v ^X-Medium $PREFIX.Packages-non-US-$SECT \
>dists/$CODENAME/non-US/$SECT/binary-$ARCH/Packages
grep -v ^X-Medium $PREFIX.Packages-non-US-$SECT | gzip --best \
@@ -50,7 +50,7 @@
>>dists/$CODENAME/$SECT/binary-$ARCH/Packages.cd
cat $dir.Packages-$SECT | gzip --best \
>>dists/$CODENAME/$SECT/binary-$ARCH/Packages.cd.gz
- if [ -n "$NONUS" ]; then
+ if [ -n "$NONUS" -a "x"$CODENAME != "xslink" ]; then
cat $dir.Packages-non-US-$SECT \
>>dists/$CODENAME/non-US/$SECT/binary-$ARCH/Packages.cd
cat $dir.Packages-non-US-$SECT | gzip --best \
@@ -59,6 +59,26 @@
fi
done
done
+
+if [ -n "$NONUS" -a "x"$CODENAME = "xslink" ]; then
+ cp $NONUS/dists/$CODENAME/non-US/binary-$ARCH/Release \
+ dists/$CODENAME/non-US/binary-$ARCH/
+ grep -v ^X-Medium $PREFIX.Packages-non-US \
+ >dists/$CODENAME/non-US/binary-$ARCH/Packages
+ grep -v ^X-Medium $PREFIX.Packages-non-US | gzip --best \
+ >dists/$CODENAME/non-US/binary-$ARCH/Packages.gz
+ for i in $TDIR/$CODENAME-$ARCH/*.packages; do
+ dir=${i%%.packages}
+ n=${dir##$TDIR/$CODENAME-$ARCH/}
+ if [ $n -le $NUM ]; then
+ cat $dir.Packages-non-US \
+ >>dists/$CODENAME/non-US/binary-$ARCH/Packages.cd
+ cat $dir.Packages-non-US | gzip --best \
+ >>dists/$CODENAME/non-US/binary-$ARCH/Packages.cd.gz
+ fi
+ done
+fi
+
fi
# Creates the temp Packages-$SECT files
@@ -68,12 +88,12 @@
# Look at the ugly hack for the main special case ...
- dpkg-scanpackages -m "`cat .disk/info`" \
+ dpkg-scanpackages \
dists/$CODENAME/$SECT/binary-$ARCH \
- $MIRROR/indices/override.$CODENAME.`t=${SECT}.; echo -n ${t##main.}`gz \
+ $MIRROR/indices/override.$CODENAME`t=.${SECT}; echo -n ${t##.main}` \
> $PREFIX.Packages-$SECT
- if [ -n "$NONUS" ]; then
+ if [ -n "$NONUS" -a "x"$CODENAME != "xslink" ]; then
dpkg-scanpackages -m "`cat .disk/info`" \
dists/$CODENAME/non-US/$SECT/binary-$ARCH \
$NONUS/indices-non-US/override.$CODENAME.`t=${SECT}.; echo -n ${t##main.}`gz \
@@ -81,5 +101,12 @@
fi
done
+
+if [ -n "$NONUS" -a "x"$CODENAME = "xslink" ]; then
+ dpkg-scanpackages \
+ dists/$CODENAME/non-US/binary-$ARCH \
+ $NONUS/indices-non-US/override.$CODENAME \
+ > $PREFIX.Packages-non-US
+fi
exit 0
diff -urN yacs/tools/scansources yacs.slink/tools/scansources
--- yacs/tools/scansources Sun Aug 8 23:30:20 1999
+++ yacs.slink/tools/scansources Tue Aug 24 20:57:16 1999
@@ -22,11 +22,16 @@
dpkg-scansources dists/$CODENAME/$SECT/source \
| gzip --best > dists/$CODENAME/$SECT/source/Sources.gz
- if [ -n "$NONUS" ]; then
+ if [ -n "$NONUS" -a "x"$CODENAME != "xslink" ]; then
dpkg-scansources dists/$CODENAME/non-US/$SECT/source \
| gzip --best > dists/$CODENAME/non-US/$SECT/source/Sources.gz
fi
done
+
+if [ -n "$NONUS" -a "x"$CODENAME = "xslink" ]; then
+ dpkg-scansources dists/$CODENAME/non-US/source \
+ | gzip --best > dists/$CODENAME/non-US/source/Sources.gz
+fi
exit 0
Reply to: