Merge branch 'quota'

Author: Cristian Cotes

packaging/debian/Makefile

@@ -1,5 +1,6 @@
 PACKAGE_NAME=stacksync
 DIST_DIR=../../target
+RESOURCE_DIR=../../resources
 VERSION=$(shell cat ../../version.properties | grep 'VERSION' | cut -d '=' -f 2)
 VERSION_GIT=$(shell cat ../../version.properties | grep 'VERSION_GIT' | cut -d '=' -f 2)
 INSTALLED_SIZE=$(shell du -sx $(DIST_DIR) | cut -f1)
@@ -23,9 +24,9 @@ package: clean
 	# Copy bin
 	cp utils/stacksync $(PACKAGE_NAME)/usr/bin/
 	# Copy the Dist folder
-	cp -r $(DIST_DIR)/bin/ $(PACKAGE_NAME)/usr/lib/stacksync/
-	cp -r $(DIST_DIR)/conf/ $(PACKAGE_NAME)/usr/lib/stacksync/
-	cp -r $(DIST_DIR)/res/ $(PACKAGE_NAME)/usr/lib/stacksync/
+	cp -r $(RESOURCE_DIR)/bin/ $(PACKAGE_NAME)/usr/lib/stacksync/
+	cp -r $(RESOURCE_DIR)/conf/ $(PACKAGE_NAME)/usr/lib/stacksync/
+	cp -r $(RESOURCE_DIR)/res/ $(PACKAGE_NAME)/usr/lib/stacksync/
 	cp $(DIST_DIR)/desktop-client-$(VERSION_GIT)-jar-with-dependencies.jar $(PACKAGE_NAME)/usr/lib/stacksync/Stacksync.jar
 	#cp $(DIST_DIR)/UpdaterClient.jar $(PACKAGE_NAME)/usr/lib/stacksync/
 	# Copy nautilus extension library

packaging/debian/stacksync/DEBIAN/compat

@@ -4,7 +4,7 @@
     <name>StackSync Desktop Client</name>
     <groupId>com.stacksync</groupId>
     <artifactId>desktop-client</artifactId>
-    <version>2.0</version>
+    <version>2.0.1</version>
     <repositories>
         <repository>
             <id>Sonatype repository</id>
@@ -74,7 +74,7 @@
         <dependency>
             <groupId>com.stacksync</groupId>
             <artifactId>stacksync-commons</artifactId>
-            <version>1.4.1</version>
+            <version>1.4.3</version>
         </dependency>
         <dependency>
             <groupId>objectmq</groupId>
@@ -96,7 +96,7 @@
         <dependency>
             <groupId>java-cloudfiles</groupId>
             <artifactId>java-cloudfiles</artifactId>
-            <version>1.5</version>
+            <version>1.6</version>
         </dependency>
         <!-- SFTP -->
         <dependency>
@@ -134,11 +134,6 @@
             <artifactId>mysql-connector-java</artifactId>
             <version>5.1.24</version>
         </dependency>
-        <dependency>
-            <groupId>com.oogly</groupId>
-            <artifactId>mimemagicidentifier</artifactId>
-            <version>0.1.0</version>
-        </dependency>
         <dependency>
             <groupId>liferay-nativity</groupId>
             <artifactId>liferay-nativity</artifactId>

packaging/debian/stacksync/DEBIAN/control

@@ -77,7 +77,7 @@ public int getSize() {
     public File getCacheChunk(CloneChunk chunk) {
         return new File(String.format(CHUNK_FORMAT,
             folder.getAbsoluteFile(),
-            chunk.getFileName())
+            chunk.getName())
         );
     }