summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2017-01-09 21:11:08 -0700
committerSean Whitton <spwhitton@spwhitton.name>2017-01-09 21:11:08 -0700
commit58904999acb21ea76a19d32948acc032faafa6a7 (patch)
treec4afe79d1a74977d3c1cb22def3ab6fd50c2ed12 /debian
parentf8d8389375ef538c4f38fa1b684ae19238fa826d (diff)
d/copyright updates
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog4
-rw-r--r--debian/copyright27
2 files changed, 28 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index add8399..1a296aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
ebib (2.9-1) UNRELEASED; urgency=medium
* New upstream release.
+ * d/copyright:
+ - Add debian/upstream/changelog to '*' stanza
+ - Add stanza for new org-ebib.el
+ - Bump some copyright years to 2017.
-- Sean Whitton <spwhitton@spwhitton.name> Mon, 09 Jan 2017 21:00:40 -0700
diff --git a/debian/copyright b/debian/copyright
index 8ce0fb1..8767a4f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,12 +2,16 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: Ebib
Source: https://github.com/joostkremers/ebib
-Files: *
-Copyright: (C) 2003-2016 Joost Kremers <joostkremers@fastmail.fm>
+Files: * debian/upstream/changelog
+Copyright: (C) 2003-2017 Joost Kremers <joostkremers@fastmail.fm>
License: BSD-3-clause
+Files: org-ebib.el
+Copyright: (C) 2014-2016 Grégoire Jadi, Joost Kremers
+License: GPL-3+
+
Files: debian/*
-Copyright: (C) 2016 Sean Whitton <spwhitton@spwhitton.name>
+Copyright: (C) 2016-2017 Sean Whitton <spwhitton@spwhitton.name>
License: BSD-3-clause
License: BSD-3-clause
@@ -33,3 +37,20 @@ License: BSD-3-clause
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+License: GPL-3+
+ 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 3 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 program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 3 can be found in "/usr/share/common-licenses/GPL-3