On Die, 05 Jun 2007, Norbert Preining wrote:
> So the most things are useless, what about:
> - change rules.in to have
> PACKAGES=<:=$binpackages:>
> METAPACKAGES=<:=$metapackages:>
> - call tpm2deb-bin.pl with $(PACKAGES) $(METAPACKAGES)
> - call the long for only for $(PACKAGES)
> - call merge-dist-tree, bug.*, links.dist, README for $(METAPACKAGES)
well, it doesn't hurt, so call the long for for both packages
> - add -N $i for all $(METAPACKAGES) to the dh_installtex call
what do you say to the following diff?
(can we agree that we use GNU make, so that I can use $(patsubs ...)
Index: all/debian/rules.in
===================================================================
--- all/debian/rules.in (revision 2935)
+++ all/debian/rules.in (working copy)
@@ -3,7 +3,9 @@
#
# debian/rules file for <:=$srcpackage:>
# $Id$
+
PACKAGES=<:=$binpackages:>
+METAPACKAGES=<:=$metapackages:>
SHELL=/bin/bash
@@ -78,7 +80,7 @@
rm -f patch-stamp
clean: unpatch
- for i in $(PACKAGES) ; do \
+ for i in $(PACKAGES) $(METAPACKAGES) ; do \
rm -f debian/$$i.{README.Debian,links,links.generated} ; \
rm -f debian/$$i.{postinst,postrm,preinst,prerm} ; \
rm -f debian/$$i.{maps,languages,formats} ; \
@@ -105,8 +107,8 @@
install: install-stamp
install-stamp: build-stamp
- perl debian/tpm2deb-bin.pl --nosource $(PACKAGES)
- for i in $(PACKAGES) ; do \
+ perl debian/tpm2deb-bin.pl --nosource $(PACKAGES) $(METAPACKAGES)
+ for i in $(PACKAGES) $(METAPACKAGES) ; do \
if [ -d debian/$$i.root ] ; then bash debian/merge-dist-tree
debian/$$i.root debian/$$i ; fi ; \
bash debian/generate-license-file $$i ; \
rm -rf debian/$$i/usr/share/texmf-texlive/tpm ; \
@@ -137,6 +139,7 @@
<: if ($srcpackage eq "texlive-base") { _:>//
dh_installdocs -p texlive-common README.?? debian/CHANGES.packaging
dh_installtex -Ntexlive-base -A --priority=10 \
+ $(patsubst %,-N%,$(METAPACKAGES)) \
texmftrees=/usr/share/texmf-texlive
dh_installtex -ptexlive-base --priority=10 \
--flavor=format:build_all \
Index: tpm2deb-source.pl
===================================================================
--- tpm2deb-source.pl (revision 2935)
+++ tpm2deb-source.pl (working copy)
@@ -83,6 +83,7 @@
our $Master;
our %TpmData;
+our %Config;
if (!($opt_master =~ m,/.*$,,)) {
$Master = `pwd`;
@@ -451,7 +452,16 @@
system ("cp -a $mydir/$package/* $tmpdir/") == 0
or die("Error copying package-specific files");
- system (qq{eperl -k -d arch=$arch -d srcpackage=$package
-dbinpackages="@{$TeXLive{'source'}{$package}{'binary_packages'}}"
$mydir/all/debian/rules.in > $debdest/rules}) == 0
+ my @metapackage;
+ my @normalpackages;
+ foreach my $foo (@{$TeXLive{'source'}{$package}{'binary_packages'}}) {
+ if (ismember($foo,@{$Config{'add_packages'}})) {
+ push @metapackages, $foo;
+ } else {
+ push @normalpackages, $foo;
+ }
+ }
+ system (qq{eperl -k -d arch=$arch -d srcpackage=$package
-dbinpackages="@normalpackages" -dmetapackages="@metapackages"
$mydir/all/debian/rules.in > $debdest/rules}) == 0
or die("Error creating debian/rules");;
system(qq{chmod ugo+x $debdest/rules}) == 0
or die("Cannot change permissions of $debdest/rules");;
Best wishes
Norbert
-------------------------------------------------------------------------------
Dr. Norbert Preining <[EMAIL PROTECTED]> Vienna University of Technology
Debian Developer <[EMAIL PROTECTED]> Debian TeX Group
gpg DSA: 0x09C5B094 fp: 14DF 2E6C 0307 BE6D AD76 A9C0 D2BF 4AA3 09C5 B094
-------------------------------------------------------------------------------
LOW ARDWELL (n.)
Seductive remark made hopefully in the back of a taxi.
--- Douglas Adams, The Meaning of Liff
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
