[Pkg-lyx-devel] svn commit: r226 - /lyx/branches/lyx-1.5/debian/
pelle at users.alioth.debian.org
pelle at users.alioth.debian.org
Sat Feb 3 19:10:52 CET 2007
Author: pelle
Date: Sat Feb 3 19:10:51 2007
New Revision: 226
URL: http://svn.debian.org/wsvn/pkg-lyx/?sc=1&rev=226
Log:
* Remove support for multiple frontends. Only build the qt4 frontend,
and place it in the lyx package.
Added:
lyx/branches/lyx-1.5/debian/lyx.links
Removed:
lyx/branches/lyx-1.5/debian/control.gtk
lyx/branches/lyx-1.5/debian/control.in
lyx/branches/lyx-1.5/debian/control.qt
lyx/branches/lyx-1.5/debian/control.xforms
lyx/branches/lyx-1.5/debian/lyx-gtk.build-deps
lyx/branches/lyx-1.5/debian/lyx-gtk.dirs
lyx/branches/lyx-1.5/debian/lyx-gtk.manpages
lyx/branches/lyx-1.5/debian/lyx-qt.build-deps
lyx/branches/lyx-1.5/debian/lyx-qt.dirs
lyx/branches/lyx-1.5/debian/lyx-qt.manpages
lyx/branches/lyx-1.5/debian/lyx-qt.postinst
lyx/branches/lyx-1.5/debian/lyx-qt.prerm
lyx/branches/lyx-1.5/debian/lyx-xforms.build-deps
lyx/branches/lyx-1.5/debian/lyx-xforms.dirs
lyx/branches/lyx-1.5/debian/lyx-xforms.manpages
lyx/branches/lyx-1.5/debian/lyx-xforms.postinst
lyx/branches/lyx-1.5/debian/lyx-xforms.prerm
lyx/branches/lyx-1.5/debian/watch
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=226&op=diff
==============================================================================
--- lyx/branches/lyx-1.5/debian/changelog (original)
+++ lyx/branches/lyx-1.5/debian/changelog Sat Feb 3 19:10:51 2007
@@ -1,8 +1,10 @@
lyx (1.5.0~svn20070203-1) UNRELEASED; urgency=low
* Checked out upstream development snapshot.
-
- -- Per Olofsson <pelle at debian.org> Sat, 3 Feb 2007 18:40:01 +0100
+ * Remove support for multiple frontends. Only build the qt4 frontend,
+ and place it in the lyx package.
+
+ -- Per Olofsson <pelle at debian.org> Sat, 3 Feb 2007 19:10:40 +0100
lyx (1.4.3-3) UNRELEASED; 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=226&op=diff
==============================================================================
--- lyx/branches/lyx-1.5/debian/control (original)
+++ lyx/branches/lyx-1.5/debian/control Sat Feb 3 19:10:51 2007
@@ -6,14 +6,14 @@
Standards-Version: 3.7.2
XS-Python-Version: all
XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-lyx/lyx/trunk
-Build-Depends: tetex-bin | texlive-latex-base, libaiksaurus-dev, python-dev, python-support (>= 0.5.3), debhelper (>= 5.0.37.2), quilt (>= 0.40-1), g++ (>= 4:4.0.1-8), libz-dev, libx11-dev, libaspell-dev, dpkg-dev (>= 1.13.19), autotools-dev, libqt3-mt-dev, libforms-dev, libforms-bin, libxpm-dev, x11proto-core-dev
+Build-Depends: tetex-bin | texlive-latex-base, libaiksaurus-dev, python-dev, python-support (>= 0.5.3), debhelper (>= 5.0.37.2), quilt (>= 0.40-1), g++ (>= 4:4.0.1-8), libz-dev, libx11-dev, libaspell-dev, dpkg-dev (>= 1.13.19), autotools-dev, libqt3-mt-dev
Build-Conflicts: libboost-dev, libboost-regex-dev, libboost-signals-dev
Package: lyx
Architecture: any
-Depends: lyx-common, lyx-qt | lyx-xforms | lyx-gtk, tetex-bin (>= 2.0.2-11) | texlive-latex-base, tetex-extra | texlive-latex-recommended, tetex-extra | texlive-fonts-recommended, preview-latex-style, libtiff-tools, groff, imagemagick, mime-support, ${shlibs:Depends}
-Recommends: kdeprint | lpr, konqueror | www-browser, kghostview | postscript-viewer, kpdf | pdf-viewer, sgmltools-lite, linuxdoc-tools, rcs, tex4ht | hevea | tth | latex2html, gnuhtml2latex, wv, dvipost
-Suggests: chktex, nowebm
+Depends: lyx-common (= ${source:Version}), tetex-bin (>= 2.0.2-11) | texlive-latex-base, tetex-extra | texlive-latex-recommended, tetex-extra | texlive-fonts-recommended, preview-latex-style, libtiff-tools, groff, imagemagick, mime-support, ${shlibs:Depends}
+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)
Description: High Level Word Processor
LyX is an almost WYSIWYG-frontend for LaTeX that runs under the X Window
@@ -52,35 +52,4 @@
possible to use LaTeX-commands within LyX, so nothing of LaTeX's power is
lost.
.
- This package provides common files not dependent on the frontend version.
-
-Package: lyx-qt
-Architecture: any
-Depends: lyx-common (= ${source:Version}), ${shlibs:Depends}
-Recommends: latex-xft-fonts
-Suggests: menu
-Description: High Level Word Processor - Qt frontend
- 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
- people who are used to word processors. Since LyX supports LaTeX's concept
- of general mark-ups, it is even easier and faster to create professional
- quality documents with it than with usual word processors. It is also
- possible to use LaTeX-commands within LyX, so nothing of LaTeX's power is
- lost.
- .
- This package provides Lyx with Qt frontend.
-
-Package: lyx-xforms
-Architecture: any
-Depends: lyx-common (= ${source:Version}), ${shlibs:Depends}
-Suggests: menu
-Description: High Level Word Processor - XForms frontend
- 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
- people who are used to word processors. Since LyX supports LaTeX's concept
- of general mark-ups, it is even easier and faster to create professional
- quality documents with it than with usual word processors. It is also
- possible to use LaTeX-commands within LyX, so nothing of LaTeX's power is
- lost.
- .
- This package provides Lyx with XForms frontend.
+ This package provides common files which are not architecture-dependent.
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=226&op=diff
==============================================================================
--- lyx/branches/lyx-1.5/debian/lyx.dirs (original)
+++ lyx/branches/lyx-1.5/debian/lyx.dirs Sat Feb 3 19:10:51 2007
@@ -1,1 +1,2 @@
usr/bin
+usr/share/doc/
Added: lyx/branches/lyx-1.5/debian/lyx.links
URL: http://svn.debian.org/wsvn/pkg-lyx/lyx/branches/lyx-1.5/debian/lyx.links?rev=226&op=file
==============================================================================
--- lyx/branches/lyx-1.5/debian/lyx.links (added)
+++ lyx/branches/lyx-1.5/debian/lyx.links Sat Feb 3 19:10:51 2007
@@ -1,0 +1,1 @@
+lyx-common usr/share/doc/lyx
Modified: lyx/branches/lyx-1.5/debian/rules
URL: http://svn.debian.org/wsvn/pkg-lyx/lyx/branches/lyx-1.5/debian/rules?rev=226&op=diff
==============================================================================
--- lyx/branches/lyx-1.5/debian/rules (original)
+++ lyx/branches/lyx-1.5/debian/rules Sat Feb 3 19:10:51 2007
@@ -1,8 +1,6 @@
#!/usr/bin/make -f
include /usr/share/quilt/quilt.make
-
-FRONTENDS = qt xforms
# This has to be exported to make some magic below work.
export DH_OPTIONS
@@ -34,7 +32,6 @@
--with-aspell \
--with-x \
--without-included-gettext \
- --with-frontend="$(FRONTENDS)" \
--with-qt-dir=/usr/share/qt3 \
CFLAGS += -g
@@ -51,16 +48,7 @@
LDFLAGS += -Wl,--as-needed
-debian/control: debian/control.in debian/control.qt debian/control.xforms debian/control.gtk
- set -e; \
- build_deps=""; \
- for i in $(FRONTENDS); do \
- build_deps="$$build_deps, $$(cat debian/lyx-$$i.build-deps)"; \
- done; \
- sed "s/^\(Build-Depends:.*\)\$$/\\1$$build_deps/" debian/control.in >$@
- set -e; for i in $(FRONTENDS); do cat debian/control.$$i >> $@; done
-
-build: debian/control patch build-stamp
+build: patch build-stamp
build-stamp:
dh_testdir
@@ -81,7 +69,7 @@
touch build-stamp
clean: clean1 unpatch
-clean1: debian/control
+clean1:
dh_testdir
dh_testroot
@@ -102,8 +90,10 @@
dh_installdirs
dh_install
- rm debian/lyx-common/usr/bin/lyx
- rm debian/lyx-common/usr/share/man/man1/lyx.1
+ mv debian/lyx-common/usr/bin/lyx debian/lyx/usr/bin/
+ 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
@@ -113,18 +103,11 @@
mv debian/lyx-common/usr/share/lyx/tex/* \
debian/lyx-common/usr/share/texmf/tex/latex/lyx/
rmdir debian/lyx-common/usr/share/lyx/tex/
- mv debian/lyx-common/usr/bin/tex2lyx debian/lyx/usr/bin/
- mv debian/lyx-common/usr/bin/lyxclient debian/lyx/usr/bin/
ln -s ../../../../lyx/images/lyx.xpm \
debian/lyx-common/usr/share/icons/hicolor/48x48/apps/lyx.xpm
cp debian/lyx-32x32.xpm \
debian/lyx-common/usr/share/icons/hicolor/32x32/apps/lyx.xpm
-
- set -e; for i in $(FRONTENDS); do \
- cp build-tree/src/lyx-$$i debian/lyx-$$i/usr/bin/lyx-$$i; \
- cp build-tree/lyx.1 build-tree/lyx-$$i.1; \
- done
chmod +x debian/lyx-common/usr/share/lyx/scripts/*
chmod +x debian/lyx-common/usr/share/lyx/lyx2lyx/lyx2lyx
@@ -151,12 +134,6 @@
dh_installman -a
dh_installmime -a
dh_desktop -a
- set -e; for i in $(FRONTENDS); do \
- mkdir -p debian/lyx-$$i/usr/share/doc; \
- ln -s lyx-common debian/lyx-$$i/usr/share/doc/lyx-$$i; \
- done
- mkdir -p debian/lyx/usr/share/doc
- ln -s lyx-common debian/lyx/usr/share/doc/lyx
dh_link -a
dh_strip -a
dh_compress -a
More information about the Pkg-lyx-devel
mailing list