[SCM] UNNAMED PROJECT branch, master, updated. 0.43-1-g79c8bd0

[Niels Thykier]

The following commit has been merged in the master branch:
commit 79c8bd0c01facdc38dd06e0208fd4658c38e6c78
Author: Francesco Poli (wintermute) <invernomuto at paranoici.org>
Date:   Wed Mar 20 14:42:37 2013 +0100

    jh_repack: Fix bug in empty dir removal code
    
    Signed-off-by: Niels Thykier <niels at thykier.net>

diff --git a/debian/changelog b/debian/changelog
index 14186e7..b9b93d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+javatools (0.44) UNRELEASED; urgency=low
+
+  * Fix bug in jh_repack when removing empty directories.
+    Thanks to Francesco Poli for reporting it and writing
+    the patch.  (Closes: #689788)
+
+ -- Niels Thykier <niels at thykier.net>  Wed, 20 Mar 2013 14:40:31 +0100
+
 javatools (0.43) unstable; urgency=low
 
   * Make jh_build pass -source 1.5 by default to javadoc if
diff --git a/jh_repack b/jh_repack
index 806c738..5f3f25d 100755
--- a/jh_repack
+++ b/jh_repack
@@ -66,7 +66,7 @@ for doctree in `find . -name allclasses-frame.html`; do
 TREE="`dirname $doctree`"
 rm -rf "$TREE"/*
 done
-find * -depth -type d -print0 | xargs -0 rmdir -p --ignore-fail-on-non-empty
+find * -depth -type d -print0 | xargs -0 rmdir --ignore-fail-on-non-empty
 
 if [ -n "$SUBDIR" ]; then
 	cd ..

-- 
UNNAMED PROJECT