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

16 files changed, 37 insertions, 37 deletions

diff --git a/ca/irbe_cli b/ca/irbe_cli
index 7d62db9d..5aa6a72d 100755
--- a/ca/irbe_cli
+++ b/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
diff --git a/ca/rpki-nanny b/ca/rpki-nanny
index 1efa2191..565ba5a7 100755
--- a/ca/rpki-nanny
+++ b/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
diff --git a/ca/rpki-start-servers b/ca/rpki-start-servers
index 1d7befb6..d7e72424 100755
--- a/ca/rpki-start-servers
+++ b/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
diff --git a/ca/rpkic b/ca/rpkic
index 86cac2cb..17ca5595 100755
--- a/ca/rpkic
+++ b/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
diff --git a/ca/rpkigui-apache-conf-gen b/ca/rpkigui-apache-conf-gen
index bdfc2d64..14b4bcef 100755
--- a/ca/rpkigui-apache-conf-gen
+++ b/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")
 #
diff --git a/ca/tests/left-right-protocol-samples.xml b/ca/tests/left-right-protocol-samples.xml
index f0cb7843..b58b2120 100644
--- a/ca/tests/left-right-protocol-samples.xml
+++ b/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
diff --git a/ca/tests/myrpki-xml-parse-test.py b/ca/tests/myrpki-xml-parse-test.py
index d915ea5b..4e5a461c 100644
--- a/ca/tests/myrpki-xml-parse-test.py
+++ b/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
diff --git a/ca/tests/old_irdbd.sql b/ca/tests/old_irdbd.sql
index e773bb2e..1aa1c84d 100644
--- a/ca/tests/old_irdbd.sql
+++ b/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
diff --git a/ca/tests/smoketest.py b/ca/tests/smoketest.py
index 2bce936b..e04b2b26 100644
--- a/ca/tests/smoketest.py
+++ b/ca/tests/smoketest.py
@@ -13,9 +13,9 @@ things that don't belong in yaml_file.
 
 # $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
diff --git a/ca/tests/smoketest.setup.sql b/ca/tests/smoketest.setup.sql
index 8f7df211..38657bf7 100644
--- a/ca/tests/smoketest.setup.sql
+++ b/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
diff --git a/ca/tests/sql-cleaner.py b/ca/tests/sql-cleaner.py
index 38997821..c4786c1a 100644
--- a/ca/tests/sql-cleaner.py
+++ b/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
diff --git a/ca/tests/sql-dumper.py b/ca/tests/sql-dumper.py
index af24f2d4..5cc12e83 100644
--- a/ca/tests/sql-dumper.py
+++ b/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
diff --git a/ca/tests/testpoke.py b/ca/tests/testpoke.py
index 7ebe7d44..0b6d8dda 100644
--- a/ca/tests/testpoke.py
+++ b/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
diff --git a/ca/tests/xml-parse-test.py b/ca/tests/xml-parse-test.py
index b23cd7af..ef063c05 100644
--- a/ca/tests/xml-parse-test.py
+++ b/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
diff --git a/ca/tests/yamlconf.py b/ca/tests/yamlconf.py
index db368320..a3f23895 100644
--- a/ca/tests/yamlconf.py
+++ b/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
diff --git a/ca/tests/yamltest.py b/ca/tests/yamltest.py
index ca96c12c..22621c67 100755
--- a/ca/tests/yamltest.py
+++ b/ca/tests/yamltest.py
@@ -9,10 +9,10 @@ and waits for one of them to exit.
 
 # $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