From efb42f4c03f283c200f9b5ee76679b2d067be99d Mon Sep 17 00:00:00 2001 From: Damian Minkov Date: Tue, 16 Sep 2014 13:54:06 +0300 Subject: [PATCH] Fixes debian mentors warnings. --- resources/install/debian/control-src.tmpl | 2 +- resources/install/debian/copyright | 57 ------------------- resources/install/debian/patches/jdk8 | 1 + .../install/debian/patches/removes-gdata-deps | 1 + 4 files changed, 3 insertions(+), 58 deletions(-) diff --git a/resources/install/debian/control-src.tmpl b/resources/install/debian/control-src.tmpl index 660dafd73..d60e9e743 100644 --- a/resources/install/debian/control-src.tmpl +++ b/resources/install/debian/control-src.tmpl @@ -51,7 +51,7 @@ Build-Depends: debhelper (>= 9), javahelper, libphonenumber6-java, libslf4j-java Standards-Version: 3.9.5 -Vcs-Git: git@github.com:jitsi/jitsi.git +Vcs-Git: https://github.com/jitsi/jitsi.git Vcs-Browser: https://github.com/jitsi/jitsi Package: _PACKAGE_NAME_ diff --git a/resources/install/debian/copyright b/resources/install/debian/copyright index 8af953e23..94aa78c7a 100644 --- a/resources/install/debian/copyright +++ b/resources/install/debian/copyright @@ -13,17 +13,7 @@ Copyright: 2006 Stephan Hadinger License: LGPL-2.1 -Files: lib/src/dnsjava-2.1.3/* -Copyright: - 1998-2011 Brian Wellington -License: BSD-2-clause - -Files: lib/src/fmj/* -Copyright: UNKNOWN: -License: LGPL-2 - Files: lib/src/jnsapi/* - lib/src/macwidgets/* lib/src/otr4j/* Copyright: UNKNOWN: License: LGPL-3 @@ -38,58 +28,16 @@ Copyright: 2004 Roger Chen License: Apache-2.0 -Files: lib/src/org.apache.felix.framework-3.2.2/* -Copyright: UNKNOWN: -License: Apache-2.0 - Files: lib/src/jfontchooser/* Copyright: 2004 Tim Eeckhaut License: BSD-3-clause -Files: lib/src/jmdns/* -Copyright: - 2003-2005 Arthur van Hoff, Rick Blair -License: Apache-2.0 - Files: lib/src/joscar/* Copyright: 2004, The Joust Project License: BSD-3-clause -Files: lib/src/jsip/src/gov/* - lib/src/jsip/src/test/* - lib/src/jsip/src/tools/* -Copyright: UNKNOWN: -License: public-domain - This software was developed by employees of the National Institute of - Standards and Technology (NIST), and others. - This software has been contributed to the public domain. - Pursuant to title 15 Untied States Code Section 105, works of NIST - employees are not subject to copyright protection in the United States - and are considered to be in the public domain. - As a result, a formal license is not needed to use this software. - . - This software is provided "AS IS." - NIST MAKES NO WARRANTY OF ANY KIND, EXPRESS, IMPLIED - OR STATUTORY, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTY OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT - AND DATA ACCURACY. NIST does not warrant or make any representations - regarding the use of the software or the results thereof, including but - not limited to the correctness, accuracy, reliability or usefulness of - this software. - -Files: lib/src/bccontrib/* -Copyright: - 2010 Alberto Fajardo and Werner Dittmann - 2004, 2006 Free Software Foundation, Inc. -License: MIT - -Files: lib/src/portaudio/* -Copyright: - 1999-2006 Ross Bencina and Phil Burk -License: MIT - Files: lib/src/smack_src_3_2_2/* Copyright: 2002-2008 Jive Software @@ -100,11 +48,6 @@ Copyright: 2005 Sun Microsystems, Inc. License: LGPL-2.1 -Files: lib/src/weupnp/* -Copyright: - 2008 Alessandro Bahgat Shehata, Daniele Castagna -License: LGPL-2.1 - Files: lib/src/OrangeExtensions/* Copyright: 2010 Yuvi Masory diff --git a/resources/install/debian/patches/jdk8 b/resources/install/debian/patches/jdk8 index 005a5b307..b3b045dd0 100644 --- a/resources/install/debian/patches/jdk8 +++ b/resources/install/debian/patches/jdk8 @@ -1,3 +1,4 @@ +Description: Fixes compilation errors when using jdk8. Index: jitsi/lib/src/java-jml/src/net/sf/jml/message/p2p/MsnFileContextParser.java =================================================================== --- jitsi.orig/lib/src/java-jml/src/net/sf/jml/message/p2p/MsnFileContextParser.java diff --git a/resources/install/debian/patches/removes-gdata-deps b/resources/install/debian/patches/removes-gdata-deps index 2e1e11e62..cfcaf8180 100644 --- a/resources/install/debian/patches/removes-gdata-deps +++ b/resources/install/debian/patches/removes-gdata-deps @@ -1,3 +1,4 @@ +Description: Removes google contacts plugin, from building as currently there is no easy way to compile gdata lib. Index: jitsi/build.xml =================================================================== --- jitsi.orig/build.xml