Merge https://github.com/barak/clsync

Conflicts:
	debian/clsync-doc.install
	debian/control
	debian/libclsync0.install
	man/man1/clsync.1

@@ -9,7 +9,7 @@
 /gencompilerflags
 /clsync
 /clsync-debug
-/.libs
+.libs/
 
 #debian:
 /debian/clsync/
@@ -22,7 +22,7 @@
 /debian/clsync-dev/
 /debian/clsync-doc/
 /debian/libclsync-dev/
-/debian/libclsync/
+/debian/libclsync0/
 /debian/patches/
 
 # other:
@@ -43,11 +43,13 @@ to/
 /doc/
 *.swp
 tmp
+/compilerflags.h
+/gencompilerflags
 
 # autotools build debris
-/.deps/
-/Makefile
-/Makefile.in
+.deps/
+Makefile
+Makefile.in
 /aclocal.m4
 /autom4te.cache/
 /compile
@@ -59,8 +61,6 @@ tmp
 /config.cache
 /configure
 /depcomp
-/examples/Makefile
-/examples/Makefile.in
 /install-sh
 /libtool
 /ltmain.sh

-0! [SECURITY] Drop privilegies. Preserve access to files via "capabilites".
+0! [SECURITY] Drop privilegies. Preserve access to files via "capabilities".
 1. Remove pthreads metainfo GC
 2. Replace g_hash_table* with "tsearch" and so on.
 3. Remove all code with "#ifdef DOXYGEN"

-clsync (0.4-1) unstable; urgency=low
+clsync (0.4-1) unstable; urgency=medium
 
+  [ Dmitry Yu Okunev ]
   * A lot of fixes
 
- -- Dmitry Yu Okunev <dyokunev@ut.mephi.ru>  Thu, 6 Nov 2014 10:17:49 +0300
+  [ Barak A. Pearlmutter ]
+  * Merge upstream, in particular debian/ tweaks
+  * don't install compile-time stuff that shouldn't be
+  * bump debian standards version, no changes necessary
+  * update debian/watch file, mangle upstream -rc
+  * update .gitignore
+  * correct some spelling errors
+  * man dash hyphen slash patch
 
-clsync (0.3-1) unstable; urgency=low
+ -- Barak A. Pearlmutter <bap@debian.org>  Fri, 08 May 2015 10:43:41 +0100
 
+clsync (0.3-1) unstable; urgency=medium
+
+  [ Dmitry Yu Okunev ]
   * Added support of control socket
 
- -- Dmitry Yu Okunev <dyokunev@ut.mephi.ru>  Thu, 9 Jan 2014 15:38:33 +0400
+  [ Barak A. Pearlmutter ]
+  * New upstream version
+  * Bump standards version
+  * Remove -*- makefile -*- in debian/rules: defaults to GNUmakefile-mode
+  * Must generate library: ./configure --enable-socket
+  * Fold clsync-dev into libclsync-dev
+  * Address lintian issues
+    - Add appropriate per-binary-package sections
+    - Remove extra LICENSE file
+    - Rename lib package w/ .so suffix "0"
+    - Expand and diversify package descriptions.
+  * Add dependency of lib-dev package upon lib package
+  * Print list of debian/tmp files not installed into any binary package
+  * Install some stray uninstalled files
+    - the actual clsync executable (!)
+    - its man page
+    - some *.h header files
+  * Fold small (14k) clsync-doc package into clsync
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Fri, 06 Jun 2014 09:44:28 +0100
 
 clsync (0.2.1-1) unstable; urgency=low
 

-usr/include/clsync/configuration.h
-usr/include/clsync/clsync.h
-usr/include/clsync/malloc.h
-usr/include/clsync/indexes.h
-usr/include/clsync/ctx.h
-usr/include/clsync/error.h

-usr/share/doc/clsync/CONTRIB
-usr/share/doc/clsync/DEVELOPING
-usr/share/doc/clsync/examples/*
-usr/share/doc/clsync/PROTOCOL
-usr/share/doc/clsync/README.md
-usr/share/doc/clsync/TODO

-usr/bin/clsync
-usr/share/man/man1/clsync.1
+usr/share/man/man1/*.1*
+usr/bin/*
+usr/share/doc/clsync/*

@@ -21,31 +21,9 @@ Description: live sync tool based on inotify, written in GNU C
  features as separate queue for big files, regex file filter,
  multi-threading.
 
-Package: clsync-doc
-Section: doc
-Architecture: any
-Depends: ${misc:Depends}
-Description: examples and other documentation for clsync
- Clsync recursively watches for source directory and executes external
- program to sync the changes. Clsync is adapted to use together with rsync.
- This utility is much more lightweight than competitors and supports such
- features as separate queue for big files, regex file filter,
- multi-threading.
-
-Package: clsync-dev
-Section: libdevel
-Architecture: any
-Depends: ${misc:Depends}
-Description: development files for clsync
- Clsync recursively watches for source directory and executes external
- program to sync the changes. Clsync is adapted to use together with rsync.
- This utility is much more lightweight than competitors and supports such
- features as separate queue for big files, regex file filter,
- multi-threading.
-
 Package: libclsync0
 Architecture: any
-Pre-Depends: multiarch-support
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: clsync control socket library
  Clsync recursively watches for source directory and executes external
@@ -53,14 +31,18 @@ Description: clsync control socket library
  This utility is much more lightweight than competitors and supports such
  features as separate queue for big files, regex file filter,
  multi-threading.
+ .
+ This package contains a shared library to control clsync via socket.
 
 Package: libclsync-dev
 Section: libdevel
 Architecture: any
-Depends: ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, libclsync0 (= ${binary:Version})
 Description: development files for libclsync
  Clsync recursively watches for source directory and executes external
  program to sync the changes. Clsync is adapted to use together with rsync.
  This utility is much more lightweight than competitors and supports such
  features as separate queue for big files, regex file filter,
  multi-threading.
+ .
+ This package contains development files for controlling clsync via socket.

-usr/include/libclsync/socket.h
-usr/include/libclsync/libclsync.h
+usr/include/*/*.h
+usr/lib/*/libclsync*.a
+usr/lib/*/libclsync*.so
+usr/lib/*/pkgconfig/*.pc

-usr/lib/x86_64-linux-gnu/libclsync*

 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -16,8 +10,11 @@ override_dh_auto_configure:
 	dh_auto_configure -- --enable-socket --enable-socket-library --enable-highload-locks
 
 override_dh_auto_install:
-
-#	$(MAKE) DESTDIR=$$(pwd)/debian/clsync prefix=/usr install
 	dh_auto_install
-	sed -i "/dependency_libs/ s/'.*'/''/" `find . -name '*.la'`
-#	-rm --verbose debian/clsync/usr/share/doc/clsync/LICENSE
+	sed -i "/dependency_libs/ s/'.*'/''/" $$(find debian/tmp -name '*.la')
+	-rm --verbose debian/tmp/usr/share/doc/clsync/LICENSE
+	-rm --verbose debian/tmp/usr/bin/gencompilerflags
+	-rm --verbose debian/tmp/usr/include/clsync/compilerflags.h
+
+override_dh_install:
+	dh_install --list-missing

 version=3
-
-http://githubredir.debian.net/github/xaionaro/clsync/ v(.+).tar.gz
+opts="uversionmangle=s/-rc/~rc/" \
+  https://github.com/xaionaro/clsync/tags (?:.*/)?v(.+)\.tar\.gz

@@ -2844,7 +2844,7 @@ int main(int _argc, char *_argv[]) {
 
 
 #ifdef CAPABILITIES_SUPPORT
-	debug(1, "Preserving Linux capabilites");
+	debug(1, "Preserving Linux capabilities");
 
 	// Tell kernel not clear capabilities when dropping root 
 	if (prctl(PR_SET_KEEPCAPS, 1) < 0) {

@@ -391,7 +391,7 @@ int cap_enable(__u32 caps) {
 
 	cap_hdr.version = _LINUX_CAPABILITY_VERSION;
 	if (capget(&cap_hdr, &cap_dat) < 0) {
-		error("Cannot get capabilites with capget()");
+		error("Cannot get capabilities with capget()");
 		return errno;
 	}
 
@@ -407,14 +407,14 @@ int cap_enable(__u32 caps) {
 }
 
 int cap_drop(ctx_t *ctx_p, __u32 caps) {
-	debug(1, "Dropping all Linux capabilites but 0x%x", caps);
+	debug(1, "Dropping all Linux capabilities but 0x%x", caps);
 
 	struct __user_cap_header_struct	cap_hdr = {0};
 	struct __user_cap_data_struct	cap_dat = {0};
 
 	cap_hdr.version = _LINUX_CAPABILITY_VERSION;
 	if (capget(&cap_hdr, &cap_dat) < 0) {
-		error_or_debug((ctx_p->flags[CAP_PRESERVE] != CAP_PRESERVE_TRY) ? -1 : 3, "Cannot get capabilites with capget()");
+		error_or_debug((ctx_p->flags[CAP_PRESERVE] != CAP_PRESERVE_TRY) ? -1 : 3, "Cannot get capabilities with capget()");
 		return errno;
 	}
 	debug(3, "old: cap.eff == 0x%04x; cap.prm == 0x%04x; cap.inh == 0x%04x.",