[Pkg-jed-commit] r584 - in jed/branches/0.99.19: . patches po

[Rafael Laboissiere]

Author: rafael
Date: 2007-02-26 16:06:06 +0100 (Mon, 26 Feb 2007)
New Revision: 584

Modified:
   jed/branches/0.99.19/changelog
   jed/branches/0.99.19/jed-common.prerm
   jed/branches/0.99.19/patches/50_jed.tex.dpatch
   jed/branches/0.99.19/po/pt_BR.po
   jed/branches/0.99.19/rules
Log:
* Synched with released version 0.99.18.dfsg.1-2
* Updated to SVN revision 60 (no changes needed)



Modified: jed/branches/0.99.19/changelog
===================================================================
--- jed/branches/0.99.19/changelog	2007-02-26 14:54:38 UTC (rev 583)
+++ jed/branches/0.99.19/changelog	2007-02-26 15:06:06 UTC (rev 584)
@@ -1,4 +1,4 @@
-jed (0.99.19.svn.57-1) experimental; urgency=low
+jed (0.99.19.svn.60-1) experimental; urgency=low
 
   NOT YET RELEASED!
 
@@ -21,10 +21,19 @@
     Adapted for the 0.99.19 branch [RL]
 
   * debian/po/es.po: Added translation of debconf templates to Spanish.
-    (synched from 0.99.18-8.etch.1)
+    (synched from 0.99.18-8.etch.1) [RL]
 
  --
 
+jed (0.99.18.dfsg.1-2) experimental; urgency=low
+
+  * Synched with version 0.99.18-8.etch.2, which will be in testing [RL]
+  * debian/po/es.po: Added file [RL]
+
+  * Produce info files from doc/manual/jed.tex using hevea [JS]
+
+ -- Rafael Laboissiere <rafael at debian.org>  Mon, 26 Feb 2007 14:21:30 +0100
+
 jed (0.99.18.dfsg.1-1) experimental; urgency=low
 
   * Exclude the info/ directory from the upstream, since the files there

Modified: jed/branches/0.99.19/jed-common.prerm
===================================================================
--- jed/branches/0.99.19/jed-common.prerm	2007-02-26 14:54:38 UTC (rev 583)
+++ jed/branches/0.99.19/jed-common.prerm	2007-02-26 15:06:06 UTC (rev 584)
@@ -1,18 +1,36 @@
-#!/bin/sh -e
+#!/bin/sh
 
-# jeds info file is broken. debhelper cannot handle it
-# (this used to be the case, I haven't check with woody dh yet)
-install-info --quiet --remove /usr/share/info/jed.info.gz
+set -e
 
-TEMP=$(tempfile)
-printf "Running /usr/share/jed/compile/jed-common..."
-RET=0
-/usr/share/jed/compile/jed-common remove >$TEMP 2>&1 || RET=$?
-if test "$RET" -ne 0 ; then
-	echo "failed (see $TEMP)"
-	exit $RET
-fi
-echo "done"
-rm -f $TEMP
+case "$1" in
+    remove|upgrade|deconfigure)
 
+        # jeds info file is broken. debhelper cannot handle it
+        # (this used to be the case, I haven't check with woody dh yet)
+        install-info --quiet --remove /usr/share/info/jed.info.gz
+
+        TEMP=$(tempfile)
+        printf "Running /usr/share/jed/compile/jed-common..."
+        RET=0
+        /usr/share/jed/compile/jed-common remove >$TEMP 2>&1 || RET=$?
+        if test "$RET" -ne 0 ; then
+            echo "failed (see $TEMP)"
+            exit $RET
+        fi
+        echo "done"
+        rm -f $TEMP
+
+    ;;
+
+    failed-upgrade)
+    ;;
+
+    *)
+        echo "prerm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
 #DEBHELPER#
+
+exit 0

Modified: jed/branches/0.99.19/patches/50_jed.tex.dpatch
===================================================================
--- jed/branches/0.99.19/patches/50_jed.tex.dpatch	2007-02-26 14:54:38 UTC (rev 583)
+++ jed/branches/0.99.19/patches/50_jed.tex.dpatch	2007-02-26 15:06:06 UTC (rev 584)
@@ -2,7 +2,7 @@
 ## jed.tex.dpatch by Jörg Sommer <joerg at alea.gnuu.de>
 ##
 ## DP: hevea complains that it does not know the commands \parindent and
-## DP: \parskip. Because this is a ugly plain tex file we comment them out.
+## DP: \parskip. We remove them by their LaTeX commands.
 
 @DPATCH@
 diff -urNad jed-0.99.17.135~/doc/manual/jed.tex jed-0.99.17.135/doc/manual/jed.tex
@@ -14,8 +14,8 @@
  \setlength{\textheight}{210mm}
 -\parindent=0mm
 -\parskip=5mm
-+% \parindent=0mm
-+% \parskip=5mm
++\setlength{\parindent}{0mm}
++\setlength{\parskip}{5mm}
  
  \def\mytitle{The JED Editor}
  

Modified: jed/branches/0.99.19/po/pt_BR.po
===================================================================
--- jed/branches/0.99.19/po/pt_BR.po	2007-02-26 14:54:38 UTC (rev 583)
+++ jed/branches/0.99.19/po/pt_BR.po	2007-02-26 15:06:06 UTC (rev 584)
@@ -42,4 +42,4 @@
 "from the originals."
 msgstr ""
 "Aparentemente, um destes arquivos foi modificado por você, porque o "
-"valor de sua soma md5 é diferente do original."
\ No newline at end of file
+"valor de sua soma md5 é diferente do original."

Modified: jed/branches/0.99.19/rules
===================================================================
--- jed/branches/0.99.19/rules	2007-02-26 14:54:38 UTC (rev 583)
+++ jed/branches/0.99.19/rules	2007-02-26 15:06:06 UTC (rev 584)
@@ -35,11 +35,14 @@
 	# fixme-upstream
 	rm -f src/config.h
 
-build: build-stamp
-build-stamp: patch-stamp
+config.status: patch-stamp
 	dh_testdir
 	./configure "CFLAGS=$(CFLAGS)" --prefix=/usr/share --exec-prefix=/usr --with-x
 
+build: build-stamp
+build-stamp: config.status
+	dh_testdir
+
 	#
 	# --- MAKE ---
 	#
@@ -55,7 +58,7 @@
 
 	touch build-stamp
 
-binary-indep: patch-stamp
+binary-indep: config.status
 	dh_testdir
 	dh_testroot
 	# keep dh_install informations (debian/files) and debian/tmp
@@ -83,8 +86,16 @@
 	    debian/init.d/README.Debian-startup \
 	    debian/Debian-Jed-Policy.txt
 
+	# generate info files from jed.tex
+	rmdir $(jed-common)/usr/share/jed/info
+	mkdir -p $(jed-common)/usr/share/info
+	cd $(jed-common)/usr/share/info/; hevea -fix -info -o jed.info \
+	    $(jed-common)/usr/share/doc/jed-common/manual/jed.tex
+
 	mv $(jed-common)/usr/share/doc/jed-common/manual \
 	    $(jed-common)/usr/share/doc/jed-common/html
+
+	# generate html files from jed.tex
 	hevea -fix -o $(jed-common)/usr/share/doc/jed-common/html/jed.hevea \
 	    $(jed-common)/usr/share/doc/jed-common/html/jed.tex
 	cd $(jed-common)/usr/share/doc/jed-common/html/; hacha jed.hevea