[debian-edu-commits] debian-edu/debian-edu-doc.git (#1535) - master (branch) updated: 1.5_20130714_7.1-3-ga2d9ca4

[David Prévot]

The branch, master has been updated
       via  a2d9ca4796df74cc4dfb1cf4e490fe15a11b4b32 (commit)
      from  2bcf0673abe4514deece73502d661c4d888a31c2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit a2d9ca4796df74cc4dfb1cf4e490fe15a11b4b32
Author: David Prévot <taffit at debian.org>
Date:   Wed Jul 17 13:12:46 2013 -0400

    Revert "Change order of alternative depends."
    
    This reverts commit 2bcf0673abe4514deece73502d661c4d888a31c2.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog |    4 ++--
 debian/control   |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index b47598d..988a98c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
 debian-edu-doc (1.5~20130723~7.1) UNRELEASED; urgency=low
 
-  * Build-depend on texlive-lang-european | texlive-lang-danish and
-    texlive-lang-european | texlive-lang-norwegian to support building on
+  * Build-depend on texlive-lang-danish | texlive-lang-european and
+    texlive-lang-norwegian | texlive-lang-european to support building on
     wheezy and sid. (Closes: #709758)
 
  -- Holger Levsen <holger at debian.org>  Mon, 15 Jul 2013 13:31:55 +0200
diff --git a/debian/control b/debian/control
index 2463d41..1f1ea06 100644
--- a/debian/control
+++ b/debian/control
@@ -5,9 +5,9 @@ Build-Depends: debhelper (>= 5)
 Build-Depends-Indep: docbook-utils, poxml, ldp-docbook-xsl, dblatex, po4a,
  gsfonts, lmodern, texlive-xetex,
  fonts-arphic-gbsn00lp, fonts-arphic-bsmi00lp, ttf-wqy-zenhei,
- texlive-lang-cyrillic, texlive-lang-european | texlive-lang-danish,  texlive-lang-spanish,
+ texlive-lang-cyrillic, texlive-lang-danish | texlive-lang-european,  texlive-lang-spanish,
  texlive-lang-french, texlive-lang-german, texlive-lang-italian,
- texlive-lang-european | texlive-lang-norwegian, imagemagick
+ texlive-lang-norwegian | texlive-lang-european, imagemagick
 Maintainer: Debian Edu Developers <debian-edu at lists.debian.org>
 Uploaders: Holger Levsen <holger at debian.org>, 
  David Prévot <taffit at debian.org>


hooks/post-receive
-- 
debian-edu-doc.git (Debian package debian-edu-doc)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "debian-edu-doc.git" (Debian package debian-edu-doc).