Oops, TeX-style "--" numeric ranges in copyright comments are bad fit

for XML.  Apparently we were carefully changing just the XML files to
use a single "-" to work around this.  Enough already, just convert
all copyright year ranges to single "-" and have done with this.

svn path=/branches/tk705/; revision=6427

ca/irbe_cli

@@ -2,7 +2,7 @@
 
 # $Id$
 #
-# Copyright (C) 2009--2013  Internet Systems Consortium ("ISC")
+# Copyright (C) 2009-2013  Internet Systems Consortium ("ISC")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -16,7 +16,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 #
-# Portions copyright (C) 2007--2008  American Registry for Internet Numbers ("ARIN")
+# Portions copyright (C) 2007-2008  American Registry for Internet Numbers ("ARIN")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

ca/rpki-nanny

@@ -2,10 +2,10 @@
 
 # $Id$
 #
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
 # Portions copyright (C) 2014  Dragon Research Labs ("DRL")
-# Portions copyright (C) 2009--2013  Internet Systems Consortium ("ISC")
-# Portions copyright (C) 2007--2008  American Registry for Internet Numbers ("ARIN")
+# Portions copyright (C) 2009-2013  Internet Systems Consortium ("ISC")
+# Portions copyright (C) 2007-2008  American Registry for Internet Numbers ("ARIN")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

ca/rpki-start-servers

@@ -3,8 +3,8 @@
 # $Id$
 #
 # Copyright (C) 2014  Dragon Research Labs ("DRL")
-# Portions copyright (C) 2009--2013  Internet Systems Consortium ("ISC")
-# Portions copyright (C) 2007--2008  American Registry for Internet Numbers ("ARIN")
+# Portions copyright (C) 2009-2013  Internet Systems Consortium ("ISC")
+# Portions copyright (C) 2007-2008  American Registry for Internet Numbers ("ARIN")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

ca/rpkic

@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
-# Portions copyright (C) 2013--2014  Dragon Research Labs ("DRL")
-# Portions copyright (C) 2009--2012  Internet Systems Consortium ("ISC")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
+# Portions copyright (C) 2013-2014  Dragon Research Labs ("DRL")
+# Portions copyright (C) 2009-2012  Internet Systems Consortium ("ISC")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

ca/rpkigui-apache-conf-gen

@@ -2,7 +2,7 @@
 
 # $Id$
 #
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
 # Portions copyright (C) 2014  Dragon Research Labs ("DRL")
 # Portions copyright (C) 2013  Internet Systems Consortium ("ISC")
 #

ca/tests/left-right-protocol-samples.xml

@@ -1,10 +1,10 @@
 <!-- -*- SGML -*-
   -  $Id$
   -
-  - Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
+  - Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
   - Portions copyright (C) 2014  Dragon Research Labs ("DRL")
   - Portions copyright (C) 2010  Internet Systems Consortium ("ISC")
-  - Portions copyright (C) 2007--2008  American Registry for Internet Numbers ("ARIN")
+  - Portions copyright (C) 2007-2008  American Registry for Internet Numbers ("ARIN")
   -
   - Permission to use, copy, modify, and distribute this software for any
   - purpose with or without fee is hereby granted, provided that the above

ca/tests/myrpki-xml-parse-test.py

@@ -1,6 +1,6 @@
 # $Id$
 #
-# Copyright (C) 2009--2012  Internet Systems Consortium ("ISC")
+# Copyright (C) 2009-2012  Internet Systems Consortium ("ISC")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

ca/tests/old_irdbd.sql

@@ -1,6 +1,6 @@
 -- $Id$
 
--- Copyright (C) 2009--2011  Internet Systems Consortium ("ISC")
+-- Copyright (C) 2009-2011  Internet Systems Consortium ("ISC")
 --
 -- Permission to use, copy, modify, and distribute this software for any
 -- purpose with or without fee is hereby granted, provided that the above
@@ -14,7 +14,7 @@
 -- OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 -- PERFORMANCE OF THIS SOFTWARE.
 
--- Copyright (C) 2007--2008  American Registry for Internet Numbers ("ARIN")
+-- Copyright (C) 2007-2008  American Registry for Internet Numbers ("ARIN")
 --
 -- Permission to use, copy, modify, and distribute this software for any
 -- purpose with or without fee is hereby granted, provided that the above

ca/tests/smoketest.py

@@ -13,9 +13,9 @@
 
 # $Id$
 #
-# Copyright (C) 2013--2014  Dragon Research Labs ("DRL")
-# Portions copyright (C) 2009--2012  Internet Systems Consortium ("ISC")
-# Portions copyright (C) 2007--2008  American Registry for Internet Numbers ("ARIN")
+# Copyright (C) 2013-2014  Dragon Research Labs ("DRL")
+# Portions copyright (C) 2009-2012  Internet Systems Consortium ("ISC")
+# Portions copyright (C) 2007-2008  American Registry for Internet Numbers ("ARIN")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

ca/tests/smoketest.setup.sql

@@ -18,7 +18,7 @@
 -- OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 -- PERFORMANCE OF THIS SOFTWARE.
 --
--- Portions copyright (C) 2007--2008  American Registry for Internet Numbers ("ARIN")
+-- Portions copyright (C) 2007-2008  American Registry for Internet Numbers ("ARIN")
 --
 -- Permission to use, copy, modify, and distribute this software for any
 -- purpose with or without fee is hereby granted, provided that the above

ca/tests/sql-cleaner.py

@@ -1,8 +1,8 @@
 # $Id$
 #
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
-# Portions copyright (C) 2013--2014  Dragon Research Labs ("DRL")
-# Portions copyright (C) 2009--2012  Internet Systems Consortium ("ISC")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
+# Portions copyright (C) 2013-2014  Dragon Research Labs ("DRL")
+# Portions copyright (C) 2009-2012  Internet Systems Consortium ("ISC")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

ca/tests/sql-dumper.py

@@ -1,6 +1,6 @@
 # $Id$
 #
-# Copyright (C) 2009--2012 Internet Systems Consortium ("ISC")
+# Copyright (C) 2009-2012 Internet Systems Consortium ("ISC")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

ca/tests/testpoke.py

@@ -1,8 +1,8 @@
 # $Id$
 #
 # Copyright (C) 2014  Dragon Research Labs ("DRL")
-# Portions copyright (C) 2009--2012  Internet Systems Consortium ("ISC")
-# Portions copyright (C) 2007--2008  American Registry for Internet Numbers ("ARIN")
+# Portions copyright (C) 2009-2012  Internet Systems Consortium ("ISC")
+# Portions copyright (C) 2007-2008  American Registry for Internet Numbers ("ARIN")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

ca/tests/xml-parse-test.py

@@ -1,9 +1,9 @@
 # $Id$
 #
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
-# Portions copyright (C) 2013--2014  Dragon Research Labs ("DRL")
-# Portions copyright (C) 2009--2012  Internet Systems Consortium ("ISC")
-# Portions copyright (C) 2007--2008  American Registry for Internet Numbers ("ARIN")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
+# Portions copyright (C) 2013-2014  Dragon Research Labs ("DRL")
+# Portions copyright (C) 2009-2012  Internet Systems Consortium ("ISC")
+# Portions copyright (C) 2007-2008  American Registry for Internet Numbers ("ARIN")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

ca/tests/yamlconf.py

@@ -1,8 +1,8 @@
 # $Id$
 #
-# Copyright (C) 2013--2014  Dragon Research Labs ("DRL")
-# Portions copyright (C) 2009--2012  Internet Systems Consortium ("ISC")
-# Portions copyright (C) 2007--2008  American Registry for Internet Numbers ("ARIN")
+# Copyright (C) 2013-2014  Dragon Research Labs ("DRL")
+# Portions copyright (C) 2009-2012  Internet Systems Consortium ("ISC")
+# Portions copyright (C) 2007-2008  American Registry for Internet Numbers ("ARIN")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

ca/tests/yamltest.py

@@ -9,10 +9,10 @@
 
 # $Id$
 #
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
-# Portions copyright (C) 2013--2014  Dragon Research Labs ("DRL")
-# Portions copyright (C) 2009--2012  Internet Systems Consortium ("ISC")
-# Portions copyright (C) 2007--2008  American Registry for Internet Numbers ("ARIN")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
+# Portions copyright (C) 2013-2014  Dragon Research Labs ("DRL")
+# Portions copyright (C) 2009-2012  Internet Systems Consortium ("ISC")
+# Portions copyright (C) 2007-2008  American Registry for Internet Numbers ("ARIN")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

potpourri/oob-translate.xsl

@@ -1,7 +1,7 @@
 <!-- -*- SGML -*-
   - $Id$
   -
-  - Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
+  - Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
   -
   - Permission to use, copy, modify, and distribute this software for any
   - purpose with or without fee is hereby granted, provided that the above

rp/config/rpki-confgen

@@ -2,7 +2,7 @@
 
 # $Id$
 #
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
 # Portions copyright (C) 2014  Dragon Research Labs ("DRL")
 # Portions copyright (C) 2013  Internet Systems Consortium ("ISC")
 #

rp/config/rpki-confgen.xml

@@ -4,9 +4,9 @@
   Documented option definitions for rpki-confgen to use in generating
   rpki.conf and TracWiki documentation.
 
-  Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
+  Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
   Portions copyright (C) 2014  Dragon Research Labs ("DRL")
-  Portions copyright (C) 2009--2013  Internet Systems Consortium ("ISC")
+  Portions copyright (C) 2009-2013  Internet Systems Consortium ("ISC")
  
   Permission to use, copy, modify, and distribute this software for any
   purpose with or without fee is hereby granted, provided that the above

rp/config/rpki-generate-root-certificate

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

rp/config/rpki-sql-backup

@@ -2,9 +2,9 @@
 
 # $Id$
 #
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
 # Portions copyright (C) 2014  Dragon Research Labs ("DRL")
-# Portions copyright (C) 2010--2013  Internet Systems Consortium ("ISC")
+# Portions copyright (C) 2010-2013  Internet Systems Consortium ("ISC")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

rp/config/rpki-sql-setup

@@ -2,9 +2,9 @@
 
 # $Id$
 #
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
 # Portions copyright (C) 2014  Dragon Research Labs ("DRL")
-# Portions copyright (C) 2009--2013  Internet Systems Consortium ("ISC")
+# Portions copyright (C) 2009-2013  Internet Systems Consortium ("ISC")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

rp/rcynic/rcynic-cron

@@ -2,7 +2,7 @@
 #
 # $Id$
 #
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
 # Portions copyright (C) 2014  Dragon Research Labs ("DRL")
 # Portions copyright (C) 2013  Internet Systems Consortium ("ISC")
 #

rp/rcynic/rcynic-dump

@@ -2,7 +2,7 @@
 
 # $Id$
 
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

rp/rcynic/rcynic-html

@@ -2,8 +2,8 @@
 #
 # $Id$
 #
-# Copyright (C) 2013--2014  Dragon Research Labs ("DRL")
-# Portions copyright (C) 2009--2012  Internet Systems Consortium ("ISC")
+# Copyright (C) 2013-2014  Dragon Research Labs ("DRL")
+# Portions copyright (C) 2009-2012  Internet Systems Consortium ("ISC")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

rp/rcynic/rcynic.c

@@ -1,7 +1,7 @@
 /*
- * Copyright (C) 2013--2014  Dragon Research Labs ("DRL")
- * Portions copyright (C) 2009--2012  Internet Systems Consortium ("ISC")
- * Portions copyright (C) 2006--2008  American Registry for Internet Numbers ("ARIN")
+ * Copyright (C) 2013-2014  Dragon Research Labs ("DRL")
+ * Portions copyright (C) 2009-2012  Internet Systems Consortium ("ISC")
+ * Portions copyright (C) 2006-2008  American Registry for Internet Numbers ("ARIN")
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

rp/rcynic/rcynicng

@@ -2,7 +2,7 @@
 
 # $Id$
 
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

rp/rcynic/rpki-torrent.py

@@ -2,7 +2,7 @@
 #
 # $Id$
 #
-# Copyright (C) 2013--2014  Dragon Research Labs ("DRL")
+# Copyright (C) 2013-2014  Dragon Research Labs ("DRL")
 # Portions copyright (C) 2012  Internet Systems Consortium ("ISC")
 #
 # Permission to use, copy, modify, and distribute this software for any

rp/utils/find_roa

@@ -2,7 +2,7 @@
 #
 # $Id$
 #
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
 # Portions copyright (C) 2014  Dragon Research Labs ("DRL")
 #
 # Permission to use, copy, modify, and distribute this software for any

rp/utils/hashdir

@@ -2,7 +2,7 @@
 #
 # $Id$
 #
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
 # Portions copyright (C) 2014  Dragon Research Labs ("DRL")
 #
 # Permission to use, copy, modify, and distribute this software for any

rp/utils/print_roa

@@ -2,7 +2,7 @@
 #
 # $Id$
 #
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
 # Portions copyright (C) 2014  Dragon Research Labs ("DRL")
 #
 # Permission to use, copy, modify, and distribute this software for any

rp/utils/print_rpki_manifest

@@ -2,7 +2,7 @@
 #
 # $Id$
 #
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
 # Portions copyright (C) 2014  Dragon Research Labs ("DRL")
 #
 # Permission to use, copy, modify, and distribute this software for any

rp/utils/scan_roas

@@ -2,7 +2,7 @@
 #
 # $Id$
 #
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
 # Portions copyright (C) 2014  Dragon Research Labs ("DRL")
 #
 # Permission to use, copy, modify, and distribute this software for any

rp/utils/scan_routercerts

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # $Id$
 #
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
 # Portions copyright (C) 2014  Dragon Research Labs ("DRL")
 #
 # Permission to use, copy, modify, and distribute this software for any

rp/utils/uri

@@ -2,7 +2,7 @@
 #
 # $Id$
 #
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
 # Portions copyright (C) 2014  Dragon Research Labs ("DRL")
 #
 # Permission to use, copy, modify, and distribute this software for any

rpki/POW/__init__.py

@@ -1,9 +1,9 @@
 # $Id$
 #
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
 # Portions copyright (C) 2014  Dragon Research Labs ("DRL")
-# Portions copyright (C) 2009--2013  Internet Systems Consortium ("ISC")
-# Portions copyright (C) 2006--2008  American Registry for Internet Numbers ("ARIN")
+# Portions copyright (C) 2009-2013  Internet Systems Consortium ("ISC")
+# Portions copyright (C) 2006-2008  American Registry for Internet Numbers ("ARIN")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above