[debian-edu-commits] debian-edu/pkg-team/ 114/159: repack for DFSG, for now

[Dominik George]

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

natureshadow-guest pushed a commit to branch master
in repository xrdp.

commit b918b7993eb43afbf8d25d880835c2a3a0a388b7
Author: mirabilos <tg at mirbsd.org>
Date:   Sun Aug 30 18:53:39 2015 +0000

    repack for DFSG, for now
---
 README.source | 11 +++++++++--
 changelog     |  6 ++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/README.source b/README.source
index 6b3fd4f..d308b16 100644
--- a/README.source
+++ b/README.source
@@ -3,8 +3,14 @@ origtgz:
 - $ git checkout upstream/devel
 - (check that the submodules are up-to-date)
 - $ cd ..
-- $ find xrdp -type f | fgrep -v /.git/ | sort | paxcpio \
-    -oC512 -Hustar -Mdist | xz -e >xrdp_0.9.0~gitYYYYMMDD.orig.tar.xz
+- $ v='0.9.0~git'$(date +%Y%m%d) && find xrdp -type f -print0 | \
+    grep -Fvz -e /.git/ -e xorg/tests/xdemo/yosemite.bmp | sort -z | \
+    pax -w -0 -b 512 -M norm -s "!^xrdp/!xrdp-$v/!" -x ustar | \
+    xz -e >xrdp_$v+dfsg.orig.tar.xz
+
+We don’t provide a get-orig-source target because submodules
+don’t work with git-archive, and the manual checkout + find
+way doesn’t work well automatedly either.
 
 TODO:
 
@@ -14,6 +20,7 @@ TODO:
 
 - replace xorg/tests/xdemo/yosemite.bmp
   ⇒ fed upstream
+  ⇒ excluded in DFSG distfile
 
 - move from non-free to main
 
diff --git a/changelog b/changelog
index 39ebc81..e6cc729 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+xrdp (0.9.0~git20150830+dfsg-1~beta1) teckids; urgency=high
+
+  * Repack to omit remaining non-DFSG-free file until resolved upstream
+
+ -- Thorsten Glaser <thorsten.glaser at teckids.org>  Sun, 30 Aug 2015 18:52:45 +0000
+
 xrdp (0.9.0~git20150826-1~alpha3) teckids; urgency=medium
 
   * Foreground xrdp-sesman as well; partially unbreak /var/run/xrdp

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