[jadetex] 01/01: adjust for TL2015/tex-common 6
This is an automated email from the git hooks/post-receive script.
preining pushed a commit to branch master
in repository jadetex.
commit b578a805fb992965e642a0035563d88b0541712f
Author: Norbert Preining <preining@debian.org>
Date: Fri Jun 12 15:55:50 2015 +0900
adjust for TL2015/tex-common 6
---
debian/README.source | 8 ----
debian/changelog | 8 ++++
debian/control | 4 +-
debian/jadetex.maintscript | 1 +
debian/postinst | 102 ---------------------------------------------
debian/postrm | 80 -----------------------------------
debian/preinst | 94 -----------------------------------------
debian/rules | 4 +-
8 files changed, 12 insertions(+), 289 deletions(-)
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index a3151f7..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,8 +0,0 @@
-
-README.source
-
-The source package uses quilt for the modifications of the upstream source.
-If you want to change something it is best to use the quilt approach as
-documented in
- /usr/share/doc/quilt/README.source
-
diff --git a/debian/changelog b/debian/changelog
index 1c519d4..b871de5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+jadetex (3.13-15) experimental; urgency=medium
+
+ * remove old cruft from maintainer files
+ * update for tex-common >=6 / TL 2015
+ * bump standards version, no changes necessary
+
+ -- Norbert Preining <preining@debian.org> Fri, 12 Jun 2015 15:57:43 +0900
+
jadetex (3.13-14) unstable; urgency=low
* add missing dependency on texlive-generic-recommended (Closes: #665458)
diff --git a/debian/control b/debian/control
index 9b4fee4..92e89d2 100644
--- a/debian/control
+++ b/debian/control
@@ -3,9 +3,9 @@ Section: tex
Priority: optional
Maintainer: Debian TeX Task Force <debian-tex-maint@lists.debian.org>
Uploaders: OHURA Makoto <ohura@debian.org>, Norbert Preining <preining@debian.org>, Frank Küster <frank@debian.org>
-Standards-Version: 3.9.3
+Standards-Version: 3.9.6
Build-Depends: debhelper (>= 7.0.50~)
-Build-Depends-Indep: texlive-latex-recommended, texlive-fonts-recommended, texlive-latex-base, texlive-generic-recommended, texlive-binaries, openjade, docbook-xml (>= 4.2), docbook-dsssl, tex-common (>= 2.0)
+Build-Depends-Indep: texlive-latex-recommended, texlive-fonts-recommended, texlive-latex-base, texlive-generic-recommended, texlive-binaries, openjade, docbook-xml (>= 4.2), docbook-dsssl, tex-common (>= 6)
Vcs-Svn: svn://svn.debian.org/svn/debian-tex/jadetex/trunk
Vcs-Browser: http://svn.debian.org/wsvn/debian-tex/jadetex/trunk/
Homepage: http://jadetex.sourceforge.net/
diff --git a/debian/jadetex.maintscript b/debian/jadetex.maintscript
new file mode 100644
index 0000000..4854057
--- /dev/null
+++ b/debian/jadetex.maintscript
@@ -0,0 +1 @@
+rm_conffile /etc/texmf/fmt.d/40jadetex.cnf 3.13-15
diff --git a/debian/postinst b/debian/postinst
deleted file mode 100644
index c223aca..0000000
--- a/debian/postinst
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/bin/bash
-# jadetex postinst
-# jobs: remove old cruft we used to make
-
-set -e
-
-# clear environment
-TETEXDIR=
-TEXMF=
-TEXINPUTS=
-
-PACKAGE=jadetex
-
-umask 022
-
-# emit a warning, generic routine
-warn ( ) {
- echo $* 1>&2
- if [ -f $MYTMPFILE ]; then
- echo $* >> $MYTMPFILE
- fi
-}
-
-dpkg_md5sum(){
- dpkg-query -W -f='${Conffiles}' "$PACKAGE" \
- | grep -F " $1 " | cut -d ' ' -f 3
-}
-
-config_rename ()
-{
- oldfile=$1
- oldmd5sum=$(dpkg_md5sum $oldfile)
-
- if ! [ -r $oldfile ] ; then
- return 0
- fi
- oldloc=$(dirname $oldfile)
- newmd5sum=$(md5sum $oldfile | cut -d ' ' -f 1)
- if [ "$newmd5sum" = "$oldmd5sum" ] ; then
- echo "Removing obsolete, unchanged conffile $oldfile"
- rm $oldfile
- else
- echo "Conffile $oldfile was changed, renaming it to $oldfile.dpkg-save"
- echo "Please see the TeX Policy on where to put the file."
- mv $oldfile $oldfile.dpkg-save
- fi
- test -d $oldloc && rmdir --ignore-fail-on-non-empty $oldloc || true
-}
-
-remove_conffile_commit () {
- # syntax: remove_conffile_commit filename
- #
- # Complete the removal of a conffile "filename" that has become obsolete.
- #
- # Call this function from a postinst script after having used
- # remove_conffile_prepare() in the preinst.
-
- # validate arguments
- if [ $# -ne 1 ]; then
- echo "remove_conffile_commit() called with wrong number of" \
- "arguments; expected 1, got $#"
- exit 2
- fi
-
- conffile="$1"
-
- # if the temporary file created by remove_conffile_prepare() exists, remove it
- if [ -e "$conffile.${PACKAGE}-tmp" ]; then
- echo "committing removal of obsolete conffile $conffile"
- rm "$conffile.${PACKAGE}-tmp"
- fi
-}
-
-if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ]; then
- # old crufty stuff we used to build in postinst - I wonder whether we
- # should actually do this in preinst?
- remove_conffile_commit /etc/texmf/fmt.d/40jadetex.cnf
-
- if [ -L /usr/lib/texmf/tex/jadetex/config ]; then
- warn "removing old JadeTeX config symlink"
- rm /usr/lib/texmf/tex/jadetex/config
- fi
- if [ -d /usr/lib/texmf/tex/jadetex ]; then
- rmdir /usr/lib/texmf/tex/jadetex || \
- warn "unused, obsolete dir /usr/lib/texmf/tex/jadetex, remove it yourself if you care"
- fi
- if [ -f /etc/texmf/texmf.d/96JadeTeX ]; then
- warn "removing old texmf.d config snippet"
- rm /etc/texmf/texmf.d/96JadeTeX
- fi
- # rename the files in /etc/texmf/jadetex/ or remove them.
- config_rename /etc/texmf/jadetex/jadetex.ini
- config_rename /etc/texmf/jadetex/pdfjadetex.ini
-fi
-
-# call update-texmf with all postinst arguments
-update-texmf
-
-#DEBHELPER#
-
-exit 0
-
diff --git a/debian/postrm b/debian/postrm
deleted file mode 100644
index 28901a2..0000000
--- a/debian/postrm
+++ /dev/null
@@ -1,80 +0,0 @@
-#! /bin/sh
-# postrm script for jadetex
-#
-# 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 http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-PACKAGE=jadatex
-ETC_CONFIG=/etc/texmf/jadetex
-FMTDIR=/etc/texmf/fmt.d
-
-remove_conffile_rollback () {
- # syntax: remove_conffile_rollback filename
- #
- # Roll back the removal of a conffile "filename".
- #
- # Call this function from a postrm script in the event $1 is "abort-upgrade"
- # or "abort-install" is after having used remove_conffile_prepare() in the
- # preinst.
-
- # validate arguments
- if [ $# -ne 1 ]; then
- echo "remove_conffile_rollback() called with wrong number of" \
- "arguments; expected 1, got $#"
- exit 2
- fi
-
- conffile="$1"
-
- # if the temporary file created by remove_conffile_prepare() exists, move it
- # back
- if [ -e "$conffile.${PACKAGE}-tmp" ]; then
- echo "rolling back removal of obsolete conffile $conffile"
- mv "$conffile.${PACKAGE}-tmp" "$conffile"
- fi
-}
-
-case "$1" in
- purge)
- rm -rf $ETC_CONFIG || true
- rm -f ${FMTDIR}/*jadetex.cnf*
- rm -f /etc/texmf/texmf.d/*JadeTeX*
- if [ -x "`which update-texmf 2>/dev/null`" ]; then
- update-texmf
- fi
-
- ;;
-
- abort-install|abort-upgrade)
- remove_conffile_rollback /etc/texmf/fmt.d/40jadetex.cnf
- ;;
-
- remove|upgrade|failed-upgrade|disappear)
-
- ;;
-
- *)
- echo "postrm called with unknown argument \`$1'" >&2
- exit 1
-
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/preinst b/debian/preinst
deleted file mode 100644
index 141b1dd..0000000
--- a/debian/preinst
+++ /dev/null
@@ -1,94 +0,0 @@
-#! /bin/sh
-# preinst script for jadetex
-#
-# see: dh_installdeb(1)
-
-set -e
-
-PACKAGE=jadetex
-
-# summary of how this script can be called:
-# * <new-preinst> `install'
-# * <new-preinst> `install' <old-version>
-# * <new-preinst> `upgrade' <old-version>
-# * <old-preinst> `abort-upgrade' <new-version>
-#
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-remove_conffile_prepare () {
- # syntax: remove_conffile_prepare filename official_md5sum ...
- #
- # Check a conffile "filename" against a list of canonical MD5 checksums.
- # If the file's current MD5 checksum matches one of the "official_md5sum"
- # operands provided, then prepare the conffile for removal from the system.
- # We defer actual deletion until the package is configured so that we can
- # roll this operation back if package installation fails.
- #
- # Call this function from a preinst script in the event $1 is "upgrade" or
- # "install" and verify $2 to ensure the package is being upgraded from a
- # version (or installed over a version removed-but-not-purged) prior to the
- # one in which the conffile was obsoleted.
-
- # validate arguments
- if [ $# -lt 2 ]; then
- echo "remove_conffile_prepare() called with wrong number of" \
- "arguments; expected at least 2, got $#"
- exit 2
- fi
-
- conffile="$1"
- shift
-
- # does the conffile even exist?
- if [ -e "$conffile" ]; then
- # calculate its checksum
- current_checksum=$(md5sum < "$conffile" | sed 's/[[:space:]].*//')
- # compare it to each supplied checksum
- while [ -n "$1" ]; do
- if [ "$current_checksum" = "$1" ]; then
- # we found a match; move the confffile and stop looking
- echo "preparing obsolete conffile $conffile for removal"
- mv "$conffile" "$conffile.${PACKAGE}-tmp"
- break
- fi
- shift
- done
- fi
-}
-
-
-case "$1" in
- install|upgrade)
- if dpkg --compare-versions "$2" le "3.13-3"; then
- remove_conffile_prepare /etc/texmf/fmt.d/40jadetex.cnf \
- 0812091d71375023df7dcecb7290b10a
- fi
- if [ -L /usr/share/texmf/tex/jadetex/config ] ; then
- if [ "$(readlink -n -s /usr/share/texmf/tex/jadetex/config)" = "/etc/texmf/jadetex" ] ; then
- echo "Removing /usr/share/texmf/tex/jadetex/config symlink."
- rm /usr/share/texmf/tex/jadetex/config
- fi
- fi
- ;;
-
- abort-upgrade)
- if ! [ -e /usr/share/texmf/tex/jadetex/config ] ; then
- ln -s /etc/texmf/jadetex /usr/share/texmf/tex/jadetex/config
- fi
- ;;
-
- *)
- echo "preinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-
diff --git a/debian/rules b/debian/rules
index 0ad5e61..9476516 100755
--- a/debian/rules
+++ b/debian/rules
@@ -46,8 +46,6 @@ binary: binary-indep binary-arch
.PHONY: test
test:
$(checkdir)
- sh -n debian/postinst
- sh -n debian/postrm
binary-indep: build test
$(checkdir)
@@ -62,7 +60,7 @@ binary-indep: build test
$(install_file) debian/texmf.cnf $(texmfdir)/96JadeTeX.cnf
# the fmtutil snippet is managed in the postinst
- dh_installtex --priority=40 \
+ dh_installtex \
"format=jadetex,pdftex,language.dat *jadetex.ini" \
"format=pdfjadetex,pdftex,language.dat *pdfjadetex.ini"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-tex/jadetex.git
Reply to: