Skip to content

Commit

Permalink
Fixed copyright and control
Browse files Browse the repository at this point in the history
  • Loading branch information
Andrea CAPRIOTTI committed Oct 18, 2016
1 parent 41b70f0 commit b67722f
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 62 deletions.
4 changes: 2 additions & 2 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Vcs-Browser: http://anonscm.debian.org/gitweb?p=collab-maint/autoradio.git;a=sum

Package: autoradio
Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, sqlite3, speex, python, python-reportlab (>=2.0) , python-configobj, python-django (>=1.7.0) , python-django-extensions , python-mutagen (>=1.17) , python-dbus, python-magic, python-cherrypy, python-docutils, python-pil, python-six, python-gst-1.0, libjs-jquery, libjs-swfobject, libcortado-java, gstreamer1.0-plugins-base, gstreamer1.0-plugins-good, gstreamer1.0-plugins-bad
Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, sqlite3, speex, python, python-reportlab (>=2.0) , python-configobj, python-django (>=1.7.0) , python-django-extensions , python-mutagen (>=1.17) , python-dbus, python-magic, python-cherrypy, python-docutils, python-pil, python-six, python-gst-1.0, libjs-jquery, libjs-swfobject, libcortado-java, gstreamer1.0-plugins-base, gstreamer1.0-plugins-good
Description: radio automation software
Simple to use, starting from digital audio
files, manage on-air broadcasting over a radio-station or
Expand All @@ -24,7 +24,7 @@ Description: radio automation software
like jingles, spots, playlist and programs; interact with player
like supervisor User
.
* inteface: WEB interface to monitor the player and scheduler and
* Interface: WEB interface to monitor the player and scheduler and
admin the schedules for the complete control over your station
format. The web interface allows you to easily publish podcasts
that conform to the RSS 2.0 and iTunes RSS podcast specifications
Expand Down
85 changes: 25 additions & 60 deletions debian/copyright
Original file line number Diff line number Diff line change
@@ -1,51 +1,14 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: autoradio
Source: http://sourceforge.net/projects/autoradiobc/
Source: https://github.com/pat1/autoradio/

Files: *
Copyright: 2007-2014 Paolo Patruno [email protected]
Copyright: 2007-2016 Paolo Patruno [email protected]
License: GPL-2+
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 the Free Software Foundation; either
version 2 of the License, or (at your option) any later
version.
.
This program is distributed in the hope that it will be
useful, but WITHOUT ANY WARRANTY; without even the implied
warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the GNU General Public License for more
details.
.
You should have received a copy of the GNU General Public
License along with this package; if not, write to the Free
Software Foundation, Inc., 51 Franklin St, Fifth Floor,
Boston, MA 02110-1301 USA
.
On Debian systems, the full text of the GNU General Public
License version 2 can be found in the file
`/usr/share/common-licenses/GPL-2'.

# If you want to use GPL v2 or later for the /debian/* files use
# the following clauses, or change it to suit. Delete these two lines
Files: debian/*
Copyright: 2014 Andrea Capriotti <[email protected]>
Copyright: 2016 Andrea Capriotti <[email protected]>
License: GPL-2+
This package 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
(at your option) any later version.
.
This package is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>
.
On Debian systems, the complete text of the GNU General
Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".

Files: autoradio/mpris2/*
Copyright: Copyright 2010 Alex Merry
Expand All @@ -72,26 +35,6 @@ Files: autoradio/dir2ogg.py
Copyright: 2007-2009 Julian Andres Klode <[email protected]>
2003-2006 Darren Kirby <[email protected]>
License: GPL-2+
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 the Free Software Foundation; either
version 2 of the License, or (at your option) any later
version.
.
This program is distributed in the hope that it will be
useful, but WITHOUT ANY WARRANTY; without even the implied
warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the GNU General Public License for more
details.
.
You should have received a copy of the GNU General Public
License along with this package; if not, write to the Free
Software Foundation, Inc., 51 Franklin St, Fifth Floor,
Boston, MA 02110-1301 USA
.
On Debian systems, the full text of the GNU General Public
License version 2 can be found in the file
`/usr/share/common-licenses/GPL-2'.

Files: autoradio/daemon.py
Copyright: 1999-2009 by LivingLogic AG, Bayreuth/Germany
Expand All @@ -117,3 +60,25 @@ License: MIT
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.

License: GPL-2+
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 the Free Software Foundation; either
version 2 of the License, or (at your option) any later
version.
.
This program is distributed in the hope that it will be
useful, but WITHOUT ANY WARRANTY; without even the implied
warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the GNU General Public License for more
details.
.
You should have received a copy of the GNU General Public
License along with this package; if not, write to the Free
Software Foundation, Inc., 51 Franklin St, Fifth Floor,
Boston, MA 02110-1301 USA
.
On Debian systems, the full text of the GNU General Public
License version 2 can be found in the file
`/usr/share/common-licenses/GPL-2'.

0 comments on commit b67722f

Please sign in to comment.