[Pkg-lyx-devel] svn commit: r240 - in /lyx/branches/lyx-1.5/debian: control rules

[pelle at users.alioth.debian.org]

Author: pelle
Date: Sun Feb  4 17:31:48 2007
New Revision: 240

URL: http://svn.debian.org/wsvn/pkg-lyx/?sc=1&rev=240
Log:
no lyxrc anymore, and conflict with lyx-{qt,xforms}

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

Modified: lyx/branches/lyx-1.5/debian/control
URL: http://svn.debian.org/wsvn/pkg-lyx/lyx/branches/lyx-1.5/debian/control?rev=240&op=diff
==============================================================================
--- lyx/branches/lyx-1.5/debian/control (original)
+++ lyx/branches/lyx-1.5/debian/control Sun Feb  4 17:31:48 2007
@@ -14,6 +14,7 @@
 Recommends: kdeprint | lpr, konqueror | www-browser, kghostview | postscript-viewer, kpdf | pdf-viewer, sgmltools-lite, linuxdoc-tools, rcs, tex4ht | hevea | tth | latex2html, gnuhtml2latex, wv, dvipost, latex-xft-fonts
 Suggests: chktex, nowebm, menu
 Replaces: lyx-common (<< 1.4.2-1)
+Conflicts: lyx-qt, lyx-xforms
 Description: High Level Word Processor
  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/branches/lyx-1.5/debian/rules
URL: http://svn.debian.org/wsvn/pkg-lyx/lyx/branches/lyx-1.5/debian/rules?rev=240&op=diff
==============================================================================
--- lyx/branches/lyx-1.5/debian/rules (original)
+++ lyx/branches/lyx-1.5/debian/rules Sun Feb  4 17:31:48 2007
@@ -100,9 +100,6 @@
 	mv debian/lyx-common/usr/bin/tex2lyx debian/lyx/usr/bin/
 	mv debian/lyx-common/usr/bin/lyxclient debian/lyx/usr/bin/
 
-	mv debian/lyx-common/usr/share/lyx/lyxrc.example \
-		debian/lyx-common/etc/lyxrc
-	ln -s /etc/lyxrc debian/lyx-common/usr/share/lyx/lyxrc.dist
 	rm debian/lyx-common/usr/share/lyx/lyx2lyx/profiling.py*
 	rm -r debian/lyx-common/usr/share/lyx/xfonts/
 	mkdir -p debian/lyx-common/usr/share/texmf/tex/latex/lyx