[SCM] kopete packaging branch, kubuntu_xenial_archive, updated. debian/15.08.3-1-31-gb9e41eb
Scarlett Clark
sgclark-guest at moszumanska.debian.org
Mon Feb 22 17:02:13 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kopete.git;a=commitdiff;h=b9e41eb
The following commit has been merged in the kubuntu_xenial_archive branch:
commit b9e41eb94adc040231e3e8f0a4d757889237872a
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date: Mon Feb 22 09:01:50 2016 -0800
Revert last commit, new lintain error. According to docs original format should have been fine.
---
debian/changelog | 2 ++
debian/copyright | 9 ---------
2 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d411eef..b64b0ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ kopete (4:15.12.1-1ubuntu1) UNRELEASED; urgency=medium
* Debian merge: No remaining changes.
* Fix copyright file to subtract duplicate files from catch all.
+ * Revert last commit, new lintain error. According
+ to docs original format should have been fine.
-- Scarlett Clark <sgclark at kubuntu.org> Mon, 08 Feb 2016 17:02:11 -0800
diff --git a/debian/copyright b/debian/copyright
index 4f36713..1c3da85 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -487,15 +487,6 @@ 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