commit ddd731eaa67e55a90b61172d00d9fb5cce1c54af
author Alexandre Lision <alexandre.lision@savoirfairelinux.com> Fri Jan 31 11:50:08 2014 -0500
committer Alexandre Lision <alexandre.lision@savoirfairelinux.com> Fri Jan 31 11:50:08 2014 -0500
tree 011b1c3624dde7b18f6ea7703b2fc4da2dc31fa7
parent 64efcc913260882490aaa6e7c9773e3e74de60e4

Switch commoncpp2 to ucommon to solve dependency conflicts.

libccrtp was depending on commoncpp2, and have been replaced by a version
depending on ucommon as well.

jni/libzrtp/sources/cmake/Modules/GeneratePackage.cmake

diff --git a/jni/libzrtp/sources/cmake/Modules/GeneratePackage.cmake b/jni/libzrtp/sources/cmake/Modules/GeneratePackage.cmake
index 506b224..0eef52f 100644
--- a/jni/libzrtp/sources/cmake/Modules/GeneratePackage.cmake
+++ b/jni/libzrtp/sources/cmake/Modules/GeneratePackage.cmake
@@ -23,7 +23,7 @@
   # others
   "\\\\.#"
   "/#"
-  "/build*"
+  "/build/"
   "/autom4te\\\\.cache/"
   "/_build/"
   "/doc/html/"
@@ -37,9 +37,6 @@
   "\\\\.la$"
   "\\\\.sh$"
   "Makefile\\\\.in$"
-  "\\\\.directory$"
-  "\\\\._.DS_Store$"
-  "\\\\._buildmac$"
   )
 
   SET(CPACK_PACKAGE_VENDOR "Werner Dittmann")