[Pkg-lyx-devel] svn commit: r278 - in /lyx/branches/lyx-1.5/debian: changelog control

[pelle at users.alioth.debian.org]

Author: pelle
Date: Fri Mar 23 11:10:07 2007
New Revision: 278

URL: http://svn.debian.org/wsvn/pkg-lyx/?sc=1&rev=278
Log:
* Added conflict with latex-beamer (<= 3.06.dfsg.1-0.1) to lyx-common,
  because both distribute beamer.layout.

Modified:
    lyx/branches/lyx-1.5/debian/changelog
    lyx/branches/lyx-1.5/debian/control

Modified: lyx/branches/lyx-1.5/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-lyx/lyx/branches/lyx-1.5/debian/changelog?rev=278&op=diff
==============================================================================
--- lyx/branches/lyx-1.5/debian/changelog (original)
+++ lyx/branches/lyx-1.5/debian/changelog Fri Mar 23 11:10:07 2007
@@ -1,3 +1,10 @@
+lyx (1.5.0~beta1-3) UNRELEASED; urgency=low
+
+  * Added conflict with latex-beamer (<= 3.06.dfsg.1-0.1) to lyx-common,
+    because both distribute beamer.layout.
+
+ -- Per Olofsson <pelle at debian.org>  Fri, 23 Mar 2007 12:09:51 +0100
+
 lyx (1.5.0~beta1-2) experimental; urgency=low
 
   * Add patch boost_ia64 from upstream r17506 to add ia64 support to the

Modified: lyx/branches/lyx-1.5/debian/control
URL: http://svn.debian.org/wsvn/pkg-lyx/lyx/branches/lyx-1.5/debian/control?rev=278&op=diff
==============================================================================
--- lyx/branches/lyx-1.5/debian/control (original)
+++ lyx/branches/lyx-1.5/debian/control Fri Mar 23 11:10:07 2007
@@ -40,6 +40,7 @@
 Architecture: all
 Depends: ${python:Depends}, texlive-latex-base | tetex-bin
 Recommends: lyx
+Conflicts: latex-beamer (<= 3.06.dfsg.1-0.1)
 Description: High Level Word Processor - common files
  LyX is an almost WYSIWYG-frontend for LaTeX that runs under the X Window
  System. It makes the power and typesetting quality of LaTeX available for