Hi Ryan,

I have prepared an NMU for inosync. You're listed on the LowThresholdNMU
wiki page and request a 48h pre-notification, so I'm about to upload to
DELAYED/3-days.

Attached is the patch to debian/, the package is based on upstreams git
commit 3fcb5e7d0d93142585193d010f12d1e0890c3b8d of Wed Mar 21 09:15:32
2012 -0700 (later commits break the config file syntax).

This update fixes the bugs in Cc.

Regards,

Carsten

diff -N -ur inosync-0.2.1/debian/changelog inosync-0.2.3+git20120321/debian/changelog
--- inosync-0.2.1/debian/changelog	2016-12-05 10:33:52.000000000 +0100
+++ inosync-0.2.3+git20120321/debian/changelog	2016-12-12 19:18:05.659719740 +0100
@@ -1,3 +1,16 @@
+inosync (0.2.3+git20120321-0.1) unstable; urgency=low
+
+  * Non-maintainer upload
+  * New upstream version (Closes: #734694, #583850)
+  * Refreshed debian patch
+  * Updated control file with new upstream location (Closes: #693716)
+  * Deleted debian/watch, upstream currently doesn't provide tarballs
+  * Switched to source package format 3.0 (quilt)
+  * Bumped Standards-Version to 3.9.8, no changes needed
+  * Bumped debhelper compat level to 10
+
+ -- Carsten Leonhardt <l...@debian.org>  Sun, 11 Dec 2016 15:23:56 +0100
+
 inosync (0.2.1-1) unstable; urgency=low
 
   * New Upstream Version
diff -N -ur inosync-0.2.1/debian/compat inosync-0.2.3+git20120321/debian/compat
--- inosync-0.2.1/debian/compat	2016-12-05 10:33:52.000000000 +0100
+++ inosync-0.2.3+git20120321/debian/compat	2016-12-12 18:15:39.800499784 +0100
@@ -1 +1 @@
-7
+10
diff -N -ur inosync-0.2.1/debian/control inosync-0.2.3+git20120321/debian/control
--- inosync-0.2.1/debian/control	2016-12-05 10:33:52.000000000 +0100
+++ inosync-0.2.3+git20120321/debian/control	2016-12-12 18:37:48.578290569 +0100
@@ -2,16 +2,14 @@
 Section: utils
 Priority: optional
 Maintainer: Ryan Niebur <r...@debian.org>
-Build-Depends: debhelper (>= 7.0.50), quilt (>= 0.46-7)
-Build-Depends-Indep: python (>= 2.4), python-pyinotify (>= 0.8.0), help2man
-Standards-Version: 3.8.3
-Homepage: http://bb.xnull.de/projects/inosync/
-Vcs-Git: git://git.ryan52.info/git/inosync
-Vcs-Browser: http://git.ryan52.info/?p=inosync;a=summary
+Build-Depends: debhelper (>= 10)
+Build-Depends-Indep: python (>= 2.5), python-pyinotify (>= 0.8.7), help2man
+Standards-Version: 3.9.8
+Homepage: https://github.com/hollow/inosync
 
 Package: inosync
 Architecture: all
-Depends: ${misc:Depends}, python (>= 2.4), python-pyinotify (>= 0.8.0), rsync
+Depends: ${misc:Depends}, python (>= 2.5), python-pyinotify (>= 0.8.7), rsync
 Description: notification-based directory synchronization daemon
  The inosync daemon uses the inotify service available in recent Linux
  kernels to monitor and synchronize changes within directories to
diff -N -ur inosync-0.2.1/debian/patches/fix-brokenness inosync-0.2.3+git20120321/debian/patches/fix-brokenness
--- inosync-0.2.1/debian/patches/fix-brokenness	2016-12-05 10:33:52.000000000 +0100
+++ inosync-0.2.3+git20120321/debian/patches/fix-brokenness	2016-12-12 13:02:50.468603314 +0100
@@ -1,6 +1,11 @@
+Description: Fix some breakage
+ add trigger on "modify"
+Author: Ryan Niebur <ryanrya...@gmail.com>
+Reviewed-by: Carsten Leonhardt <l...@debian.org>
+Last-Update: 2016-12-11
 --- a/inosync.py
 +++ b/inosync.py
-@@ -53,7 +53,8 @@
+@@ -39,7 +39,8 @@
      "IN_CREATE",
      "IN_DELETE",
      "IN_MOVED_FROM",
@@ -10,39 +15,22 @@
  ]
  
  class RsyncEvent(ProcessEvent):
-@@ -88,10 +89,10 @@
+@@ -72,7 +73,7 @@
  
    def process_default(self, event):
      syslog(LOG_DEBUG, "caught %s on %s" % \
--        (event.event_name, os.path.join(event.path, event.name)))
--    if not event.event_name in config.emask:
+-        (event.maskname, os.path.join(event.path, event.name)))
 +        (event.maskname, event.pathname))
-+    if not event.maskname in config.emask:
-       syslog(LOG_DEBUG, "ignoring %s on %s" % \
--          (event.event_name, os.path.join(event.path, event.name)))
-+          (event.maskname, event.pathname))
-       return
-     self.dirty = True
+     self.sync()
  
-@@ -197,18 +198,18 @@
-   wm = WatchManager()
-   ev = RsyncEvent(options.pretend)
-   notifier = Notifier(wm, ev)
--  wds = wm.add_watch(config.wpath, EventsCodes.ALL_EVENTS,
-+  wds = wm.add_watch(config.wpath, EventsCodes.ALL_FLAGS['ALL_EVENTS'],
-       rec = True, auto_add = True)
+ def daemonize():
+--- a/sample_config.py
++++ b/sample_config.py
+@@ -29,6 +29,7 @@
+ #	"IN_DELETE",
+ #	"IN_MOVED_FROM",
+ #	"IN_MOVED_TO",
++#	"IN_MODIFY",
+ #]
  
-   syslog(LOG_DEBUG, "starting initial synchronization on %s" % config.wpath)
-   ev.sync()
-   syslog(LOG_DEBUG, "initial synchronization on %s done" % config.wpath)
--
-+  notifier._timeout = 0
-   syslog("resuming normal operations on %s" % config.wpath)
-   while True:
-     try:
-       notifier.process_events()
--      if notifier.check_events(0):
-+      if notifier.check_events():
-         notifier.read_events()
-       ev.sync()
-       sleep(config.edelay)
+ # event delay in seconds (prevents huge amounts of syncs, but dicreases the
diff -N -ur inosync-0.2.1/debian/rules inosync-0.2.3+git20120321/debian/rules
--- inosync-0.2.1/debian/rules	2016-12-05 10:33:52.000000000 +0100
+++ inosync-0.2.3+git20120321/debian/rules	2016-12-05 18:50:28.218013815 +0100
@@ -2,7 +2,7 @@
 # -*- makefile -*-
 
 %:
-	dh --with quilt $@
+	dh $@
 
 inosync:
 	cp inosync.py inosync
diff -N -ur inosync-0.2.1/debian/source/format inosync-0.2.3+git20120321/debian/source/format
--- inosync-0.2.1/debian/source/format	1970-01-01 01:00:00.000000000 +0100
+++ inosync-0.2.3+git20120321/debian/source/format	2016-12-05 18:50:02.898208353 +0100
@@ -0,0 +1 @@
+3.0 (quilt)
diff -N -ur inosync-0.2.1/debian/TODO inosync-0.2.3+git20120321/debian/TODO
--- inosync-0.2.1/debian/TODO	1970-01-01 01:00:00.000000000 +0100
+++ inosync-0.2.3+git20120321/debian/TODO	2016-12-12 18:48:10.409512939 +0100
@@ -0,0 +1,13 @@
+* rsync -lrtp not suffucient for ownership and other things, better use "-a"
+
+* use dh_pyhton2
+
+* consider adding init-scripts (Bug #602375)
+
+* together with init-scripts, add logrotate rules
+  - to /etc/logrotate.d/inosync if necessary
+
+* does not sync on permission changes by default, worth a patch?
+  - can also be changed in the configuration file
+
+* apparently doesn't actually build-depend neither on python nor on python-inotify
diff -N -ur inosync-0.2.1/debian/watch inosync-0.2.3+git20120321/debian/watch
--- inosync-0.2.1/debian/watch	2016-12-05 10:33:52.000000000 +0100
+++ inosync-0.2.3+git20120321/debian/watch	1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-version=3
-http://bb.xnull.de/projects/inosync/dist/ inosync-([\d.]+)\.tar\.bz2

Reply via email to