[Popcon-commits] cvs commit to popularity-contest/debian by pere

[pere at cvs.alioth.debian.org]

Update of /cvsroot/popcon/popularity-contest/debian
In directory haydn:/tmp/cvs-serv3115/debian

Modified Files:
	changelog postinst templates 
Log Message:
Add hidden debconf question popularity-contest/submiturls to
support preseeding to the submission URL. (Closes: #384144)


Index: changelog
===================================================================
RCS file: /cvsroot/popcon/popularity-contest/debian/changelog,v
retrieving revision 1.311
retrieving revision 1.312
diff -u -d -r1.311 -r1.312
--- changelog	4 Sep 2006 16:07:21 -0000	1.311
+++ changelog	4 Sep 2006 16:42:51 -0000	1.312
@@ -32,6 +32,8 @@
   * Update standards-version from 3.6.2 to 3.7.2.  No changes needed.
   * Add Build-Depends with the same dependencies as
     Build-Depends-Indep, to keep lintian happy.
+  * Add hidden debconf question popularity-contest/submiturls to
+    support preseeding to the submission URL. (Closes: #384144)
   * Translations
     - Updated Italian (it) by Davide Viti.
     - Updated Tagalog (tl) by Eric Pareja.

Index: postinst
===================================================================
RCS file: /cvsroot/popcon/popularity-contest/debian/postinst,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- postinst	29 Jul 2006 07:48:37 -0000	1.17
+++ postinst	4 Sep 2006 16:42:51 -0000	1.18
@@ -51,6 +51,13 @@
 		PARTICIPATE="$PARTICIPATE"
 		USEHTTP="yes"
 	EOF
+
+	# preseeding is only allowed on first time install
+	db_get popularity-contest/submiturls || true
+	if [ -n "$RET" ] ; then
+	    echo "SUBMITRULS=\"$RET\"" >> $conffile
+	fi
+
 	# Make sure user nobody can read the file.
 	chmod a+r $conffile
 }

Index: templates
===================================================================
RCS file: /cvsroot/popcon/popularity-contest/debian/templates,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- templates	29 Jul 2006 09:55:51 -0000	1.19
+++ templates	4 Sep 2006 16:42:51 -0000	1.20
@@ -13,3 +13,9 @@
  .
  This choice can be later modified by running "dpkg-reconfigure
  popularity-contest".
+
+Template: popularity-contest/submiturls
+Type: string
+Description: for internal use
+ Preseed this during installation to replace the URL used for
+ submitting reports.