[SCM] live-magic branch, master, updated. 1.11-6-gbad04e8

Chris Lamb lamby at debian.org
Mon Aug 2 04:55:17 UTC 2010 

The following commit has been merged in the master branch:
commit f75a4d6c224c94fba7f2ec48d178c114ef05867a
Author: Chris Lamb <lamby at debian.org>
Date:   Mon Aug 2 00:48:42 2010 -0400

    Update copyright years from 2007-2008 => 2007-2010.

diff --git a/DebianLive/__init__.py b/DebianLive/__init__.py
index a78a740..260cd72 100644
--- a/DebianLive/__init__.py
+++ b/DebianLive/__init__.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #   live-magic - GUI frontend to create Debian LiveCDs, etc.
-#   Copyright (C) 2007-2008 Chris Lamb <chris at chris-lamb.co.uk>
+#   Copyright (C) 2007-2010 Chris Lamb <chris at chris-lamb.co.uk>
 #
 #   This program is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
diff --git a/DebianLive/elements/__init__.py b/DebianLive/elements/__init__.py
index 3af691e..9b915ec 100644
--- a/DebianLive/elements/__init__.py
+++ b/DebianLive/elements/__init__.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #   live-magic - GUI frontend to create Debian LiveCDs, etc.
-#   Copyright (C) 2007-2008 Chris Lamb <chris at chris-lamb.co.uk>
+#   Copyright (C) 2007-2010 Chris Lamb <chris at chris-lamb.co.uk>
 #
 #   This program is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
diff --git a/DebianLive/elements/folder_of_files.py b/DebianLive/elements/folder_of_files.py
index 15f53b9..75bd706 100644
--- a/DebianLive/elements/folder_of_files.py
+++ b/DebianLive/elements/folder_of_files.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #   live-magic - GUI frontend to create Debian LiveCDs, etc.
-#   Copyright (C) 2007-2008 Chris Lamb <chris at chris-lamb.co.uk>
+#   Copyright (C) 2007-2010 Chris Lamb <chris at chris-lamb.co.uk>
 #
 #   This program is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
diff --git a/DebianLive/elements/key_var.py b/DebianLive/elements/key_var.py
index da07832..8b8e2a7 100644
--- a/DebianLive/elements/key_var.py
+++ b/DebianLive/elements/key_var.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #   live-magic - GUI frontend to create Debian LiveCDs, etc.
-#   Copyright (C) 2007-2008 Chris Lamb <chris at chris-lamb.co.uk>
+#   Copyright (C) 2007-2010 Chris Lamb <chris at chris-lamb.co.uk>
 #
 #   This program is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
diff --git a/DebianLive/spec.py b/DebianLive/spec.py
index f537add..1557337 100644
--- a/DebianLive/spec.py
+++ b/DebianLive/spec.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #   live-magic - GUI frontend to create Debian LiveCDs, etc.
-#   Copyright (C) 2007-2008 Chris Lamb <chris at chris-lamb.co.uk>
+#   Copyright (C) 2007-2010 Chris Lamb <chris at chris-lamb.co.uk>
 #
 #   This program is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
diff --git a/DebianLive/utils/__init__.py b/DebianLive/utils/__init__.py
index 4c1d450..7fca1c4 100644
--- a/DebianLive/utils/__init__.py
+++ b/DebianLive/utils/__init__.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #   live-magic - GUI frontend to create Debian LiveCDs, etc.
-#   Copyright (C) 2007-2008 Chris Lamb <chris at chris-lamb.co.uk>
+#   Copyright (C) 2007-2010 Chris Lamb <chris at chris-lamb.co.uk>
 #
 #   This program is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
diff --git a/DebianLive/utils/list_observer.py b/DebianLive/utils/list_observer.py
index 93617d2..d86e971 100644
--- a/DebianLive/utils/list_observer.py
+++ b/DebianLive/utils/list_observer.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #   live-magic - GUI frontend to create Debian LiveCDs, etc.
-#   Copyright (C) 2007-2008 Chris Lamb <chris at chris-lamb.co.uk>
+#   Copyright (C) 2007-2010 Chris Lamb <chris at chris-lamb.co.uk>
 #
 #   This program is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
diff --git a/DebianLive/utils/sources_list.py b/DebianLive/utils/sources_list.py
index 278863d..69edf6f 100644
--- a/DebianLive/utils/sources_list.py
+++ b/DebianLive/utils/sources_list.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #   live-magic - GUI frontend to create Debian LiveCDs, etc.
-#   Copyright (C) 2007-2008 Chris Lamb <chris at chris-lamb.co.uk>
+#   Copyright (C) 2007-2010 Chris Lamb <chris at chris-lamb.co.uk>
 #
 #   This program is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
diff --git a/LiveMagic/__init__.py b/LiveMagic/__init__.py
index 24a5638..172ff20 100644
--- a/LiveMagic/__init__.py
+++ b/LiveMagic/__init__.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #   live-magic - GUI frontend to create Debian LiveCDs, etc.
-#   Copyright (C) 2007-2008 Chris Lamb <chris at chris-lamb.co.uk>
+#   Copyright (C) 2007-2010 Chris Lamb <chris at chris-lamb.co.uk>
 #
 #   This program is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
diff --git a/LiveMagic/controllers/__init__.py b/LiveMagic/controllers/__init__.py
index 0562768..e0f14ba 100644
--- a/LiveMagic/controllers/__init__.py
+++ b/LiveMagic/controllers/__init__.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #   live-magic - GUI frontend to create Debian LiveCDs, etc.
-#   Copyright (C) 2007-2008 Chris Lamb <chris at chris-lamb.co.uk>
+#   Copyright (C) 2007-2010 Chris Lamb <chris at chris-lamb.co.uk>
 #
 #   This program is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
diff --git a/LiveMagic/controllers/build.py b/LiveMagic/controllers/build.py
index a1bbbbf..0636563 100644
--- a/LiveMagic/controllers/build.py
+++ b/LiveMagic/controllers/build.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #   live-magic - GUI frontend to create Debian LiveCDs, etc.
-#   Copyright (C) 2007-2008 Chris Lamb <chris at chris-lamb.co.uk>
+#   Copyright (C) 2007-2010 Chris Lamb <chris at chris-lamb.co.uk>
 #
 #   This program is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
diff --git a/LiveMagic/controllers/main.py b/LiveMagic/controllers/main.py
index 2452d75..2a8a080 100644
--- a/LiveMagic/controllers/main.py
+++ b/LiveMagic/controllers/main.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #   live-magic - GUI frontend to create Debian LiveCDs, etc.
-#   Copyright (C) 2007-2008 Chris Lamb <chris at chris-lamb.co.uk>
+#   Copyright (C) 2007-2010 Chris Lamb <chris at chris-lamb.co.uk>
 #
 #   This program is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
diff --git a/LiveMagic/controllers/wizard.py b/LiveMagic/controllers/wizard.py
index 21a8efa..5a954e9 100644
--- a/LiveMagic/controllers/wizard.py
+++ b/LiveMagic/controllers/wizard.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #   live-magic - GUI frontend to create Debian LiveCDs, etc.
-#   Copyright (C) 2007-2008 Chris Lamb <chris at chris-lamb.co.uk>
+#   Copyright (C) 2007-2010 Chris Lamb <chris at chris-lamb.co.uk>
 #
 #   This program is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
diff --git a/LiveMagic/utils.py b/LiveMagic/utils.py
index 32d8c2c..cb84f97 100644
--- a/LiveMagic/utils.py
+++ b/LiveMagic/utils.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #   live-magic - GUI frontend to create Debian LiveCDs, etc.
-#   Copyright (C) 2007-2008 Chris Lamb <chris at chris-lamb.co.uk>
+#   Copyright (C) 2007-2010 Chris Lamb <chris at chris-lamb.co.uk>
 #
 #   This program is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
diff --git a/LiveMagic/views/__init__.py b/LiveMagic/views/__init__.py
index 0763187..a9131bb 100644
--- a/LiveMagic/views/__init__.py
+++ b/LiveMagic/views/__init__.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #   live-magic - GUI frontend to create Debian LiveCDs, etc.
-#   Copyright (C) 2007-2008 Chris Lamb <chris at chris-lamb.co.uk>
+#   Copyright (C) 2007-2010 Chris Lamb <chris at chris-lamb.co.uk>
 #
 #   This program is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
diff --git a/LiveMagic/views/build.py b/LiveMagic/views/build.py
index 7726be0..0bd751b 100644
--- a/LiveMagic/views/build.py
+++ b/LiveMagic/views/build.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #   live-magic - GUI frontend to create Debian LiveCDs, etc.
-#   Copyright (C) 2007-2008 Chris Lamb <chris at chris-lamb.co.uk>
+#   Copyright (C) 2007-2010 Chris Lamb <chris at chris-lamb.co.uk>
 #
 #   This program is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
diff --git a/LiveMagic/views/main.py b/LiveMagic/views/main.py
index 38e008c..29125d9 100644
--- a/LiveMagic/views/main.py
+++ b/LiveMagic/views/main.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #   live-magic - GUI frontend to create Debian LiveCDs, etc.
-#   Copyright (C) 2007-2008 Chris Lamb <chris at chris-lamb.co.uk>
+#   Copyright (C) 2007-2010 Chris Lamb <chris at chris-lamb.co.uk>
 #
 #   This program is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
diff --git a/LiveMagic/views/wizard.py b/LiveMagic/views/wizard.py
index 58306fe..8d207d4 100644
--- a/LiveMagic/views/wizard.py
+++ b/LiveMagic/views/wizard.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #   live-magic - GUI frontend to create Debian LiveCDs, etc.
-#   Copyright (C) 2007-2008 Chris Lamb <chris at chris-lamb.co.uk>
+#   Copyright (C) 2007-2010 Chris Lamb <chris at chris-lamb.co.uk>
 #
 #   This program is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
@@ -232,7 +232,7 @@ class WizardView(object):
         about = gtk.AboutDialog()
         about.set_name(_("Debian Live Magic"))
         about.set_comments(_("GUI tool to build Debian Live systems."))
-        about.set_copyright("Copyright (C) 2007-2008 Chris Lamb <chris at chris-lamb.co.uk>")
+        about.set_copyright("Copyright (C) 2007-2010 Chris Lamb <chris at chris-lamb.co.uk>")
 
         about.set_website("http://live.debian.net/")
         about.set_website_label(_("Debian Live homepage"))
diff --git a/debian/changelog b/debian/changelog
index 2f61191..89310b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ live-magic (1.12) UNRELEASED; urgency=low
 
   * Make live.debian.net the canonical Git repo for live-magic.
   * Remove a bunch of unused imports.
+  * Update copyright years from 2007-2008 => 2007-2010.
 
  -- Chris Lamb <lamby at debian.org>  Mon, 02 Aug 2010 00:41:11 -0400
 
@@ -117,7 +118,7 @@ live-magic (1.1) unstable; urgency=low
     - Spanish translation by Fabio Balzano. Additional thanks to
       tomas at tuxteam.de and the Spanish language team. (Closes: #496857)
 
- -- Chris Lamb <chris at chris-lamb.co.uk>  Sun, 31 Aug 2008 19:14:41 +0100
+ -- Chris Lamb <lamby at debian.org>  Sun, 31 Aug 2008 19:14:41 +0100
 
 live-magic (1.0) unstable; urgency=low
 
@@ -135,14 +136,14 @@ live-magic (1.0) unstable; urgency=low
     - Russian translation by Yuri Kozlov (Closes: #494500)
     - Swedish translation by Martin Ågren (Closes: #494503)
 
- -- Chris Lamb <chris at chris-lamb.co.uk>  Sun, 24 Aug 2008 00:43:54 +0100
+ -- Chris Lamb <lamby at debian.org>  Sun, 24 Aug 2008 00:43:54 +0100
 
 live-magic (0.7) unstable; urgency=low
 
   * Add d-i integration step which sets LH_DEBIAN_INSTALLER="live"
     (Closes: #492082)
 
- -- Chris Lamb <chris at chris-lamb.co.uk>  Thu, 24 Jul 2008 19:42:35 +0100
+ -- Chris Lamb <lamby at debian.org>  Thu, 24 Jul 2008 19:42:35 +0100
 
 live-magic (0.6) unstable; urgency=medium
 
@@ -151,14 +152,14 @@ live-magic (0.6) unstable; urgency=medium
     we need it as we pass the environment variables we are interested in
     manually. (Closes: #491242)
 
- -- Chris Lamb <chris at chris-lamb.co.uk>  Fri, 18 Jul 2008 13:49:31 +0100
+ -- Chris Lamb <lamby at debian.org>  Fri, 18 Jul 2008 13:49:31 +0100
 
 live-magic (0.5) unstable; urgency=low
 
   * Remove python-gnome2-desktop from Recommends (Closes: #491248)
   * Update package description.
 
- -- Chris Lamb <chris at chris-lamb.co.uk>  Fri, 18 Jul 2008 00:56:49 +0100
+ -- Chris Lamb <lamby at debian.org>  Fri, 18 Jul 2008 00:56:49 +0100
 
 live-magic (0.4) unstable; urgency=low
 
@@ -184,7 +185,7 @@ live-magic (0.4) unstable; urgency=low
   * Prefer cebootstrap in some sitatuions and add to Recommends.
   * Use --ignore-system-defaults option when calling lh_config.
 
- -- Chris Lamb <chris at chris-lamb.co.uk>  Wed, 09 Jul 2008 00:20:04 +0100
+ -- Chris Lamb <lamby at debian.org>  Wed, 09 Jul 2008 00:20:04 +0100
 
 live-magic (0.3-1) unstable; urgency=low
 
@@ -196,16 +197,16 @@ live-magic (0.3-1) unstable; urgency=low
   * Merged a few packaging and typographical errors from Daniel
     Baumann <daniel at debian.org>.
 
- -- Chris Lamb <chris at chris-lamb.co.uk>  Sun, 26 Aug 2007 13:32:00 +0100
+ -- Chris Lamb <lamby at debian.org>  Sun, 26 Aug 2007 13:32:00 +0100
 
 live-magic (0.2-1) unstable; urgency=low
 
   * New upstream release.
 
- -- Chris Lamb <chris at chris-lamb.co.uk>  Thu, 16 Aug 2007 21:35:46 +0100
+ -- Chris Lamb <lamby at debian.org>  Thu, 16 Aug 2007 21:35:46 +0100
 
 live-magic (0.1-1) unstable; urgency=low
 
   * Initial release.
 
- -- Chris Lamb <chris at chris-lamb.co.uk>  Mon, 28 May 2007 12:31:20 +0100
+ -- Chris Lamb <lamby at debian.org>  Mon, 28 May 2007 12:31:20 +0100
diff --git a/live-magic b/live-magic
index cd6021e..9f76003 100755
--- a/live-magic
+++ b/live-magic
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 #
 #   live-magic - GUI frontend to create Debian LiveCDs, etc.
-#   Copyright (C) 2007-2008 Chris Lamb <chris at chris-lamb.co.uk>
+#   Copyright (C) 2007-2010 Chris Lamb <chris at chris-lamb.co.uk>
 #
 #   This program is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
diff --git a/setup.py b/setup.py
index 6492561..65b1130 100755
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 #
 #   live-magic - GUI frontend to create Debian LiveCDs, etc.
-#   Copyright (C) 2007-2008 Chris Lamb <chris at chris-lamb.co.uk>
+#   Copyright (C) 2007-2010 Chris Lamb <chris at chris-lamb.co.uk>
 #
 #   This program is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
diff --git a/tests/test_all.py b/tests/test_all.py
index 37ecb1b..51e43d4 100755
--- a/tests/test_all.py
+++ b/tests/test_all.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 #
 #   live-magic - GUI frontend to create Debian LiveCDs, etc.
-#   Copyright (C) 2007-2008 Chris Lamb <chris at chris-lamb.co.uk>
+#   Copyright (C) 2007-2010 Chris Lamb <chris at chris-lamb.co.uk>
 #
 #   This program is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
diff --git a/tests/test_config.py b/tests/test_config.py
index b0830b6..34d4559 100755
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 #
 #   live-magic - GUI frontend to create Debian LiveCDs, etc.
-#   Copyright (C) 2007-2008 Chris Lamb <chris at chris-lamb.co.uk>
+#   Copyright (C) 2007-2010 Chris Lamb <chris at chris-lamb.co.uk>
 #
 #   This program is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
diff --git a/tests/test_config_constructor.py b/tests/test_config_constructor.py
index a1e6544..54324d7 100755
--- a/tests/test_config_constructor.py
+++ b/tests/test_config_constructor.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 #
 #   live-magic - GUI frontend to create Debian LiveCDs, etc.
-#   Copyright (C) 2007-2008 Chris Lamb <chris at chris-lamb.co.uk>
+#   Copyright (C) 2007-2010 Chris Lamb <chris at chris-lamb.co.uk>
 #
 #   This program is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
diff --git a/tests/test_coverage.py b/tests/test_coverage.py
index 71eaaba..a96269f 100755
--- a/tests/test_coverage.py
+++ b/tests/test_coverage.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 #
 #   live-magic - GUI frontend to create Debian LiveCDs, etc.
-#   Copyright (C) 2007-2008 Chris Lamb <chris at chris-lamb.co.uk>
+#   Copyright (C) 2007-2010 Chris Lamb <chris at chris-lamb.co.uk>
 #
 #   This program is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
diff --git a/tests/test_folder_of_files.py b/tests/test_folder_of_files.py
index 7774a50..a475bf0 100755
--- a/tests/test_folder_of_files.py
+++ b/tests/test_folder_of_files.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 #
 #   live-magic - GUI frontend to create Debian LiveCDs, etc.
-#   Copyright (C) 2007-2008 Chris Lamb <chris at chris-lamb.co.uk>
+#   Copyright (C) 2007-2010 Chris Lamb <chris at chris-lamb.co.uk>
 #
 #   This program is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
diff --git a/tests/test_key_var.py b/tests/test_key_var.py
index 5f6d855..f6a2803 100755
--- a/tests/test_key_var.py
+++ b/tests/test_key_var.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 #
 #   live-magic - GUI frontend to create Debian LiveCDs, etc.
-#   Copyright (C) 2007-2008 Chris Lamb <chris at chris-lamb.co.uk>
+#   Copyright (C) 2007-2010 Chris Lamb <chris at chris-lamb.co.uk>
 #
 #   This program is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
diff --git a/tests/test_sources_list.py b/tests/test_sources_list.py
index 4dc997d..3f8e38d 100755
--- a/tests/test_sources_list.py
+++ b/tests/test_sources_list.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 #
 #   live-magic - GUI frontend to create Debian LiveCDs, etc.
-#   Copyright (C) 2007-2008 Chris Lamb <chris at chris-lamb.co.uk>
+#   Copyright (C) 2007-2010 Chris Lamb <chris at chris-lamb.co.uk>
 #
 #   This program is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by

-- 
live-magic

More information about the debian-live-changes mailing list