[SCM] Debian packaging of texlive-nonbin) branch, master, updated. debian/all-2012.20130111-1-26-g14aa3ce
The following commit has been merged in the master branch:
commit e0c4e9a6d3b4e167ccf5cdfd65a78d35dd79e004
Author: Norbert Preining <preining@debian.org>
Date: Mon May 20 13:13:01 2013 +0900
give up on texlive-doc link/dir changes, too much pain
diff --git a/TODO_URGENT b/TODO_URGENT
deleted file mode 100644
index f1d1151..0000000
--- a/TODO_URGENT
+++ /dev/null
@@ -1,4 +0,0 @@
-
-ALL PACKAGES HAVE TO CONFLCIT WITH texlive-base << 2013
-OTHERWISE texmf-dist/doc move will NOT work!!!
-
diff --git a/all/debian/cfg.d/package-naming.cfg b/all/debian/cfg.d/package-naming.cfg
index 664cf7f..35d9c14 100644
--- a/all/debian/cfg.d/package-naming.cfg
+++ b/all/debian/cfg.d/package-naming.cfg
@@ -37,6 +37,7 @@ replaces;texlive-lang-european;texlive-doc-bg, texlive-doc-nl, texlive-doc-fi, t
replaces;texlive-lang-cjk;texlive-doc-zh
replaces;texlive-lang-czechslovak;texlive-doc-cs+sk
replaces;texlive-base;texlive-doc-en
+replaces;texlive-lang-english;texlive-doc-en
replaces;texlive-lang-french;texlive-doc-fr
replaces;texlive-lang-german;texlive-doc-de
replaces;texlive-lang-italian;texlive-doc-it
diff --git a/all/debian/rules.in b/all/debian/rules.in
index 7c7ca0f..3e8bcfe 100755
--- a/all/debian/rules.in
+++ b/all/debian/rules.in
@@ -130,7 +130,7 @@ binary-indep: build install
# remove .bat files, nobody needs them
find debian/texlive-*/usr/share/texlive/texmf-dist/ -name \*.bat -a -type f -exec rm '{}' \;
# remove x bit from files in the doc hierarchy
- find debian/texlive-*/usr/share/texlive/texmf-dist/doc -type f -exec chmod a-x '{}' \;
+ find debian/texlive-*/usr/share/doc/texlive-doc -type f -exec chmod a-x '{}' \;
# we also have to fix the permissions of the link targets from /usr/bin
bash debian/fix-bin-symlink-targets-permissions.sh
dh_installdeb
diff --git a/all/debian/tpm2deb-bin.pl b/all/debian/tpm2deb-bin.pl
index 4be6b23..4e19b2d 100755
--- a/all/debian/tpm2deb-bin.pl
+++ b/all/debian/tpm2deb-bin.pl
@@ -74,9 +74,9 @@ sub main {
die "Cannot load tlpdb!" unless defined($::tlpdb);
initialize_config_file_data("debian/tpm2deb.cfg");
build_data_hash();
- # use Data::Dumper;
+ # use Data::Dumper;
# $Data::Dumper::Indent = 1;
- # print Dumper(\%TeXLive);
+ # print Dumper(\%TeXLive);
# exit(1);
check_consistency();
foreach my $package (@packages) {
@@ -145,6 +145,9 @@ sub make_deb_copy_to_rightplace {
next if tl_is_blacklisted($file);
if (!tl_is_ignored($file)) {
my $finaldest = "$basedir/usr/share/texlive/$lfile";
+ if ($lfile =~ m!^texmf-dist/doc/(.*)$!) {
+ $finaldest = "$basedir/usr/share/doc/texlive-doc/$1";
+ }
# SWITCH my $finaldest = "$basedir/usr/share/texmf/$lfile";
$opt_debug && print STDERR "NORMAL COPY: $finaldest\n";
&mkpath(dirname($finaldest));
diff --git a/all/debian/tpm2debcommon.pm b/all/debian/tpm2debcommon.pm
index f17b0cd..47e5751 100755
--- a/all/debian/tpm2debcommon.pm
+++ b/all/debian/tpm2debcommon.pm
@@ -220,13 +220,9 @@ sub build_data_hash {
#
# other relations
#
- my @conflicts;
- push @conflicts, "texlive-base (<< 2013)";
if (defined($Config{'conflicts'}{$pkg})) {
- push @conflicts, @{$Config{'conflicts'}{$pkg}};
+ $TeXLive{'binary'}{$pkg}{'conflicts'} = [ @{$Config{'conflicts'}{$pkg}} ];
}
- $TeXLive{'binary'}{$pkg}{'conflicts'} = [ @conflicts ];
- #
if (defined($Config{'suggests'}{$pkg})) {
$TeXLive{'binary'}{$pkg}{'suggests'} = [ @{$Config{'suggests'}{$pkg}} ];
}
diff --git a/texlive-base/debian/changelog b/texlive-base/debian/changelog
index 4085a11..f1ad8da 100644
--- a/texlive-base/debian/changelog
+++ b/texlive-base/debian/changelog
@@ -1,9 +1,8 @@
-texlive-base (2013.20130517-1) unstable; urgency=low
+texlive-base (2013.20130520-1) unstable; urgency=low
* new upstream checkout
- * convert symlink texmf-dist/doc to a dir, move documentation there
- -- Norbert Preining <preining@debian.org> Fri, 17 May 2013 14:55:46 +0900
+ -- Norbert Preining <preining@debian.org> Mon, 20 May 2013 13:11:20 +0900
texlive-base (2012.20130315-1) experimental; urgency=low
diff --git a/texlive-base/debian/texlive-base.links.dist b/texlive-base/debian/texlive-base.links.dist
index 390ffdf..959be08 100644
--- a/texlive-base/debian/texlive-base.links.dist
+++ b/texlive-base/debian/texlive-base.links.dist
@@ -10,3 +10,4 @@ usr/bin/fmtutil usr/bin/mktexfmt
var/lib/texmf/ls-R-TEXLIVEDIST usr/share/texlive/texmf-dist/ls-R
var/lib/texmf/updmap.cfg-TEXLIVEDIST usr/share/texlive/texmf-dist/web2c/updmap.cfg
var/lib/texmf/updmap.cfg-DEBIAN usr/share/texmf/web2c/updmap.cfg
+usr/share/doc/texlive-doc usr/share/texlive/texmf-dist/doc
diff --git a/texlive-base/debian/texlive-base.postinst.pre b/texlive-base/debian/texlive-base.postinst.pre
index 4c8de06..446d91b 100644
--- a/texlive-base/debian/texlive-base.postinst.pre
+++ b/texlive-base/debian/texlive-base.postinst.pre
@@ -39,14 +39,6 @@ case "$1" in
fi
done
- # remove preinst created backup of link of texmf-dist/doc
- if dpkg --compare-versions "$trigger" lt "2013" ; then
- if [ -L /usr/share/texlive/texmf-dist/doc.dpkg-remove ] ; then
- rm -f /usr/share/texlive/texmf-dist/doc.dpkg-remove
- fi
- fi
-
-
mktexlsr /usr/share/texlive/texmf /usr/share/texmf /var/lib/texmf
for binary in dvips dvipdfmx xdvi pdftex; do
if localpaper=$(tl-paper get $binary); then
diff --git a/texlive-base/debian/texlive-base.postrm.pre b/texlive-base/debian/texlive-base.postrm.pre
deleted file mode 100644
index fbc8963..0000000
--- a/texlive-base/debian/texlive-base.postrm.pre
+++ /dev/null
@@ -1,13 +0,0 @@
-
-case $action in
- abort-install|abort-upgrade)
- syml=/usr/share/texlive/texmf-dist/doc
- if [ -n "$2" ] && dpkg --compare-versions "$2" lt "2013" ; then
- if [ -L $syml.dpkg-remove ] && [ ! -e $syml ] ; then
- echo "Reinstatiating $syml"
- mv $syml.dpkg-remove $syml
- fi
- fi
- ;;
-esac
-
diff --git a/texlive-base/debian/texlive-base.preinst.pre b/texlive-base/debian/texlive-base.preinst.pre
deleted file mode 100644
index 7ee2eb9..0000000
--- a/texlive-base/debian/texlive-base.preinst.pre
+++ /dev/null
@@ -1,17 +0,0 @@
-
-# prepare for change of symlink to real dir
-
-slink=/usr/share/texlive/texmf-dist/doc
-slinktarget=../../doc/texlive-doc
-
-case "$1" in
- upgrade|install)
- ov=$2
- if [ -n "$ov" ] && dpkg --compare-versions "$ov" lt 2013 ; then
- if [ -L $slink ] && [ "$(readlink $slink)" = $slinktarget ] ; then
- mv $slink $slink.dpkg-remove
- fi
- fi
- ;;
-esac
-
diff --git a/texlive-extra/debian/changelog b/texlive-extra/debian/changelog
index c89ed29..2e0b07e 100644
--- a/texlive-extra/debian/changelog
+++ b/texlive-extra/debian/changelog
@@ -1,9 +1,9 @@
-texlive-extra (2013.20130517-1) unstable; urgency=low
+texlive-extra (2013.20130520-1) unstable; urgency=low
* new upstream checkout
* depend on fonts-dejavu-* instead of ttf-dejavu-* (Closes: #708059)
- -- Norbert Preining <preining@debian.org> Fri, 17 May 2013 11:09:29 +0900
+ -- Norbert Preining <preining@debian.org> Mon, 20 May 2013 13:11:24 +0900
texlive-extra (2012.20130315-1) experimental; urgency=low
diff --git a/texlive-lang/debian/changelog b/texlive-lang/debian/changelog
index 58724e8..d567752 100644
--- a/texlive-lang/debian/changelog
+++ b/texlive-lang/debian/changelog
@@ -1,8 +1,8 @@
-texlive-lang (2013.20130517-1) unstable; urgency=low
+texlive-lang (2013.20130520-1) unstable; urgency=low
* new upstream checkout
- -- Norbert Preining <preining@debian.org> Fri, 17 May 2013 11:09:48 +0900
+ -- Norbert Preining <preining@debian.org> Mon, 20 May 2013 13:11:26 +0900
texlive-lang (2012.20130315-1) experimental; urgency=low
--
Debian packaging of texlive-nonbin)
Reply to: