[Pkg-lyx-devel] [SCM] LyX packaging branch, master, updated. upstream/2.0.0_beta3-493-g3c7d24d

[Sven Hoexter]

The following commit has been merged in the master branch:
commit 3c7d24d8776adbd727e4d216c8833f4b3044d328
Author: Sven Hoexter <sven at timegate.de>
Date:   Thu Feb 3 10:24:36 2011 +0100

    Add debian/patches/hyphen-as-minus.

diff --git a/debian/changelog b/debian/changelog
index ba4280c..2105a30 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ lyx (2.0.0~beta3-2) UNRELEASED; urgency=low
     --without-pspell since it's no longer supported.
   * Remove debian/patches/fix-manpage-errors, applied upstream.
     Thanks Georg.
+  * Add debian/patches/hyphen-as-minus.
 
  -- Sven Hoexter <hoexter at debian.org>  Wed, 02 Feb 2011 22:54:55 +0100
 
diff --git a/debian/patches/hyphen-as-minus b/debian/patches/hyphen-as-minus
new file mode 100644
index 0000000..44a952a
--- /dev/null
+++ b/debian/patches/hyphen-as-minus
@@ -0,0 +1,26 @@
+http://www.lyx.org/trac/ticket/7278
+--- a/lyx.1in
++++ b/lyx.1in
+@@ -69,7 +69,7 @@ where command is a lyx command.
+ \fB \-e [\-\-export]\fP \fIfmt
+ where fmt is the export format of choice.
+ Look on Tools->Preferences->File formats->Format to get an idea which parameters should be passed.
+-Note that the order of -e and -x switches matters.
++Note that the order of \-e and \-x switches matters.
+ .TP
+ \fB \-i [\-\-import]\fP \fIfmt file.xxx
+ where fmt is the import format of choice and file.xxx is the file to be imported.
+@@ -92,11 +92,11 @@ by using the lyxpipe, ask an already run
+ documents passed as arguments and then exit. If the lyxpipe is not set up or
+ is not working, a new instance is created and execution continues normally.
+ .TP
+-.BI -batch
++.BI \-batch
+ causes LyX to run the given commands without opening a GUI window.
+ Thus, something like:
+ .br
+-    lyx -batch -x "buffer-print printer default dvips" myfile.lyx
++    lyx \-batch \-x "buffer-print printer default dvips" myfile.lyx
+ .br
+ will cause LyX to print myfile.lyx to the default printer, using dvips and
+ the default print settings (which, of course, have to have been configured
diff --git a/debian/patches/series b/debian/patches/series
index 3e16998..df3c1c4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+hyphen-as-minus
 prefer-xdg-open

-- 
LyX packaging