[debian-edu-commits] debian-edu/ 01/05: Fix orig tarball creation, don't redundantly package tar-up subfolders. Only include symlinks and files into the tarball. Let the tar tool auto-create the relevant directories.

[Mike Gabriel]

This is an automated email from the git hooks/post-receive script.

sunweaver pushed a commit to branch master
in repository debian-edu-artwork.

commit 34d90f973709eb734f04da2125b64d9602417a30
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Oct 7 12:41:27 2014 +0200

    Fix orig tarball creation, don't redundantly package tar-up subfolders. Only include symlinks and files into the tarball. Let the tar tool auto-create the relevant directories.
---
 debian/changelog | 4 +++-
 debian/rules     | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9cf7bd4..64f002b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -49,11 +49,13 @@ debian-edu-artwork (0.49-1) UNRELEASED; urgency=medium
   * debian/rules:
     + Provide get-orig-source rule that builds an orig tarball from the
       package folder itself (excluding the debian/ directory).
+    + Fix orig tarball creation, don't redundantly package tar-up
+      subfolders. Only include symlinks and files into the tarball.
+      Let the tar tool auto-create the relevant directories.
 
   [ Holger Levsen ]
   * Switch to debian/source/format 3.0 (quilt), enable xz compression.
   * debian/rules:
-    - fix get-orig-source target to create a compressed tar archive.
     - rename get-orig-source target to new-upstream-version to match
       README.source.
     - set DEB_DH_BUILDDEB_ARGS to use .xz compression for binary packages too.
diff --git a/debian/rules b/debian/rules
index 6b232c8..26bff93 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,6 +27,6 @@ install/debian-edu-artwork-lines::
 new-upstream-version: clean
 	mkdir -p $(PKG)-$(UVER)/
 	rsync -av --delete --exclude=debian/ --exclude=$(PKG)-$(UVER)/ * $(PKG)-$(UVER)/
-	find "$(PKG)-$(UVER)" -xdev -print | sort \
+	find "$(PKG)-$(UVER)" -xdev \( -type f -o -type l \) -print| sort \
 	    | tar -cJaf "../$(PKG)_$(UVER).orig.tar.xz" -T- --owner=root --group=root --mode=a+rX \
 	    && $(RM) -r "$(PKG)-$(UVER)"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-artwork.git