The following commit has been merged in the master branch:
commit 5dfa6f7c1f28dcf1e56e7b69d75409c3e755ea31
Author: Gabriele Giacone <[email protected]>
Date: Mon Oct 1 14:45:24 2012 +0200
get-orig-source: minor changes
diff --git a/debian/rules b/debian/rules
index 681be50..a06d87c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,6 @@
VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f2 -d' ' |
cut -f1 -d+)
JARFILE := install/sweethome3d.jar
-TMPDIR := get-orig-source-tmp
ICONS := debian/icons
ABOUT := src/com/eteks/sweethome3d/swing/resources/aboutIcon.png
export JAVA_HOME=/usr/lib/jvm/default-java
@@ -35,20 +34,24 @@ override_dh_auto_clean:
rm -rf $(JARFILE) $(ICONS)
dh_clean
-SRCDIR=SweetHome3D-$(VERSION)-src
+TMPDIR=get-orig-source-tmp
+SRCDIR=$(TMPDIR)/SweetHome3D-$(VERSION)-src
+EXCLUDES=*.jar *.so *.jnilib *.dll *.zip
get-orig-source:
- uscan --verbose --download-version $(VERSION) --force-download --repack
--rename
- -mkdir -p $(TMPDIR) && tar -C $(TMPDIR) -zxf
../sweethome3d_$(VERSION).orig.tar.gz
- rm -f ../sweethome3d_$(VERSION).orig.tar.gz
+ mkdir -p $(TMPDIR)
+ uscan --download-version $(VERSION) --force-download --destdir $(TMPDIR)
+ unzip -q $(TMPDIR)/*.zip -d$(TMPDIR); rm -f $(TMPDIR)/*.zip
@echo "Getting ChangeLog from SW3D site..."
lynx -dump -nolist http://www.sweethome3d.com/history.jsp| \
- sed -n 's/\[.*\]//g;/Version history/,/December 2006/p'
>$(TMPDIR)/$(SRCDIR)/ChangeLog
- @echo "To comply with DFSG, the following files will be removed from
tarball:"
- @cd $(TMPDIR) && find $(SRCDIR) -name '*.jar' -o -name '*.so' -o -name
'*.jnilib' -o -name '*.dll' \
- -o -name '*.zip' -o -path
'*/src/com/eteks/sweethome3d/io/resources/contributions/*' \
- -o -name JPEGImagesToVideo.java |sort|cut -d/ -f2-|awk '{print
" - "$$0}'
- cd $(TMPDIR) && tar --exclude *.jar --exclude *.so --exclude *.jnilib
--exclude *.dll \
- --exclude *.zip --exclude
src/com/eteks/sweethome3d/io/resources/contributions \
+ sed -n 's/\[.*\]//g;/Version history/,/December 2006/p'
>$(SRCDIR)/ChangeLog
+
+ @echo "\nTo comply with DFSG, the following files will be removed from
tarball:"
+ @find $(SRCDIR) $(foreach pattern,$(EXCLUDES),-name '$(pattern)' -o) \
+ -path
'*/src/com/eteks/sweethome3d/io/resources/contributions/*' -o \
+ -name JPEGImagesToVideo.java| \
+ sort|cut -d/ -f3-|awk '{print " - "$$0}'
+ cd $(TMPDIR); tar $(foreach pattern,$(EXCLUDES),--exclude $(pattern)) \
+ --exclude src/com/eteks/sweethome3d/io/resources/contributions \
--exclude JPEGImagesToVideo.java \
- -Jcf ../../sweethome3d_$(VERSION)+dfsg.orig.tar.xz $(SRCDIR)
+ -Jcf ../../sweethome3d_$(VERSION)+dfsg.orig.tar.xz *-src
rm -rf $(TMPDIR)
--
sweethome3d - Interior 2D design application with 3D preview
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
