aboutsummaryrefslogtreecommitdiffstats
path: root/resources/install/debian/patches
diff options
context:
space:
mode:
authorDamian Minkov <damencho@jitsi.org>2014-09-22 09:50:35 +0300
committerDamian Minkov <damencho@jitsi.org>2014-09-22 09:50:35 +0300
commit17f90f7f9a866574137aaa784c7e44f3b52ee075 (patch)
tree61de10c131e9ade4622f7cb5136d19453890ea3d /resources/install/debian/patches
parentb1ac93c6e38746853db4b56ad0d5465f07a7412f (diff)
downloadjitsi-17f90f7f9a866574137aaa784c7e44f3b52ee075.zip
jitsi-17f90f7f9a866574137aaa784c7e44f3b52ee075.tar.gz
jitsi-17f90f7f9a866574137aaa784c7e44f3b52ee075.tar.bz2
Puts back jmork lib in debian src package.
Diffstat (limited to 'resources/install/debian/patches')
-rw-r--r--resources/install/debian/patches/removes-jmork-deps35
-rw-r--r--resources/install/debian/patches/series1
2 files changed, 0 insertions, 36 deletions
diff --git a/resources/install/debian/patches/removes-jmork-deps b/resources/install/debian/patches/removes-jmork-deps
deleted file mode 100644
index bafd109..0000000
--- a/resources/install/debian/patches/removes-jmork-deps
+++ /dev/null
@@ -1,35 +0,0 @@
-Description: Removes thunderbird contacts plugin.
-Index: jitsi/build.xml
-===================================================================
---- jitsi.orig/build.xml
-+++ jitsi/build.xml
-@@ -1090,7 +1090,6 @@
- bundle-plugin-loggingutils,
- bundle-provdisc,bundle-provdisc-dhcp,bundle-provdisc-mdns,
- bundle-provisioning,bundle-addrbook,bundle-plugin-ldap,
-- bundle-thunderbird,
- bundle-plugin-contactsourceconfig,bundle-plugin-certconfig,
- bundle-globalshortcut,bundle-plugin-msofficecomm,bundle-libjitsi,
- bundle-customcontactactions, bundle-phonenumbercontactsource,
-Index: jitsi/lib/felix.client.run.properties
-===================================================================
---- jitsi.orig/lib/felix.client.run.properties
-+++ jitsi/lib/felix.client.run.properties
-@@ -157,8 +157,7 @@ felix.auto.start.66= \
- reference:file:sc-bundles/systray-service.jar \
- reference:file:sc-bundles/osdependent.jar \
- reference:file:sc-bundles/ldap.jar \
-- reference:file:sc-bundles/replacement.jar \
-- reference:file:sc-bundles/jmork.jar
-+ reference:file:sc-bundles/replacement.jar
-
- felix.auto.start.67= \
- reference:file:sc-bundles/globalshortcut.jar \
-@@ -201,7 +200,6 @@ felix.auto.start.67= \
- reference:file:sc-bundles/plugin-nimbuzzavatars.jar \
- reference:file:sc-bundles/chatconfig.jar \
- reference:file:sc-bundles/addrbook.jar \
-- reference:file:sc-bundles/thunderbook.jar \
- reference:file:sc-bundles/plugin-msofficecomm.jar \
- reference:file:sc-bundles/plugin-ldap.jar \
- reference:file:sc-bundles/plugin-contactsourceconfig.jar \
diff --git a/resources/install/debian/patches/series b/resources/install/debian/patches/series
index 6bdfbf1..99d31f7 100644
--- a/resources/install/debian/patches/series
+++ b/resources/install/debian/patches/series
@@ -4,4 +4,3 @@ removes-gdata-deps
encoding.patch
jdk8
bouncycastle-1.51.patch
-removes-jmork-deps