Update to GPLv3

Relicensed the code under the GPLv3.


git-archimport-id: getht@sv.gnu.org/getht--mainline--0.1--patch-35

10 files changed, 59 insertions, 69 deletions

diff --git a/src/cli.c b/src/cli.c
index b085d02..9b31fd6 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -1,11 +1,11 @@
 /*
- * Copyright 2006 Nick White
+ * Copyright 2006,2008 Nick White
  *
  * This file is part of GetHT
- * 
- * GetHT is free software; you can redistribute it and/or modify
+ *
+ * GetHT is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * GetHT is distributed in the hope that it will be useful,
@@ -14,9 +14,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GetHT; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
+ * along with GetHT.  If not, see <http://www.gnu.org/licenses/>.
+ * 
  */
 
 #include <stdio.h>
diff --git a/src/config.c b/src/config.c
index 23c2926..714bbf9 100644
--- a/src/config.c
+++ b/src/config.c
@@ -1,11 +1,11 @@
 /*
- * Copyright 2006 Nick White
+ * Copyright 2006,2008 Nick White
  *
  * This file is part of GetHT
- * 
- * GetHT is free software; you can redistribute it and/or modify
+ *
+ * GetHT is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * GetHT is distributed in the hope that it will be useful,
@@ -14,9 +14,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GetHT; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
+ * along with GetHT.  If not, see <http://www.gnu.org/licenses/>.
+ * 
  */
 
 #include <stdio.h>
diff --git a/src/download.c b/src/download.c
index a1853f5..0442b02 100644
--- a/src/download.c
+++ b/src/download.c
@@ -1,11 +1,11 @@
 /*
- * Copyright 2006 Nick White
+ * Copyright 2006,2008 Nick White
  *
  * This file is part of GetHT
  *
- * GetHT is free software; you can redistribute it and/or modify
+ * GetHT is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * GetHT is distributed in the hope that it will be useful,
@@ -14,9 +14,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GetHT; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
+ * along with GetHT.  If not, see <http://www.gnu.org/licenses/>.
+ * 
  */
 
 #include <stdio.h>
diff --git a/src/getht.c b/src/getht.c
index 26737d7..051fb6f 100644
--- a/src/getht.c
+++ b/src/getht.c
@@ -1,11 +1,11 @@
 /*
- * Copyright 2006 Nick White
+ * Copyright 2006,2008 Nick White
  *
  * This file is part of GetHT
- * 
- * GetHT is free software; you can redistribute it and/or modify
+ *
+ * GetHT is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * GetHT is distributed in the hope that it will be useful,
@@ -14,9 +14,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GetHT; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
+ * along with GetHT.  If not, see <http://www.gnu.org/licenses/>.
+ * 
  */
 
 #include <stdio.h>
diff --git a/src/getht.h b/src/getht.h
index ba138ff..57c2ac9 100644
--- a/src/getht.h
+++ b/src/getht.h
@@ -1,11 +1,11 @@
 /*
- * Copyright 2006 Nick White
+ * Copyright 2006,2008 Nick White
  *
  * This file is part of GetHT
- * 
- * GetHT is free software; you can redistribute it and/or modify
+ *
+ * GetHT is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * GetHT is distributed in the hope that it will be useful,
@@ -14,9 +14,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GetHT; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
+ * along with GetHT.  If not, see <http://www.gnu.org/licenses/>.
+ * 
  */
 
 #define XML_TOC_URL		"http://www.hinduismtoday.com/digital/htde_toc.xml"
diff --git a/src/issue.h b/src/issue.h
index e3fef70..abde6b1 100644
--- a/src/issue.h
+++ b/src/issue.h
@@ -1,11 +1,11 @@
 /*
- * Copyright 2006 Nick White
+ * Copyright 2006,2008 Nick White
  *
  * This file is part of GetHT
- * 
- * GetHT is free software; you can redistribute it and/or modify
+ *
+ * GetHT is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * GetHT is distributed in the hope that it will be useful,
@@ -14,9 +14,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GetHT; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
+ * along with GetHT.  If not, see <http://www.gnu.org/licenses/>.
+ * 
  */
 
 /* all sizes are in bytes and are child-inclusive */
diff --git a/src/issuemem.c b/src/issuemem.c
index d4f922f..dea0704 100644
--- a/src/issuemem.c
+++ b/src/issuemem.c
@@ -1,11 +1,11 @@
 /*
- * Copyright 2006 Nick White
+ * Copyright 2006,2008 Nick White
  *
  * This file is part of GetHT
- * 
- * GetHT is free software; you can redistribute it and/or modify
+ *
+ * GetHT is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * GetHT is distributed in the hope that it will be useful,
@@ -14,9 +14,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GetHT; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
+ * along with GetHT.  If not, see <http://www.gnu.org/licenses/>.
+ * 
  */
 
 #include <stdio.h>
diff --git a/src/tocxml.c b/src/tocxml.c
index dc2bddb..d8f20db 100644
--- a/src/tocxml.c
+++ b/src/tocxml.c
@@ -1,11 +1,11 @@
 /*
- * Copyright 2006 Nick White
+ * Copyright 2006,2008 Nick White
  *
  * This file is part of GetHT
- * 
- * GetHT is free software; you can redistribute it and/or modify
+ *
+ * GetHT is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * GetHT is distributed in the hope that it will be useful,
@@ -14,9 +14,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GetHT; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
+ * along with GetHT.  If not, see <http://www.gnu.org/licenses/>.
+ * 
  */
 
 #include <stdio.h>
diff --git a/src/version.h b/src/version.h
index 0713569..d7cc8f5 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1,11 +1,11 @@
 /*
- * Copyright 2006 Nick White
+ * Copyright 2006,2008 Nick White
  *
  * This file is part of GetHT
- * 
- * GetHT is free software; you can redistribute it and/or modify
+ *
+ * GetHT is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * GetHT is distributed in the hope that it will be useful,
@@ -14,9 +14,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GetHT; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
+ * along with GetHT.  If not, see <http://www.gnu.org/licenses/>.
+ * 
  */
 
 #define VERSION "0.0.1"
diff --git a/src/xml.c b/src/xml.c
index d822040..c499b03 100644
--- a/src/xml.c
+++ b/src/xml.c
@@ -1,11 +1,11 @@
 /*
- * Copyright 2006 Nick White
+ * Copyright 2006,2008 Nick White
  *
  * This file is part of GetHT
- * 
- * GetHT is free software; you can redistribute it and/or modify
+ *
+ * GetHT is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * GetHT is distributed in the hope that it will be useful,
@@ -14,9 +14,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GetHT; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
+ * along with GetHT.  If not, see <http://www.gnu.org/licenses/>.
+ * 
  */
 
 #include <stdio.h>