[Debian-tex-commits] SVN tex-common commit + diffs: r3377 - in tex-common/branches/triggers: debian scripts

[Norbert Preining]

Author: preining
Date: 2008-05-19 10:58:59 +0000 (Mon, 19 May 2008)
New Revision: 3377

Modified:
   tex-common/branches/triggers/debian/changelog
   tex-common/branches/triggers/debian/postinst.in
   tex-common/branches/triggers/scripts/dh_installtex
   tex-common/branches/triggers/scripts/update-fontlang
Log:
switch trigger working so that update-fontlang takes --trigger to work
in  trigger mode instead of --real to work in real mode


Modified: tex-common/branches/triggers/debian/changelog
===================================================================
--- tex-common/branches/triggers/debian/changelog	2008-05-19 05:30:04 UTC (rev 3376)
+++ tex-common/branches/triggers/debian/changelog	2008-05-19 10:58:59 UTC (rev 3377)
@@ -16,7 +16,7 @@
   * implement support for triggers for /etc/texmf/updmap.d and
     /etc/texmf/language.d [np]
 
- -- Norbert Preining <preining at debian.org>  Wed, 14 May 2008 18:22:26 +0200
+ -- Norbert Preining <preining at debian.org>  Mon, 19 May 2008 12:58:12 +0200
 
 tex-common (1.11) unstable; urgency=medium
 

Modified: tex-common/branches/triggers/debian/postinst.in
===================================================================
--- tex-common/branches/triggers/debian/postinst.in	2008-05-19 05:30:04 UTC (rev 3376)
+++ tex-common/branches/triggers/debian/postinst.in	2008-05-19 10:58:59 UTC (rev 3377)
@@ -45,10 +45,10 @@
         # - go through all the triggers and call the respective fmtutil/updmap
         #   calls.
 
-        # in any case call the update-updmap --real ...
-        update-updmap --real --quiet
-        update-language --real
-        update-fmtutil --real
+        # in any case call the update-* calls
+        update-updmap --quiet
+        update-language
+        update-fmtutil
         case " $trigger " in
             *" /etc/texmf/updmap.d "*) 
                 # do the processing

Modified: tex-common/branches/triggers/scripts/dh_installtex
===================================================================
--- tex-common/branches/triggers/scripts/dh_installtex	2008-05-19 05:30:04 UTC (rev 3376)
+++ tex-common/branches/triggers/scripts/dh_installtex	2008-05-19 10:58:59 UTC (rev 3377)
@@ -670,6 +670,8 @@
 		}
 	}
 
+	# for trigger support
+	addsubstvar($package, "misc:Depends", "dpkg", ">= 1.14.18");
 	addsubstvar($package, "misc:Depends", "tex-common", ">= 1.11");
 }
 

Modified: tex-common/branches/triggers/scripts/update-fontlang
===================================================================
--- tex-common/branches/triggers/scripts/update-fontlang	2008-05-19 05:30:04 UTC (rev 3376)
+++ tex-common/branches/triggers/scripts/update-fontlang	2008-05-19 10:58:59 UTC (rev 3377)
@@ -92,7 +92,7 @@
                          normal operation
       --help             display this help message and exit
       --version          output version information and exit
-      --real             do actual processing, don't use triggers"
+      --trigger          do not do actual processing, call the triggers"
 
 
 DebPkgProvidedMaps_magic_comment="^[#%] -_- DebPkgProvidedMaps -_-"
@@ -470,7 +470,7 @@
 
 # -v (verbose) is here for backward compatibility only.
 TEMP=$(getopt -o +vc:o: --longoptions \
-    conf-dir:,output-file:,check,quiet,help,version,real \
+    conf-dir:,output-file:,check,quiet,help,version,trigger \
     -n "$progname" -- "$@")
 
 case $? in
@@ -496,7 +496,7 @@
 quiet=1
 dochecks=0
 output_file_specified=0
-real=0
+trigger=0
 
 if [ $syswide_mode = 1 ]; then
     output_file="$SYSWIDE_DEFAULT_OUTPUTFILE"
@@ -546,7 +546,7 @@
             shift 2 ;;
         --quiet) quiet=1; shift ;;
         --check) dochecks=1; shift ;;
-        --real)  real=1; shift ;;
+        --trigger)  trigger=1; shift ;;
         -v) printf "\
 ${progname}'s -v option is deprecated. The default mode of operation will
 be verbose as soon as enough packages use the --quiet option. Please update
@@ -567,8 +567,8 @@
 
 # In user-specific mode, $conf_dir is required; let's check that.
 if [ $syswide_mode = 0 ]; then
-    # we set real mode to 1 if we are not running as root
-    real=1
+    # we set trigger mode to 0 if we are not running as root
+    trigger=1
     if [ -z "$conf_dir" ]; then
         printf "$progname: "
         cat >&2 <<EOF
@@ -585,10 +585,10 @@
 fi
 
 if [ $USE_TRIGGER = 0 ]; then
-    # if we don't use triggers, we always work in real mode
-    real=1
+    # if we don't use triggers, we always work in trigger mode
+    trigger=0
 fi
-if [ $real = 0 ]; then
+if [ $trigger = 1 ]; then
     if type dpkg-trigger > /dev/null 2>&1 &&
        dpkg-trigger $SYSWIDE_CONFDIR ; then
         exit 0
@@ -692,4 +692,4 @@
     fi
 fi
 
-# vim:set expandtab: #
+# vim:set expandtab termencoding=iso8859-15 encoding=utf-8 fileencoding=utf-8: #