tag 384309 patch usertag 384309 supplied-patch usertag 383266 supplied-patch usertag 340253 supplied-patch thanks
Hi, I have prepared an NMU which fixes RC bug 384309 and also included Frank's patch for RC bugs 383266 and 340253. As I am not a DD yet I can not upload this NMU myself so any interested DD is welcome to upload it of course. As this patch has to do with the handling of configuration files and conffiles and it is the first time I have worked with those I urge any uploader to really look at the patch before uploading. :) I have tried upgrading, downgrading, removal and purge and it behaves correctly. Greetings Arjan
--- dvipsk-ja-5.95a+jp1.7a/debian/rules
+++ dvipsk-ja-5.95a+jp1.7a/debian/rules
@@ -109,6 +109,9 @@
install -m 644 $(CURDIR)/dvipsk/contrib/volker/duplong.cfg $(CURDIR)/debian/dvipsk-ja/etc/texmf/dvipsj/config.duplong
install -m 644 $(CURDIR)/dvipsk/contrib/volker/dupshort.cfg $(CURDIR)/debian/dvipsk-ja/etc/texmf/dvipsj/config.dupshort
+ # Install 70dvpsj.cnf conffile
+ install -D -m 644 $(CURDIR)/debian/70dvipsj.cnf $(CURDIR)/debian/dvipsk-ja/etc/texmf/texmf.d/70dvipsj.cnf
+
# Build architecture-independent files here.
binary-indep: build install
# We have nothing to do by default.
--- dvipsk-ja-5.95a+jp1.7a/debian/changelog
+++ dvipsk-ja-5.95a+jp1.7a/debian/changelog
@@ -1,3 +1,17 @@
+dvipsk-ja (5.95a+jp1.7a-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Make /etc/texmf/texmf.d/70dvipsj.cnf a regular conffile (Closes:
+ #384309):
+ - debian/rules: install /etc/texmf/texmf.d/70dvipsj.cnf
+ - debian/postinst: don't create 70dvipsj.cnf anymore.
+ - debian/postrm: don't move 70dvipsj.cnf to a backup file anymore.o
+ - debian/preinst: remove old 70dvipsj.cnf{.bak} configuration files.
+ * Fix 70dvipsj.cnf by applying patch from Frank KÃŒster. (Closes:
+ #340253, #383266)
+
+ -- Arjan Oosting <[EMAIL PROTECTED]> Thu, 7 Sep 2006 01:32:09 +0200
+
dvipsk-ja (5.95a+jp1.7a-1) unstable; urgency=low
* New upstream release.
--- dvipsk-ja-5.95a+jp1.7a/debian/postinst
+++ dvipsk-ja-5.95a+jp1.7a/debian/postinst
@@ -26,16 +26,6 @@
case "$1" in
configure)
- if [ ! -f /etc/texmf/texmf.d/70dvipsj.cnf ] ; then
- cat > /etc/texmf/texmf.d/70dvipsj.cnf <<'EOF'
-%
-% Japanized DviPS
-%
-TEXPSHEADERS.dvips = .;$TEXMF/{dvipsj,dvips,pdftex,tex,fonts/type1}//
-TEXCONFIG.dvips = .;$TEXMF/{dvipsj,dvips}//
-EOF
- fi
-
update-texmf
mktexlsr
--- dvipsk-ja-5.95a+jp1.7a/debian/postrm
+++ dvipsk-ja-5.95a+jp1.7a/debian/postrm
@@ -36,8 +36,6 @@
remove)
- mv -f /etc/texmf/texmf.d/70dvipsj.cnf /etc/texmf/texmf.d/70dvipsj.bak
-
dpkg-divert --package dvipsk-ja --remove --rename --divert \
/usr/bin/dvips.nonja /usr/bin/dvips
dpkg-divert --package dvipsk-ja --remove --rename --divert \
--- dvipsk-ja-5.95a+jp1.7a/debian/preinst
+++ dvipsk-ja-5.95a+jp1.7a/debian/preinst
@@ -28,11 +28,21 @@
rm -f /etc/texmf/texmf.d/70dvipsj
rm -f /etc/texmf/texmf.d/70DviPSJ
- if [ ! -f /etc/texmf/texmf.d/70dvipsj ] ; then
- if [ -f /etc/texmf/texmf.d/70dvipsj.bak ] ; then
- mv -f /etc/texmf/texmf.d/70dvipsj.bak /etc/texmf/texmf.d/70dvipsj.cnf
- fi
- fi
+ # Remove old configuration files.
+ # As those files are broken anyway (#383266) and we now provide
+ # a CHANGED version as conffile we can remove these files.
+ if [ -f /etc/texmf/texmf.d/70dvipsj.cnf ] ; then
+ MD5SUM=`md5sum /etc/texmf/texmf.d/70dvipsj.cnf | cut -f1 -d' '`
+ if [ "$MD5SUM" = "687e0d9d530ac17150a328e00ac97489" ] ; then
+ rm /etc/texmf/texmf.d/70dvipsj.cnf
+ fi
+ fi
+ if [ -f /etc/texmf/texmf.d/70dvipsj.cnf.bak ] ; then
+ MD5SUM=`md5sum /etc/texmf/texmf.d/70dvipsj.cnf.bak | cut -f1 -d' '`
+ if [ "$MD5SUM" = "687e0d9d530ac17150a328e00ac97489" ] ; then
+ rm /etc/texmf/texmf.d/70dvipsj.cnf.bak
+ fi
+ fi
dpkg-divert --package dvipsk-ja --add --rename --divert \
/usr/bin/dvips.nonja /usr/bin/dvips
--- dvipsk-ja-5.95a+jp1.7a.orig/debian/70dvipsj.cnf
+++ dvipsk-ja-5.95a+jp1.7a/debian/70dvipsj.cnf
@@ -0,0 +1,5 @@
+%
+% Japanized DviPS
+%
+TEXPSHEADERS.dvips = .;$TEXMF/{dvipsj,dvips,pdftex,tex,fonts/{enc,type1,type3}}//
+TEXCONFIG.dvips = .;$TEXMF/{dvipsj,dvips}//
signature.asc
Description: Dit berichtdeel is digitaal ondertekend
