[Pkg-lyx-devel] [SCM] LyX packaging branch, master, updated. upstream/1.6.4-444-g2f77846

[Per Olofsson]

The following commit has been merged in the master branch:
commit 2f77846ec04f93f497b94ca080932f514f29e2ca
Author: Per Olofsson <pelle at dsv.su.se>
Date:   Sun Aug 30 12:31:27 2009 +0200

    Remove conflicts and replaces, as they were only needed pre-lenny.

diff --git a/debian/changelog b/debian/changelog
index b17052c..015e7b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ lyx (1.6.4-2) UNRELEASED; urgency=low
 
   * Modify build-dep on quilt so it accepts backported quilt as well.
   * Remove "obvious" Suggests (lpr, www-browser).
+  * Remove conflicts and replaces, as they were only needed pre-lenny.
 
  -- Per Olofsson <pelle at debian.org>  Sun, 30 Aug 2009 12:06:07 +0200
 
diff --git a/debian/control b/debian/control
index 11be4ac..455ccc8 100644
--- a/debian/control
+++ b/debian/control
@@ -20,8 +20,6 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, lyx-common (= ${source:Version}), xdg-utils, mime-support
 Recommends: texlive-latex-recommended, texlive-latex-extra, texlive-fonts-recommended, preview-latex-style, dvipng, imagemagick, psutils, ghostscript, poppler-utils, ttf-lyx, evince | pdf-viewer
 Suggests: rcs, dvipost, tex4ht | hevea | tth | latex2html, groff, libtiff-tools, gnuhtml2latex, wv, chktex, noweb, menu, sgmltools-lite, linuxdoc-tools, writer2latex, latex2rtf
-Replaces: lyx-common (<< 1.5.0~beta1-3)
-Conflicts: lyx-qt, lyx-xforms
 Description: Document Processor
  LyX is an almost WYSIWYG-frontend for LaTeX. It makes the power and
  typesetting quality of LaTeX available for people who are used to
@@ -48,7 +46,6 @@ Package: lyx-common
 Architecture: all
 Depends: ${misc:Depends}, ${python:Depends}
 Recommends: lyx
-Conflicts: latex-beamer (<= 3.06.dfsg.1-0.1)
 Description: Architecture-independent files for LyX
  This package contains LyX's common files which are not
  architecture-dependent. See the lyx package for a description of LyX

-- 
LyX packaging