On Tue, Mar 10, 2009 at 05:08:52PM +0100, Norbert Preining wrote: > On Di, 10 Mär 2009, Jan Hauke Rahm wrote: > > What about adding more support for dh7 then? I *think* I can provide a > > patch to make dh_installtex to be inserted in dh main commands via > > 'dh --with=tex', you know what I mean? It's not a big deal (if I don't > > Not that I ever checked out dh7, I don't like the mystery behind it, but > if you can send me a patch I will take a look at it. It's not exactly a mystery but just a one-for-all command. 'dh install' just runs every necessary dh_* for the install target. Check out what dh would do by executing 'dh install --no-act'. You'll see, it's just dh_* calls, without mystery. :) Anyways, I attached a diff which is as short as possible. And I tested it with one of my packages. For biblatex-dw I can now use ,---- | install: build | dh $@ --with tex `---- instead of ,---- | install: build | dh $@ --before dh_compress | dh_installtex | dh $@ --remaining `---- You see the win? :) Okay, it is a small one but it makes tex-common fit better in current debhelper development. > But that can go in anyway anytime, now we can release again more often. Anytime you want. It's just a suggestion! Hauke
Index: debian/control
===================================================================
--- debian/control (revision 3778)
+++ debian/control (working copy)
@@ -12,7 +12,7 @@
Package: tex-common
Architecture: all
Depends: ${misc:Depends}, ucf, debconf (>= 1.4.69) | cdebconf (>= 0.39), dpkg (>= 1.14.18)
-Suggests: debhelper (>= 5.0)
+Suggests: debhelper (>= 7.0.8)
Replaces: tetex-base (<= 3.0-10)
Conflicts: tetex-base (<< 2007)
Description: common infrastructure for building and installing TeX
Index: debian/changelog
===================================================================
--- debian/changelog (revision 3778)
+++ debian/changelog (working copy)
@@ -1,13 +1,19 @@
tex-common (1.15) unstable; urgency=low
+ [ Norbert Preining ]
* upload of trigger-enabled tex-common to unstable, packages should be
rebuild
* remove references to teTeX from the man pages (Closes: #486369)
* bump dh compat level to 5, adjust debian/control
* add ${misc:Depends} to dependencies
- -- Norbert Preining <preining@debian.org> Tue, 10 Mar 2009 11:50:47 +0100
+ [ Jan Hauke Rahm ]
+ * make debhelper's '--with' option available for tex-common. dh_installtex
+ can now be integrated in debian/rules via 'dh install --with tex' when
+ using compat 7
+ -- Jan Hauke Rahm <info@jhr-online.de> Tue, 10 Mar 2009 18:16:49 +0100
+
tex-common (1.14) experimental; urgency=low
* fix coding error in dh_installtex's pod documentation [np]
Index: debian/rules
===================================================================
--- debian/rules (revision 3778)
+++ debian/rules (working copy)
@@ -87,6 +87,7 @@
grep -v '^[ \t]*# ' scripts/postinst-tex > $(INSTDIR)/usr/share/debhelper/autoscripts/postinst-tex
grep -v '^[ \t]*# ' scripts/postrm-texlsr > $(INSTDIR)/usr/share/debhelper/autoscripts/postrm-texlsr
grep -v '^[ \t]*# ' scripts/postinst-texlsr > $(INSTDIR)/usr/share/debhelper/autoscripts/postinst-texlsr
+ cp scripts/tex.pm $(INSTDIR)/usr/share/perl5/Debian/Debhelper/Sequence/
# fontcache stuff with proper permissions
install -d $(INSTDIR)/etc/texmf/web2c/
Index: debian/dirs
===================================================================
--- debian/dirs (revision 3778)
+++ debian/dirs (working copy)
@@ -16,3 +16,4 @@
var/lib/tex-common/language-cnf
var/lib/tex-common/fmtutil-cnf
var/cache/fonts
+usr/share/perl5/Debian/Debhelper/Sequence
Index: scripts/tex.pm
===================================================================
--- scripts/tex.pm (revision 0)
+++ scripts/tex.pm (revision 0)
@@ -0,0 +1,10 @@
+#!/usr/bin/perl
+# debhelper sequence file for tex-common script
+
+use warnings;
+use strict;
+use Debian::Debhelper::Dh_Lib;
+
+insert_after("dh_link", "dh_installtex");
+
+1;
Attachment:
signature.asc
Description: Digital signature