[Pkg-lyx-devel] svn commit: r559 - in /lyx/trunk/debian/patches: gcc44.diff prefer-xdg-open

[Per Olofsson]

Hi Sven,

I suggest you add some options to your ~/.quiltrc so that quilt
doesn't add unnecessary lines to diffs. I use the following:

QUILT_REFRESH_ARGS='--no-timestamps --no-index -p ab'
QUILT_DIFF_OPTS='-p'

With these added, only interesting changes are seen in commit messages
etc. when modifiying patches. Timestamps and directory names don't
generate spurious differences. -p simply adds C function names which
might be interesting but is not necessary.


hoaxter-guest at users.alioth.debian.org wrote:
> Author: hoaxter-guest
> Date: Sat Dec  6 21:11:47 2008
> New Revision: 559
> 
> URL: http://svn.debian.org/wsvn/pkg-lyx/?sc=1&rev=559
> Log:
> Add a short description to the patches to shut up the new lintian check.
> 
> Modified:
>     lyx/trunk/debian/patches/gcc44.diff
>     lyx/trunk/debian/patches/prefer-xdg-open
> 
> Modified: lyx/trunk/debian/patches/gcc44.diff
> URL: http://svn.debian.org/wsvn/pkg-lyx/lyx/trunk/debian/patches/gcc44.diff?rev=559&op=diff
> ==============================================================================
> --- lyx/trunk/debian/patches/gcc44.diff (original)
> +++ lyx/trunk/debian/patches/gcc44.diff Sat Dec  6 21:11:47 2008
> @@ -1,5 +1,8 @@
> ---- a/src/client/client.cpp
> -+++ b/src/client/client.cpp
> +Compilation fixes for the upcoming gcc 4.4 release.
> +Index: lyx-1.6.0/src/client/client.cpp
> +===================================================================
> +--- lyx-1.6.0.orig/src/client/client.cpp	2008-09-27 01:58:40.000000000 +0200
> ++++ lyx-1.6.0/src/client/client.cpp	2008-12-06 22:07:42.000000000 +0100
>  @@ -48,6 +48,7 @@
>   #include <fcntl.h>
>   
> @@ -8,8 +11,10 @@
>   #include <cstdlib>
>   #include <string>
>   #include <vector>
> ---- a/src/frontends/qt4/GuiSymbols.cpp
> -+++ b/src/frontends/qt4/GuiSymbols.cpp
> +Index: lyx-1.6.0/src/frontends/qt4/GuiSymbols.cpp
> +===================================================================
> +--- lyx-1.6.0.orig/src/frontends/qt4/GuiSymbols.cpp	2008-05-23 10:43:07.000000000 +0200
> ++++ lyx-1.6.0/src/frontends/qt4/GuiSymbols.cpp	2008-12-06 22:07:42.000000000 +0100
>  @@ -31,6 +31,8 @@
>   #include <QListWidgetItem>
>   #include <QString>
> @@ -19,8 +24,10 @@
>   using namespace std;
>   
>   namespace lyx {
> ---- a/src/support/lstrings.cpp
> -+++ b/src/support/lstrings.cpp
> +Index: lyx-1.6.0/src/support/lstrings.cpp
> +===================================================================
> +--- lyx-1.6.0.orig/src/support/lstrings.cpp	2008-10-09 09:21:48.000000000 +0200
> ++++ lyx-1.6.0/src/support/lstrings.cpp	2008-12-06 22:07:42.000000000 +0100
>  @@ -25,6 +25,7 @@
>   #include <QVector>
>   
> 
> Modified: lyx/trunk/debian/patches/prefer-xdg-open
> URL: http://svn.debian.org/wsvn/pkg-lyx/lyx/trunk/debian/patches/prefer-xdg-open?rev=559&op=diff
> ==============================================================================
> --- lyx/trunk/debian/patches/prefer-xdg-open (original)
> +++ lyx/trunk/debian/patches/prefer-xdg-open Sat Dec  6 21:11:47 2008
> @@ -1,7 +1,8 @@
> +Add xdg-open as the first choice whenever this seems to be usefull.
>  Index: lyx-1.6.0/lib/configure.py
>  ===================================================================
> ---- lyx-1.6.0.orig/lib/configure.py	2008-11-09 15:55:42.000000000 +0100
> -+++ lyx-1.6.0/lib/configure.py	2008-11-09 15:58:18.000000000 +0100
> +--- lyx-1.6.0.orig/lib/configure.py	2008-12-06 22:06:05.000000000 +0100
> ++++ lyx-1.6.0/lib/configure.py	2008-12-06 22:07:42.000000000 +0100
>  @@ -260,7 +260,7 @@
>       checkViewer('a FEN viewer and editor', ['xboard -lpf $$i -mode EditPosition'],
>           rc_entry = [r'\Format fen        fen     FEN                    "" "%%"	"%%"	""'])
> 
> 
> _______________________________________________
> Pkg-lyx-devel mailing list
> Pkg-lyx-devel at lists.alioth.debian.org
> http://lists.alioth.debian.org/mailman/listinfo/pkg-lyx-devel
> 


-- 
Pelle