[Pkg-lyx-devel] [SCM] LyX packaging branch, master, updated. debian/2.0.1-1-9-gae64717

[Per Olofsson]

The following commit has been merged in the master branch:
commit ae64717ef3abdbf856ba6b1bf5568b65b2935f9f
Author: Per Olofsson <pelle at dsv.su.se>
Date:   Tue Feb 14 17:19:11 2012 +0100

    Use maintscript support in dh_installdeb rather than writing out dpkg-maintscript-helper commands by hand.  We now simply Pre-Depend on a new enough version of dpkg rather than using 'dpkg-maintscript-helper supports' guards, leading to more predictable behaviour on upgrades. Thanks to Colin Watson. Closes: #659721.

diff --git a/debian/changelog b/debian/changelog
index 905db54..52de2cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+lyx (2.0.2-2) UNRELEASED; urgency=low
+
+  * Use maintscript support in dh_installdeb rather than writing out
+    dpkg-maintscript-helper commands by hand.  We now simply Pre-Depend on
+    a new enough version of dpkg rather than using
+    'dpkg-maintscript-helper supports' guards, leading to more predictable
+    behaviour on upgrades. Thanks to Colin Watson. Closes: #659721.
+
+ -- Per Olofsson <pelle at debian.org>  Tue, 14 Feb 2012 17:18:00 +0100
+
 lyx (2.0.2-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index cc2eb44..2d708ed 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Standards-Version: 3.9.2
 Vcs-Git: git://anonscm.debian.org/pkg-lyx/lyx.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-lyx/lyx.git
 Homepage: http://www.lyx.org/
-Build-Depends: python (>= 2.6.6-3), debhelper (>= 8),
+Build-Depends: python (>= 2.6.6-3), debhelper (>= 8.1.0~),
  libz-dev, libx11-dev, libenchant-dev, libmythes-dev,
  autotools-dev, libqt4-dev, libboost-dev,
  libboost-filesystem-dev, libboost-signals-dev,
@@ -54,6 +54,7 @@ Description: architecture-independent files for LyX
 Package: ttf-lyx
 Architecture: all
 Section: fonts
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}
 Description: TrueType versions of some TeX fonts
  These fonts are needed for the visual math symbol display in
diff --git a/debian/ttf-lyx.maintscript b/debian/ttf-lyx.maintscript
new file mode 100644
index 0000000..ee2bcb6
--- /dev/null
+++ b/debian/ttf-lyx.maintscript
@@ -0,0 +1 @@
+rm_conffile /etc/defoma/hints/ttf-lyx.hints 2.0.0~rc1-1
diff --git a/debian/ttf-lyx.postinst b/debian/ttf-lyx.postinst
deleted file mode 100644
index f891a38..0000000
--- a/debian/ttf-lyx.postinst
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-set -e 
-
-CFILE='/etc/defoma/hints/ttf-lyx.hints'
-dpkg-maintscript-helper rm_conffile $CFILE 2.0.0~rc1-1 -- "$@"
-
-#DEBHELPER#
diff --git a/debian/ttf-lyx.postrm b/debian/ttf-lyx.postrm
deleted file mode 100644
index 5ef3c69..0000000
--- a/debian/ttf-lyx.postrm
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-set -e 
-
-CFILE='/etc/defoma/hints/ttf-lyx.hints'
-dpkg-maintscript-helper rm_conffile $CFILE 2.0.0~beta4-1 -- "$@"
-
-#DEBHELPER#
diff --git a/debian/ttf-lyx.preinst b/debian/ttf-lyx.preinst
deleted file mode 100644
index 0e97364..0000000
--- a/debian/ttf-lyx.preinst
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-set -e 
-
-CFILE='/etc/defoma/hints/ttf-lyx.hints'
-if dpkg-maintscript-helper supports rm_conffile; then
-    dpkg-maintscript-helper rm_conffile $CFILE 2.0.0~beta4-1 -- "$@"
-fi
-
-#DEBHELPER#

-- 
LyX packaging