[Debian-tex-commits] SVN lmodern commit + diffs: r5012 - lmodern/trunk/debian

[Hilmar Preuße]

Author: hilmar-guest
Date: 2012-02-12 21:43:13 +0000 (Sun, 12 Feb 2012)
New Revision: 5012

Added:
   lmodern/trunk/debian/lmodern.maintscript
Removed:
   lmodern/trunk/debian/lmodern.postinst
Modified:
   lmodern/trunk/debian/changelog
   lmodern/trunk/debian/control
   lmodern/trunk/debian/lmodern.postrm
   lmodern/trunk/debian/lmodern.preinst
Log:
use dh_installdeb maintscript support

Modified: lmodern/trunk/debian/changelog
===================================================================
--- lmodern/trunk/debian/changelog	2012-02-07 13:04:57 UTC (rev 5011)
+++ lmodern/trunk/debian/changelog	2012-02-12 21:43:13 UTC (rev 5012)
@@ -1,3 +1,11 @@
+lmodern (2.004.1-4~UNRELEASED) unstable; urgency=low
+
+  * Use maintscript support in dh_installdeb rather than writing out
+    dpkg-maintscript-helper commands by hand. Thanks to Colin Watson
+    (Closes: #659608)
+
+ -- Hilmar Preuße <hille42 at web.de>  Sun, 12 Feb 2012 22:29:05 +0100
+
 lmodern (2.004.1-3.1) unstable; urgency=low
 
   * Non-maintainer upload

Modified: lmodern/trunk/debian/control
===================================================================
--- lmodern/trunk/debian/control	2012-02-07 13:04:57 UTC (rev 5011)
+++ lmodern/trunk/debian/control	2012-02-12 21:43:13 UTC (rev 5012)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian TeX maintainers <debian-tex-maint at lists.debian.org>
 Uploaders: Julian Gilbey <jdg at debian.org>, C.M. Connelly <cmc at debian.org>, Atsuhito KOHDA <kohda at debian.org>, Frank Küster <frank at debian.org>, Florent Rougon <frn at debian.org>, Norbert Preining <preining at debian.org>
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 8.1.0)
 Build-Depends-Indep: tex-common (>= 1.18)
 Standards-Version: 3.8.3
 Vcs-Svn: svn://svn.debian.org/svn/debian-tex/lmodern/trunk
@@ -13,6 +13,7 @@
 Package: lmodern
 Section: fonts
 Architecture: all
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}
 Conflicts: lm, lmodern-x11, context (<= 2008.10.31-1)
 Replaces: lm, lmodern-x11

Added: lmodern/trunk/debian/lmodern.maintscript
===================================================================
--- lmodern/trunk/debian/lmodern.maintscript	                        (rev 0)
+++ lmodern/trunk/debian/lmodern.maintscript	2012-02-12 21:43:13 UTC (rev 5012)
@@ -0,0 +1 @@
+rm_conffile /etc/defoma/hints/lmodern.hints 2.004.1-3.1

Deleted: lmodern/trunk/debian/lmodern.postinst
===================================================================
--- lmodern/trunk/debian/lmodern.postinst	2012-02-07 13:04:57 UTC (rev 5011)
+++ lmodern/trunk/debian/lmodern.postinst	2012-02-12 21:43:13 UTC (rev 5012)
@@ -1,11 +0,0 @@
-#! /bin/sh -e
-
-
-if dpkg-maintscript-helper supports rm_conffile 2>/dev/null; then
-  dpkg-maintscript-helper rm_conffile /etc/defoma/hints/lmodern.hints 2.004.1-3.1 -- "$@"
-fi
-
-
-#DEBHELPER#
-
-exit 0

Modified: lmodern/trunk/debian/lmodern.postrm
===================================================================
--- lmodern/trunk/debian/lmodern.postrm	2012-02-07 13:04:57 UTC (rev 5011)
+++ lmodern/trunk/debian/lmodern.postrm	2012-02-12 21:43:13 UTC (rev 5012)
@@ -55,11 +55,6 @@
         ;;
 esac
 
-if dpkg-maintscript-helper supports rm_conffile 2>/dev/null; then
-  dpkg-maintscript-helper rm_conffile /etc/defoma/hints/lmodern.hints 2.004.1-3.1 -- "$@"
-fi
-
-
 #DEBHELPER#
 
 exit 0

Modified: lmodern/trunk/debian/lmodern.preinst
===================================================================
--- lmodern/trunk/debian/lmodern.preinst	2012-02-07 13:04:57 UTC (rev 5011)
+++ lmodern/trunk/debian/lmodern.preinst	2012-02-12 21:43:13 UTC (rev 5012)
@@ -247,12 +247,6 @@
 	fi
 fi
 
-
-if dpkg-maintscript-helper supports rm_conffile 2>/dev/null; then
-  dpkg-maintscript-helper rm_conffile /etc/defoma/hints/lmodern.hints 2.004.1-3.1 -- "$@"
-fi
-
-
 #DEBHELPER#
 
 exit 0