Hi,

Is it OK with the Perl team if I uploaded a stable update using the
attached patch, which is based on the changes made in 1.605-4?

-- 
Matt Kraai
https://ftbfs.org/kraai
diff -ru perlindex-1.605~/debian/changelog perlindex-1.605/debian/changelog
--- perlindex-1.605~/debian/changelog	2012-01-29 07:28:25.000000000 -0800
+++ perlindex-1.605/debian/changelog	2012-01-29 07:32:24.000000000 -0800
@@ -1,3 +1,13 @@
+perlindex (1.605-2squeeze1) stable; urgency=low
+
+  * rules: invoke upstream build system with INDEXDIR in /var/cache
+    otherwise the index files end up in /usr/share/man (Closes: #657312)
+  * postinst: migrate existing index files from /usr/share/man to
+    /var/cache/perlindex on upgrades from versions creating them in
+    /usr/share/man
+
+ -- Matt Kraai <kr...@debian.org>  Sun, 29 Jan 2012 07:32:24 -0800
+
 perlindex (1.605-2) unstable; urgency=low
 
   [ Ignace Mouzannar ]
diff -ru perlindex-1.605~/debian/perlindex.postinst perlindex-1.605/debian/perlindex.postinst
--- perlindex-1.605~/debian/perlindex.postinst	2012-01-29 07:28:25.000000000 -0800
+++ perlindex-1.605/debian/perlindex.postinst	2012-01-29 07:29:47.000000000 -0800
@@ -25,6 +25,27 @@
 			echo -n "Generating index (this may take a while)..."
 			perlindex -index >/dev/null 2>&1
 			echo " done."
+		elif dpkg --compare-versions "$2" lt "1.605-4~"; then
+			echo -n "Moving index files to /var/cache/perlindex..."
+			SRC=/usr/share/man
+			DST=/var/cache/perlindex
+			for p in fn idf if if.new seen; do
+			    src_f="$SRC/index_$p"
+			    dst_f="$DST/index_$p"
+			    # move in two passes, since /var and /usr may be in
+			    # different file systems
+			    if [ -e "$src_f" ]; then
+				if ! [ -e "$dst_f" ] || [ "$src_f" -nt "$dst_f" ]; then
+				    echo -n " index_$p"
+				    mv "$src_f" "$dst_f.migrated"
+				    mv "$dst_f.migrated" "$dst_f"
+				else
+				    # proper index file is already newer
+				    rm "$src_f"
+				fi
+			    fi
+			done
+			echo ", done."
 		fi
     ;;
 
diff -ru perlindex-1.605~/debian/rules perlindex-1.605/debian/rules
--- perlindex-1.605~/debian/rules	2012-01-29 07:28:25.000000000 -0800
+++ perlindex-1.605/debian/rules	2012-01-29 07:28:50.000000000 -0800
@@ -3,6 +3,9 @@
 %:
 	dh $@ --with quilt
 
+override_dh_auto_build:
+	INDEXDIR=/var/cache/perlindex dh_auto_build
+
 override_dh_auto_clean:
 	dh_auto_clean
 	debconf-updatepo

Reply via email to