[Debconf-video-commits] r705 - in package/trunk: conf conf/dc11 debian

[Ben Hutchings]

Author: benh
Date: 2011-07-23 21:25:30 +0000 (Sat, 23 Jul 2011)
New Revision: 705

Modified:
   package/trunk/conf/dc11/default-barney
   package/trunk/conf/default
   package/trunk/debian/changelog
Log:
Change video file licence to CC-BY 3.0 as agreed

Modified: package/trunk/conf/dc11/default-barney
===================================================================
--- package/trunk/conf/dc11/default-barney	2011-07-23 16:23:15 UTC (rev 704)
+++ package/trunk/conf/dc11/default-barney	2011-07-23 21:25:30 UTC (rev 705)
@@ -1,6 +1,10 @@
 # Name of the location from which we are recording
 CONFERENCE_NAME='DebConf11'
 VENUE_NAME="Banski Dvor, Banja Luka, Bosnia and Herzegovina"
+# Publication details
+PUBLISH_AUTHOR='DebConf video team'
+PUBLISH_ORG='DebConf'
+PUBLISH_LICENSE='CC-BY 3.0: http://creativecommons.org/licenses/by/3.0/'
 # Database access (pygresql)
 DATABASE_DSN="skinner.debconf.org:pentabarf"
 DATABASE_USER=dc7video

Modified: package/trunk/conf/default
===================================================================
--- package/trunk/conf/default	2011-07-23 16:23:15 UTC (rev 704)
+++ package/trunk/conf/default	2011-07-23 21:25:30 UTC (rev 705)
@@ -5,7 +5,7 @@
 # Publication details
 PUBLISH_AUTHOR='DebConf video team'
 PUBLISH_ORG='DebConf'
-PUBLISH_LICENSE='DebConf video licence: http://meetings-archive.debian.net/pub/debian-meetings/LICENCE'
+PUBLISH_LICENSE='CC-BY 3.0: http://creativecommons.org/licenses/by/3.0/'
 # Sources and sinks
 SOURCES="firewire:localhost"
 SINKS="file:localhost"

Modified: package/trunk/debian/changelog
===================================================================
--- package/trunk/debian/changelog	2011-07-23 16:23:15 UTC (rev 704)
+++ package/trunk/debian/changelog	2011-07-23 21:25:30 UTC (rev 705)
@@ -3,6 +3,7 @@
   * Add dc-move-recordings script: moves recordings from mixer to
     file server
   * Define FILE_SERVER configuration variable for dc-move-recordings
+  * Change video file licence to CC-BY 3.0 as agreed
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sat, 23 Jul 2011 18:22:14 +0200