Hi > I would prefer to keep the default value in the file in /usr/share/, > and only insert an SUBMITURLS in popularity-contest.conf if it is > different from the default. This way, we can easily see which > installations are using non-default submission urls, and which are > not. This will help if we change submission URL in the future. > > Do you have time to adjust the patch to behave that way instead? That should do the job if i get you right.
Thanks for your work. Cheers Steffen
diff -Nru /tmp/KOYYUTuYIU/popularity-contest-1.33/debian/config /tmp/7yG3pUa6DS/popularity-contest-1.34/debian/config
--- /tmp/KOYYUTuYIU/popularity-contest-1.33/debian/config 2005-08-06 07:08:22.000000000 +1000
+++ /tmp/7yG3pUa6DS/popularity-contest-1.34/debian/config 2006-08-22 16:26:51.000000000 +1000
@@ -42,3 +42,7 @@
db_input low popularity-contest/use-http || [ $? -eq 30 ]
db_go || true
fi
+
+# Ask for different URL
+db_input low popularity-contest/submiturl || [ $? -eq 30 ]
+db_go || true
diff -Nru /tmp/KOYYUTuYIU/popularity-contest-1.33/debian/postinst /tmp/7yG3pUa6DS/popularity-contest-1.34/debian/postinst
--- /tmp/KOYYUTuYIU/popularity-contest-1.33/debian/postinst 2005-08-06 07:08:22.000000000 +1000
+++ /tmp/7yG3pUa6DS/popularity-contest-1.34/debian/postinst 2006-08-22 20:43:05.000000000 +1000
@@ -29,6 +29,11 @@
USEHTTP="no"
fi
+db_get popularity-contest/submiturls || true
+if [ -n "$RET" ] ; then
+ SUBMITURLS=$RET
+fi
+
# The md5 sum of an empty file
EMPTYID="d41d8cd98f00b204e9800998ecf8427e"
@@ -57,6 +62,11 @@
PARTICIPATE="$PARTICIPATE"
USEHTTP="$USEHTTP"
EOF
+ if [ -n "$SUBMITURLS" ] ; then
+ cat <<-EOF >>$conffile
+ echo "SUBMITRULS="$SUBMITURLS"
+ EOF
+ fi
# Make sure user nobody can read the file.
chmod a+r $conffile
}
diff -Nru /tmp/KOYYUTuYIU/popularity-contest-1.33/debian/templates /tmp/7yG3pUa6DS/popularity-contest-1.34/debian/templates
--- /tmp/KOYYUTuYIU/popularity-contest-1.33/debian/templates 2005-08-06 07:08:22.000000000 +1000
+++ /tmp/7yG3pUa6DS/popularity-contest-1.34/debian/templates 2006-08-22 16:25:28.000000000 +1000
@@ -27,3 +27,9 @@
Default: true
_Description: Use HTTP to submit reports?
If you do not want to use HTTP, email is used instead.
+
+Template: poularity-contest/submiturls
+Type: string
+Default: http://popcon.debian.org/cgi-bin/popcon.cgi
+_Description: URL for submitting reports?
+ Which URL do you want to use for submitting your reports?
pgpAD2iUEAQX7.pgp
Description: PGP signature
