[SCM] kopete packaging branch, kubuntu_xenial_archive, updated. debian/15.08.3-1-30-g10a4218
Scarlett Clark
sgclark-guest at moszumanska.debian.org
Thu Feb 18 22:29:37 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kopete.git;a=commitdiff;h=10a4218
The following commit has been merged in the kubuntu_xenial_archive branch:
commit 10a4218359a01d943c89bdbdfa29351e4c85639f
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date: Thu Feb 18 14:29:30 2016 -0800
Fix copyright file to subtract duplicate files from catch all.
---
debian/changelog | 1 +
debian/copyright | 9 +++++++++
2 files changed, 10 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index bb65d75..d411eef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
kopete (4:15.12.1-1ubuntu1) UNRELEASED; urgency=medium
* Debian merge: No remaining changes.
+ * Fix copyright file to subtract duplicate files from catch all.
-- Scarlett Clark <sgclark at kubuntu.org> Mon, 08 Feb 2016 17:02:11 -0800
diff --git a/debian/copyright b/debian/copyright
index 1c3da85..4f36713 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -487,6 +487,15 @@ Copyright: 2010, Rion
License: GPL-2+
Files: protocols/jabber/libjingle/*
+ - protocols/jabber/libjingle/talk/third_party/libudev/libudev.h
+ - protocols/jabber/libjingle/talk/base/scoped_ptr.h
+ - protocols/jabber/libjingle/talk/base/base64.h
+ - protocols/jabber/libjingle/talk/base/base64.cc
+ - protocols/jabber/libjingle/talk/base/sigslot.h
+ - protocols/jabber/libjingle/talk/base/sha1.h
+ - protocols/jabber/libjingle/talk/base/sha1.c
+ - protocols/jabber/libjingle/talk/base/md5.h
+ - protocols/jabber/libjingle/talk/base/md5c.c
Copyright: 2003-2012, Google Inc.
License: BSD-3-clause
Redistribution and use in source and binary forms, with or without
--
kopete packaging
More information about the pkg-kde-commits
mailing list