[Pkg-ocaml-maint-commits] [SCM] advi packaging branch, experimental, updated. debian/1.6.0-13-49-g21c3d04

Ralf Treinen (none) treinen at debian.
Tue Mar 2 12:18:45 UTC 2010


The following commit has been merged in the experimental branch:
commit e7d5752f774bfdd3cff254bd51fc529f95bbcccd
Author: Ralf Treinen <treinen at debian.(none)>
Date:   Tue Mar 2 13:07:26 2010 +0100

    use dh_installtex, simplify build-dependencies

diff --git a/debian/changelog b/debian/changelog
index 0930d0b..af18a91 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,11 @@ advi (1.8-1) experimental; urgency=low
   * Cleaned up Uploaders field in debian/control.
   * Rewrote debian/rules from scratch
   * DH compatibility level 7
-  * Remove build-dependency on ocaml-best-compilers
+  * Build-dependency:
+    - remove ocaml-best-compilers
+    - remove texlive and hevea as we just use the upstream docs
+    - add tex-common 
+  * Remove debian/post{inst,rm}, use dh_installtex instead
   * Do not try to install the documentation file "Announce"
   * rename debian/docs to debian/advi.docs
   * Replaced dependency on gs by ghostscript
diff --git a/debian/control b/debian/control
index b5cdbe1..9b6327d 100644
--- a/debian/control
+++ b/debian/control
@@ -9,10 +9,8 @@ Uploaders: Ralf Treinen <treinen at debian.org>,
  Samuel Mimram <smimram at debian.org>
 Build-Depends:
  debhelper (>= 7.0.50~),
- texlive, texlive-pictures, texlive-pstricks, texlive-latex-extra,
  ocaml, libcamlimages-ocaml-dev, zlib1g-dev,
- ghostscript,
- hevea,
+ ghostscript, tex-common,
  x11proto-core-dev, libx11-dev, libxinerama-dev
 Standards-Version: 3.8.4
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/advi.git
diff --git a/debian/postinst b/debian/postinst
deleted file mode 100644
index d942fba..0000000
--- a/debian/postinst
+++ /dev/null
@@ -1,53 +0,0 @@
-#! /bin/sh
-# postinst script for advi (Copied from hevea)
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postinst> `configure' <most-recently-configured-version>
-#        * <old-postinst> `abort-upgrade' <new version>
-#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#          <new-version>
-#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#          <failed-install-package> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see /usr/share/doc/debian-policy/
-#
-# quoting from the policy:
-#     Any necessary prompting should almost always be confined to the
-#     post-installation script, and should be protected with a conditional
-#     so that unnecessary prompting doesn't happen if a package's
-#     installation fails and the `postinst' is called with `abort-upgrade',
-#     `abort-remove' or `abort-deconfigure'.
-
-TEXCONFIG=/usr/bin/mktexlsr
-
-case "$1" in
-    configure)
-	if [ -e $TEXCONFIG ]
-	then
-	    $TEXCONFIG
-	fi   
-
-    ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-
-    ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 0
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-
diff --git a/debian/postrm b/debian/postrm
deleted file mode 100644
index 3beb700..0000000
--- a/debian/postrm
+++ /dev/null
@@ -1,41 +0,0 @@
-#! /bin/sh
-# postrm script for advi (Copied from hevea)
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postrm> `remove'
-#        * <postrm> `purge'
-#        * <old-postrm> `upgrade' <new-version>
-#        * <new-postrm> `failed-upgrade' <old-version>
-#        * <new-postrm> `abort-install'
-#        * <new-postrm> `abort-install' <old-version>
-#        * <new-postrm> `abort-upgrade' <old-version>
-#        * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
-# for details, see /usr/share/doc/debian-policy/
-
-TEXCONFIG=/usr/bin/mktexlsr
-
-case "$1" in
-       purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-	    if [ -e $TEXCONFIG ]
-	    then
-		$TEXCONFIG
-	    fi  
-
-        ;;
-
-    *)
-        echo "postrm called with unknown argument \`$1'" >&2
-        exit 0
-
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-
diff --git a/debian/rules b/debian/rules
index d2e0524..9013492 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,7 @@ DEB_BUILD_ARCH      ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 OPT    = $(shell test -x /usr/bin/ocamlopt && echo true)
 
 %:
-	dh $@
+	dh $@ --with dh_installtex
 
 override_dh_auto_configure:
 	./configure --host=$(DEB_HOST_GNU_TYPE) \

-- 
advi packaging



More information about the Pkg-ocaml-maint-commits mailing list