[SCM] UNNAMED PROJECT branch, master, updated. 0.37-3-g2caebc1

[Niels Thykier]

The following commit has been merged in the master branch:
commit 2caebc180c8466d3cc6a652f8b8e1e2eba43329f
Author: Niels Thykier <niels at thykier.net>
Date:   Tue Oct 25 12:33:03 2011 +0200

    Fixed the "find" expressions in jh_repack to only remove files
    
    Also check subdirs first when trying to remove empty dirs.
    
    Signed-off-by: Niels Thykier <niels at thykier.net>

diff --git a/debian/changelog b/debian/changelog
index aeed15c..c485899 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ javatools (0.38) UNRELEASED; urgency=low
 
   * Added missing empty line the in d/control generated by jh_makepkg
   * Bumped debhelper compat to 8 in packages generated by jh_makepkg
+  * Fixed the "find" expressions in jh_repack to only remove files
+    named "*.jar" or "*.class".  Thanks to Andrew Ross for the report.
+    (Closes: #646514)
 
  -- Niels Thykier <niels at thykier.net>  Mon, 11 Jul 2011 15:20:40 +0200
 
diff --git a/jh_repack b/jh_repack
index 6524bed..806c738 100755
--- a/jh_repack
+++ b/jh_repack
@@ -58,15 +58,15 @@ if [ "`ls -1 | wc -l`" = "1" ]; then
 	SUBDIR=true
 fi
 
-find . -name '*.class' -print0 | xargs -0 rm -f
-find . -name '*.jar' -print0 | xargs -0 rm -f
+find . -name '*.class' -a -type f -print0 | xargs -0 rm -f
+find . -name '*.jar' -a -type f -print0 | xargs -0 rm -f
 IFS='
 '
 for doctree in `find . -name allclasses-frame.html`; do
 TREE="`dirname $doctree`"
 rm -rf "$TREE"/*
 done
-find * -type d -print0 | xargs -0 rmdir -p --ignore-fail-on-non-empty
+find * -depth -type d -print0 | xargs -0 rmdir -p --ignore-fail-on-non-empty
 
 if [ -n "$SUBDIR" ]; then
 	cd ..

-- 
UNNAMED PROJECT