[Pkg-lyx-devel] svn commit: r283 - in /lyx/branches/lyx-1.5/debian: changelog control lyx-common.dirs lyx.dirs rules

[pelle at users.alioth.debian.org]

Author: pelle
Date: Wed Apr 11 16:27:03 2007
New Revision: 283

URL: http://svn.debian.org/wsvn/pkg-lyx/?sc=1&rev=283
Log:
* Move icons to the lyx package to avoid lintian warnings. Adjust
  Replaces accordingly.

Removed:
    lyx/branches/lyx-1.5/debian/lyx-common.dirs
Modified:
    lyx/branches/lyx-1.5/debian/changelog
    lyx/branches/lyx-1.5/debian/control
    lyx/branches/lyx-1.5/debian/lyx.dirs
    lyx/branches/lyx-1.5/debian/rules

Modified: lyx/branches/lyx-1.5/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-lyx/lyx/branches/lyx-1.5/debian/changelog?rev=283&op=diff
==============================================================================
--- lyx/branches/lyx-1.5/debian/changelog (original)
+++ lyx/branches/lyx-1.5/debian/changelog Wed Apr 11 16:27:03 2007
@@ -6,8 +6,10 @@
     the lyx package.
   * Remove alternative dependencies on tetex.
   * Depend on latex-xft-fonts, instead of merely recommending it.
-
- -- Per Olofsson <pelle at debian.org>  Wed, 11 Apr 2007 18:20:55 +0200
+  * Move icons to the lyx package to avoid lintian warnings. Adjust
+    Replaces accordingly.
+
+ -- Per Olofsson <pelle at debian.org>  Wed, 11 Apr 2007 18:27:08 +0200
 
 lyx (1.5.0~beta1-2) experimental; urgency=low
 

Modified: lyx/branches/lyx-1.5/debian/control
URL: http://svn.debian.org/wsvn/pkg-lyx/lyx/branches/lyx-1.5/debian/control?rev=283&op=diff
==============================================================================
--- lyx/branches/lyx-1.5/debian/control (original)
+++ lyx/branches/lyx-1.5/debian/control Wed Apr 11 16:27:03 2007
@@ -12,7 +12,7 @@
 Depends: ${shlibs:Depends}, lyx-common (= ${source:Version}), texlive-latex-recommended, texlive-fonts-recommended, preview-latex-style, libtiff-tools, groff, imagemagick, mime-support, psutils, xdg-utils, latex-xft-fonts
 Recommends: kdeprint | lpr, konqueror | www-browser, kghostview | postscript-viewer, kpdf | pdf-viewer, rcs, tex4ht | hevea | tth | latex2html, gnuhtml2latex, wv, dvipost, dvipng
 Suggests: chktex, nowebm, menu, sgmltools-lite, linuxdoc-tools
-Replaces: lyx-common (<< 1.5.0~beta1)
+Replaces: lyx-common (<< 1.5.0~beta1-3)
 Conflicts: lyx-qt, lyx-xforms
 Description: High Level Word Processor
  LyX is an almost WYSIWYG-frontend for LaTeX that runs under the X Window

Modified: lyx/branches/lyx-1.5/debian/lyx.dirs
URL: http://svn.debian.org/wsvn/pkg-lyx/lyx/branches/lyx-1.5/debian/lyx.dirs?rev=283&op=diff
==============================================================================
--- lyx/branches/lyx-1.5/debian/lyx.dirs (original)
+++ lyx/branches/lyx-1.5/debian/lyx.dirs Wed Apr 11 16:27:03 2007
@@ -1,1 +1,3 @@
 usr/share/doc/
+usr/share/icons/hicolor/32x32/apps
+usr/share/icons/hicolor/48x48/apps

Modified: lyx/branches/lyx-1.5/debian/rules
URL: http://svn.debian.org/wsvn/pkg-lyx/lyx/branches/lyx-1.5/debian/rules?rev=283&op=diff
==============================================================================
--- lyx/branches/lyx-1.5/debian/rules (original)
+++ lyx/branches/lyx-1.5/debian/rules Wed Apr 11 16:27:03 2007
@@ -103,9 +103,9 @@
 	rmdir debian/lyx-common/usr/share/lyx/tex/
 
 	ln -s ../../../../lyx/images/lyx.xpm \
-		debian/lyx-common/usr/share/icons/hicolor/48x48/apps/lyx.xpm
+		debian/lyx/usr/share/icons/hicolor/48x48/apps/lyx.xpm
 	cp debian/lyx-32x32.xpm \
-		debian/lyx-common/usr/share/icons/hicolor/32x32/apps/lyx.xpm
+		debian/lyx/usr/share/icons/hicolor/32x32/apps/lyx.xpm
 
 	chmod +x debian/lyx-common/usr/share/lyx/scripts/*
 	chmod +x debian/lyx-common/usr/share/lyx/lyx2lyx/lyx2lyx