aboutsummaryrefslogtreecommitdiffstats
path: root/resources/install
diff options
context:
space:
mode:
authorDamian Minkov <damencho@jitsi.org>2014-09-17 23:23:14 +0300
committerDamian Minkov <damencho@jitsi.org>2014-09-18 09:27:03 +0300
commitd61212ed58952029897c740462b7f13cc0958601 (patch)
treef872d11914a480fe3eb48d2a55bc34c44b1c2274 /resources/install
parent5275b1329eecf03a542d8b0d9614103de0d348fe (diff)
downloadjitsi-d61212ed58952029897c740462b7f13cc0958601.zip
jitsi-d61212ed58952029897c740462b7f13cc0958601.tar.gz
jitsi-d61212ed58952029897c740462b7f13cc0958601.tar.bz2
Removes conflicts state in debian control file.
Diffstat (limited to 'resources/install')
-rw-r--r--resources/install/debian/control-src.tmpl1
1 files changed, 0 insertions, 1 deletions
diff --git a/resources/install/debian/control-src.tmpl b/resources/install/debian/control-src.tmpl
index 2e74fcd..b981e37 100644
--- a/resources/install/debian/control-src.tmpl
+++ b/resources/install/debian/control-src.tmpl
@@ -97,7 +97,6 @@ Description: VoIP and Instant Messaging client
Package: _PACKAGE_NAME_-jni
Replaces: libjitsi-jni (<< 415)
-Conflicts: libjitsi-jni (<< 415)
Section: libs
Architecture: amd64 i386
Depends: ${misc:Depends}, ${shlibs:Depends}