[subversion-commit] SVN tetex commit + diffs: r318 - in tex-common/trunk: debian doc

[Frank Küster]

Author: frank
Date: 2005-11-04 10:54:55 +0000 (Fri, 04 Nov 2005)
New Revision: 318

Modified:
   tex-common/trunk/debian/changelog
   tex-common/trunk/debian/config.in
   tex-common/trunk/debian/rules
   tex-common/trunk/doc/Debian-TeX-Policy.pdf
Log:
- fix a bug in config
- properly remake Debian-TeX-Policy.pdf
- add a check-svn function in debian/rules

Modified: tex-common/trunk/debian/changelog
===================================================================
--- tex-common/trunk/debian/changelog	2005-11-02 12:14:46 UTC (rev 317)
+++ tex-common/trunk/debian/changelog	2005-11-04 10:54:55 UTC (rev 318)
@@ -2,8 +2,12 @@
 
   * tex-common should only Suggest debhelper, not Depend on it. It would
     pull in too many dev packages for every normal user. [preining]
+  * Fix the syntax of some eval statements in the config script (closes:
+    #336951) [frank]
+  * Make sure the default for the managed ls-R files (cache) is actually
+    selected on a fresh install.
 
- -- Norbert Preining <preining at logic.at>  Wed,  2 Nov 2005 13:13:29 +0100
+ -- Frank Küster <frank at debian.org>  Fri,  4 Nov 2005 11:46:23 +0100
 
 tex-common (0.9) unstable; urgency=low
 

Modified: tex-common/trunk/debian/config.in
===================================================================
--- tex-common/trunk/debian/config.in	2005-11-02 12:14:46 UTC (rev 317)
+++ tex-common/trunk/debian/config.in	2005-11-04 10:54:55 UTC (rev 318)
@@ -44,12 +44,14 @@
 # ${i}group
 gwritetrue=""
 gwritefalse=""
+lsrfile_exists=""
 for i in var cache main ; do
-    eval ${i}group=""
+    eval \$${i}group=""
     lsr=`select_lsrfile $i`
     if [ -r $lsr ] ; then
+        lsrfile_exists="true"
     	tmp=`ls -l $lsr | awk '{print$4}'`
-	eval ${i}group=$tmp
+	eval \$${i}group=$tmp
 	if ls -l $lsr | grep -q ^.....w ; then
 	    gwritetrue="$gwritetrue $i"
 	else
@@ -59,7 +61,10 @@
 done
 #
 # now we save the list of group writeable ls-R files to tex-common/managedlsr
-db_set tex-common/managedlsr $gwritetrue || true
+# (but only if we found any.  On a fresh install, we'll show the default.')
+if [ "$lsrfile_exists" = "true" ]; then
+    db_set tex-common/managedlsr $gwritetrue || true
+fi
 #
 # and ask the user to check if this selection is ok
 db_input low tex-common/managedlsr || true
@@ -70,12 +75,12 @@
 db_get tex-common/managedlsr && SELECTED_LSR="$RET" || true
 if [ -n "$SELECTED_LSR" ]; then
     #
-    # we check wether all the group writeable files belong to the same group
+    # we check wether all the group writeable files belong to the same group.
     # if yes, we suggest this group and ask the groupname question,
     # otherwise we ignore this and do *not* play around with groups.
     iscommongroup=-1
     for i in $SELECTED_LSR ; do
-      eval tmp=${i}group
+      eval tmp=\$${i}group
       if [ "X$iscommongroup" = "X-1" ] ; then
 	 iscommongroup=$tmp
       else

Modified: tex-common/trunk/debian/rules
===================================================================
--- tex-common/trunk/debian/rules	2005-11-02 12:14:46 UTC (rev 317)
+++ tex-common/trunk/debian/rules	2005-11-04 10:54:55 UTC (rev 318)
@@ -39,6 +39,7 @@
 
 build-stamp: $(EPERL_FILES)
 	dh_testdir
+	$(check-svn)
 
 	# Add here commands to compile the package.
 	cd doc; $(MAKE)
@@ -107,6 +108,7 @@
 # Build architecture-dependent files here.
 binary-arch: build install
 	dh_testdir
+	$(check-svn)
 	dh_testroot
 	dh_installdebconf 
 	dh_installchangelogs 
@@ -126,3 +128,10 @@
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install configure
+
+define check-svn
+	if test -d debian/.svn; then \
+		echo "please clean subversion directories"; \
+		exit 1; \
+	fi
+endef

Modified: tex-common/trunk/doc/Debian-TeX-Policy.pdf
===================================================================
(Binary files differ)