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

[Per Olofsson]

The following commit has been merged in the master branch:
commit f6afd8feefeeff6f4a053fae72df50d8a94c1868
Author: Per Olofsson <pelle at dsv.su.se>
Date:   Thu Feb 3 11:33:34 2011 +0100

    Switch source format to 3.0 (quilt) and remove quilt references in rules and control.

diff --git a/debian/changelog b/debian/changelog
index 82dc180..816ec31 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ lyx (2.0.0~beta3-2) UNRELEASED; urgency=low
   * 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 --git a/debian/control b/debian/control
index cd6ef44..e7f3f44 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Standards-Version: 3.9.1
 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,
diff --git a/debian/rules b/debian/rules
index b65b15a..5fd6092 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,7 +28,7 @@ CONFIGURE_OPTIONS += \
 LDFLAGS += -Wl,-z,defs -Wl,--as-needed
 
 %:
-	dh --with quilt $@
+	dh $@
 
 override_dh_auto_configure:
 	set -e; if ! [ -f config/config.sub.backup ]; then \
diff --git a/debian/source/format b/debian/source/format
index d3827e7..163aaf8 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-1.0
+3.0 (quilt)

-- 
LyX packaging