[SCM] rocs packaging branch, kubuntu_vivid_archive, updated. debian/14.12.2-1-6-gc9ad6c8

[Scarlett Clark]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/rocs.git;a=commitdiff;h=c9ad6c8

The following commit has been merged in the kubuntu_vivid_archive branch:
commit c9ad6c8cde3efa6e4851082835bb96dc7889d53e
Merge: 9da0c0bb7b4719a18e173c984ffd7ac771001412 72af3a80fdaf0510cfe3bfaec682135d3481cca6
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Fri Mar 13 20:52:27 2015 -0700

    Merge remote-tracking branch 'origin/kubuntu_unstable' into kubuntu_vivid_archive
    manual merge

 debian/control                |  25 +++++++---
 debian/copyright              |   3 +-
 debian/not-installed          |   9 ++--
 debian/rocs.install           | 113 ++----------------------------------------
 debian/rocs.lintian-overrides |   2 +-
 debian/rules                  |   5 +-
 6 files changed, 31 insertions(+), 126 deletions(-)

-- 
rocs packaging