[Pkg-lyx-devel] svn commit: r265 - in /lyx/trunk/debian: changelog control control.in

[hoaxter-guest at users.alioth.debian.org]

Author: hoaxter-guest
Date: Fri Feb 16 21:57:20 2007
New Revision: 265

URL: http://svn.debian.org/wsvn/pkg-lyx/?sc=1&rev=265
Log:
Adding a min. conflict with latex-beamer for lyx-common

Modified:
    lyx/trunk/debian/changelog
    lyx/trunk/debian/control
    lyx/trunk/debian/control.in

Modified: lyx/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-lyx/lyx/trunk/debian/changelog?rev=265&op=diff
==============================================================================
--- lyx/trunk/debian/changelog (original)
+++ lyx/trunk/debian/changelog Fri Feb 16 21:57:20 2007
@@ -4,7 +4,11 @@
   * Include the quilt package's quilt.make instead of running quilt on our
     own. Simplifies debian/rules.
 
- -- Per Olofsson <pelle at debian.org>  Sun,  3 Dec 2006 14:09:11 +0100
+  [ Sven Hoexter]
+  * Adding a Conflicts: latex-beamer (<=3.06.dfsg.1-0.1) for lyx-common since
+    we ship the beamer.layout file now.
+  
+ -- Sven Hoexter <sven at timegate.de>  Fri, 16 Feb 2007 21:55:03 +0100
 
 lyx (1.4.3-2) unstable; urgency=low
 

Modified: lyx/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-lyx/lyx/trunk/debian/control?rev=265&op=diff
==============================================================================
--- lyx/trunk/debian/control (original)
+++ lyx/trunk/debian/control Fri Feb 16 21:57:20 2007
@@ -43,6 +43,7 @@
 Depends: perl, ${python:Depends}, tetex-bin (>= 2.0.2-11) | texlive-latex-base, xdg-utils
 Recommends: lyx, tetex-extra | texlive-latex-recommended, tetex-extra | texlive-fonts-recommended, libtiff-tools, groff, imagemagick, mime-support, psutils
 Suggests: kdeprint | lpr, konqueror | www-browser, kghostview | postscript-viewer, kpdf | pdf-viewer, sgmltools-lite, linuxdoc-tools, rcs, tex4ht | hevea | tth | latex2html, gnuhtml2latex, wv, dvipost, dvipng
+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

Modified: lyx/trunk/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-lyx/lyx/trunk/debian/control.in?rev=265&op=diff
==============================================================================
--- lyx/trunk/debian/control.in (original)
+++ lyx/trunk/debian/control.in Fri Feb 16 21:57:20 2007
@@ -43,6 +43,7 @@
 Depends: perl, ${python:Depends}, tetex-bin (>= 2.0.2-11) | texlive-latex-base, xdg-utils
 Recommends: lyx, tetex-extra | texlive-latex-recommended, tetex-extra | texlive-fonts-recommended, libtiff-tools, groff, imagemagick, mime-support, psutils
 Suggests: kdeprint | lpr, konqueror | www-browser, kghostview | postscript-viewer, kpdf | pdf-viewer, sgmltools-lite, linuxdoc-tools, rcs, tex4ht | hevea | tth | latex2html, gnuhtml2latex, wv, dvipost, dvipng
+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