[Pkg-lyx-devel] [SCM] LyX packaging branch, master, updated. upstream/2.0.0_beta4-522-g4bcb7ad

[Per Olofsson]

The following commit has been merged in the master branch:
commit 4bcb7ad59d2dcf8c777cdc9aa5def6b61466b0ce
Author: Per Olofsson <pelle at dsv.su.se>
Date:   Mon Feb 7 15:57:10 2011 +0100

    Use dh_python2 instead of dh_pysupport.

diff --git a/debian/changelog b/debian/changelog
index 1a4764d..25b39c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+lyx (2.0.0~beta4-2) UNRELEASED; urgency=low
+
+  * Use dh_python2 instead of dh_pysupport.
+
+ -- Per Olofsson <pelle at debian.org>  Mon, 07 Feb 2011 15:55:44 +0100
+
 lyx (2.0.0~beta4-1) unstable; urgency=low
 
   [ Sven Hoexter ]
diff --git a/debian/control b/debian/control
index 83c6267..f5667d4 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 (>= 8),
+Build-Depends: python (>= 2.6.6-3), debhelper (>= 8),
  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 6ecf75e..b48640f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 LDFLAGS += -Wl,-z,defs -Wl,--as-needed
 
 %:
-	dh $@ --with autotools_dev --builddirectory
+	dh $@ --with autotools_dev,python2 --builddirectory
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
@@ -57,8 +57,8 @@ override_dh_installdocs:
 		debian/ttf-lyx/usr/share/doc/ttf-lyx/
 	rm debian/ttf-lyx/usr/share/fonts/truetype/ttf-lyx/BaKoMaFontLicense.txt
 
-override_dh_pysupport:
-	dh_pysupport /usr/share/lyx
+override_dh_python2:
+	dh_python2 /usr/share/lyx
 
 override_dh_install:
 	dh_install

-- 
LyX packaging