[texlive-nonbin] 02/02: fix wheezy upgrades by breaking against texlive-base
This is an automated email from the git hooks/post-receive script.
preining pushed a commit to branch master
in repository texlive-nonbin.
commit 6ee5c4b28fcac3c1d88cbb882c604fd5d4dbefc0
Author: Norbert Preining <preining@debian.org>
Date: Wed Mar 26 16:03:18 2014 +0900
fix wheezy upgrades by breaking against texlive-base
---
all/debian/tpm2debcommon.pm | 5 ++++-
texlive-base/debian/changelog | 9 +++++----
texlive-extra/debian/changelog | 6 ++++++
texlive-lang/debian/changelog | 6 ++++++
4 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/all/debian/tpm2debcommon.pm b/all/debian/tpm2debcommon.pm
index 193f075..82b1186 100755
--- a/all/debian/tpm2debcommon.pm
+++ b/all/debian/tpm2debcommon.pm
@@ -235,9 +235,12 @@ sub build_data_hash {
if (defined($Config{'replaces'}{$pkg})) {
$TeXLive{'binary'}{$pkg}{'replaces'} = [ @{$Config{'replaces'}{$pkg}} ];
}
+ my @breaks;
+ push @breaks, "texlive-base (<< $TeXLive{'all'}{'tl_common_version'})";
if (defined($Config{'breaks'}{$pkg})) {
- $TeXLive{'binary'}{$pkg}{'breaks'} = [ @{$Config{'breaks'}{$pkg}} ];
+ push @breaks, @{$Config{'breaks'}{$pkg}};
}
+ $TeXLive{'binary'}{$pkg}{'breaks'} = [ @breaks ];
if (defined($Config{'bin-section'}{$pkg})) {
$TeXLive{'binary'}{$pkg}{'section'} = $Config{'bin-section'}{$pkg};
}
diff --git a/texlive-base/debian/changelog b/texlive-base/debian/changelog
index 0cf0e4c..3aeabf9 100644
--- a/texlive-base/debian/changelog
+++ b/texlive-base/debian/changelog
@@ -1,13 +1,14 @@
-texlive-base (2013.20140315-1) UNRELEASED; urgency=medium
+texlive-base (2013.20140MDD-1) UNRELEASED; urgency=medium
- * UNRELEASED - new upstream needed
* re-include also latex-beamer and latex-xcolor and provide transitional
packages, thanks again to OHURA Makoto! (Closes: #377046, #387642,
#405308, #408569, #305035, #402234, #399804, #245996, #617431, #499178)
* texlive-pictures depends on t-l-r for xcolor (Closes: #741778)
- * add more replaces for upgrade from wheezy (Closes: #742189)
+ * upgrade logic in apt is broken, we need to break against old versions
+ of texlive-base to guarantee proper upgrade from wheezy (Closes: #742189)
+ * make sure that ocp files are present for omega (Closes: #742660)
- -- Norbert Preining <preining@debian.org> Tue, 25 Mar 2014 11:01:41 +0900
+ -- Norbert Preining <preining@debian.org> Wed, 26 Mar 2014 16:01:32 +0900
texlive-base (2013.20140314-1) unstable; urgency=medium
diff --git a/texlive-extra/debian/changelog b/texlive-extra/debian/changelog
index 6f1b4d4..292e67d 100644
--- a/texlive-extra/debian/changelog
+++ b/texlive-extra/debian/changelog
@@ -1,3 +1,9 @@
+texlive-extra (2013.20140MDD-1) unreleased; urgency=medium
+
+ * new upstream checkout
+
+ -- Norbert Preining <preining@debian.org> Wed, 26 Mar 2014 16:02:32 +0900
+
texlive-extra (2013.20140314-1) unstable; urgency=medium
* fix invoice.sty loading fp wrongly (Closes: #740291)
diff --git a/texlive-lang/debian/changelog b/texlive-lang/debian/changelog
index 4a42816..999efb2 100644
--- a/texlive-lang/debian/changelog
+++ b/texlive-lang/debian/changelog
@@ -1,3 +1,9 @@
+texlive-lang (2013.20140MDD-1) unreleased; urgency=medium
+
+ * new upstream checkout
+
+ -- Norbert Preining <preining@debian.org> Wed, 26 Mar 2014 16:02:44 +0900
+
texlive-lang (2013.20140314-1) unstable; urgency=medium
* new upstream checkout
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-tex/texlive-nonbin.git
Reply to: