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

[Sven Hoexter]

The following commit has been merged in the master branch:
commit c5df014f45e6be3f02a3840abc47414ba0859430
Merge: 642117494e5334944a0d8888623b578eb89c0a37 f6afd8feefeeff6f4a053fae72df50d8a94c1868
Author: Sven Hoexter <sven at timegate.de>
Date:   Thu Feb 3 11:47:55 2011 +0100

    Merge branch 'master' of ssh://git.debian.org/git/pkg-lyx/lyx

diff --combined debian/changelog
index 8e6f16d,816ec31..08a8a8c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -11,12 -11,13 +11,14 @@@ lyx (2.0.0~beta3-2) UNRELEASED; urgency
    * Remove debian/patches/fix-manpage-errors, applied upstream.
      Thanks Georg.
    * Add debian/patches/hyphen-as-minus.
 +  * Remove the latex-xft-fonts dummy package.
  
    [ Per Olofsson ]
    * Add debian/source/local-options with option unapply-patches.
    * Remove dependency on mime-support. xdg-utils picks whatever
      mechanism is available.
+   * Switch source format to 3.0 (quilt) and remove quilt references in
+     rules and control.
  
   -- Sven Hoexter <hoexter at debian.org>  Wed, 02 Feb 2011 22:54:55 +0100
  
diff --combined debian/control
index 28646b9,e7f3f44..e5466c6
--- a/debian/control
+++ b/debian/control
@@@ -7,7 -7,7 +7,7 @@@ Standards-Version: 3.9.
  Vcs-Git: git://git.debian.org/git/pkg-lyx/lyx.git
  Vcs-Browser: http://git.debian.org/?p=pkg-lyx/lyx.git
  Homepage: http://www.lyx.org/
- Build-Depends: python-support, debhelper (>= 7.0.50), quilt (>= 0.46-7~),
+ Build-Depends: python-support, debhelper (>= 7.0.50),
   libz-dev, libx11-dev, libenchant-dev,
   autotools-dev, libqt4-dev, libboost-dev,
   libboost-filesystem-dev, libboost-signals-dev,
@@@ -69,3 -69,11 +69,3 @@@ Description: TrueType versions of some 
    * msam10  - Extra math symbols, first series
    * msbm10  - Extra math symbols, second series, including Blackboard Bold
    * wasy10  - Waldi symbol fonts
 -
 -Package: latex-xft-fonts
 -Architecture: all
 -Section: fonts
 -Priority: extra
 -Depends: ${misc:Depends}, ttf-lyx
 -Description: TrueType versions of some TeX fonts -- transitional package
 - This package only exists to ease the transition to the ttf-lyx package.

-- 
LyX packaging