[Pkg-owncloud-commits] [SCM] owncloud-client.git branch, master, updated. upstream/1.1.4-23-g82376b3

[Sandro Knauß]

The following commit has been merged in the master branch:
commit 82376b3beb0678c6c53fee58d18d0b0224cf874b
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Sun Jan 13 17:48:12 2013 +0100

    plitting package to mirall, mirall-doc and owncloud-client

diff --git a/debian/control b/debian/control
index 2b9f043..cc2fd15 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,9 @@ Section: net
 Priority: optional
 Maintainer: ownCloud for Debian maintainers <pkg-owncloud-maintainers at lists.alioth.debian.org>
 Uploaders: Thomas Mueller <thomas.mueller at tmit.eu>, Paul van Tilburg <paulvt at debian.org>
-Build-Depends: debhelper (>= 9), cmake, libqt4-dev (>= 4.7), libocsync-dev (>= 0.60.4),
- python-sphinx, texlive-latex-recommended, texlive-latex-extra, texlive-fonts-recommended
+Build-Depends: debhelper (>= 9), cmake, libqt4-dev (>= 4.7), libocsync-dev (>= 0.60.4), libocsync-dev(<< 0.70.0),
+ python-sphinx (>= 1.0.7+dfsg) | python3-sphinx, texlive-latex-recommended, texlive-latex-extra, texlive-fonts-recommended,
+ qt4-dev-tools,  kdelibs5-dev
 Vcs-Git: git://git.debian.org/git/pkg-owncloud/owncloud-client.git
 Vcs-browser: http://git.debian.org/?p=pkg-owncloud/owncloud-client.git
 Standards-Version: 3.9.3
@@ -12,17 +13,33 @@ Homepage: http://owncloud.org/dev/sync-clients/linux-build/
 
 Package: owncloud-client
 Architecture: any 
-Depends: ${misc:Depends}, ${shlibs:Depends}, oxygen-icon-theme, libocsync-plugin-owncloud (>= 0.60.4)
+Depends: ${misc:Depends}, ${shlibs:Depends}, mirall (= ${binary:Version}), libocsync-plugin-owncloud
 Description: GUI app to sync a folder to ownCloud
  GUI to sync your local folders with an ownCloud server.
 
-Package: owncloud-client-doc
+Package: mirall
+Architecture: any 
+Depends: ${misc:Depends}, ${shlibs:Depends}, oxygen-icon-theme, libocsync0 (>= 0.60.4), libocsync0 (<< 0.70.0)
+Description: GUI to synchronize your folders.
+ The ultimate goals of Mirall are:
+ .
+   * Network location aware: should not try to sync against your NAS if you are
+     not in the home network
+   * It is a zero-interaction tool. So forget about resolving conflicts.
+   * It should work silently and realiably.
+     File synchronisation desktop utility.
+
+Package: mirall-doc
 Architecture: all 
-Multi-Arch: foreign
 Depends: ${misc:Depends}, ${sphinxdoc:Depends}
-Pre-Depends: ${misc:Pre-Depends}
 Section: doc
-Description: GUI app to sync a folder to ownCloud (documentation)
- GUI to sync your local folders with an ownCloud server.
+Description: GUI to synchronize your folders (documentation)
+ The ultimate goals of Mirall are:
+ .
+   * Network location aware: should not try to sync against your NAS if you are
+     not in the home network
+   * It is a zero-interaction tool. So forget about resolving conflicts.
+   * It should work silently and realiably.
+     File synchronisation desktop utility.
  .
  These are the Documenation files.
diff --git a/debian/mirall-doc.doc-base b/debian/mirall-doc.doc-base
new file mode 100644
index 0000000..9ad7a7e
--- /dev/null
+++ b/debian/mirall-doc.doc-base
@@ -0,0 +1,25 @@
+Document: mirall
+Title: ownCloud Desktop Client Manual
+Author: ownCloud developers
+Abstract: Mirall synchronizes your folders with another computer.
+ .
+ The ultimate goals of Mirall are:
+ .
+ * Network location aware: should not try to sync against your NAS if you are
+   not in the home network
+ * It is a zero-interaction tool. So forget about resolving conflicts.
+ * It should work silently and realiably.
+ .
+ Mirall is in early stages of development, and may still eat your
+ files or hang your computer.
+ .
+ * Network location awareness not implemented yet
+ * Current version supports local and remote (sftp and smb) folders.
+ * It is powered by csync (http://www.csync.org), however
+   the user does not know and other tools will be incorporated to provide other
+   functionality.
+Section: Network/File Transfer
+
+Format: HTML
+Index: /usr/share/doc/mirall-doc/html/index.html
+Files: /usr/share/doc/mirall-doc/html/*.html
diff --git a/debian/mirall-doc.docs b/debian/mirall-doc.docs
new file mode 100644
index 0000000..ea67e12
--- /dev/null
+++ b/debian/mirall-doc.docs
@@ -0,0 +1,2 @@
+debian/tmp/usr/share/doc/mirall/html
+debian/tmp/usr/share/doc/mirall/latex
diff --git a/debian/mirall-doc.links b/debian/mirall-doc.links
new file mode 100644
index 0000000..6387700
--- /dev/null
+++ b/debian/mirall-doc.links
@@ -0,0 +1 @@
+usr/share/doc/mirall-doc/html/_images/branding_setup.png usr/share/doc/mirall-doc/latex/branding_setup.png
diff --git a/debian/owncloud-client.docs b/debian/mirall.docs
similarity index 100%
copy from debian/owncloud-client.docs
copy to debian/mirall.docs
diff --git a/debian/mirall.install b/debian/mirall.install
new file mode 100644
index 0000000..2321a21
--- /dev/null
+++ b/debian/mirall.install
@@ -0,0 +1,5 @@
+usr/lib/libmirallsync.so
+etc/owncloud
+usr/bin/mirall
+usr/share/mirall/i18n
+usr/share/icons/*/*/apps/mirall.png
diff --git a/debian/owncloud-client-doc.docs b/debian/owncloud-client-doc.docs
deleted file mode 100644
index fbd19b7..0000000
--- a/debian/owncloud-client-doc.docs
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/share/doc/mirall/*
diff --git a/debian/owncloud-client.install b/debian/owncloud-client.install
index 64663a3..184d089 100644
--- a/debian/owncloud-client.install
+++ b/debian/owncloud-client.install
@@ -1,6 +1,4 @@
 usr/lib/libowncloudsync.so
-etc/
 usr/bin/owncloud
-usr/share/mirall/i18n/
 usr/share/icons/*/*/apps/owncloud.png
 debian/extrafiles/owncloud-client.desktop usr/share/applications/
diff --git a/debian/rules b/debian/rules
index 1dcfb5c..c57b214 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,4 +6,4 @@ export CSYNC_DIR=/usr/include/ocsync
 	dh $@ --with sphinxdoc
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_SYSCONFDIR=/etc/ownCloud
+	dh_auto_configure -- -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_SYSCONFDIR=/etc/owncloud

-- 
owncloud-client.git