[redeclipse] 489/494: Use Files-Excluded for uscan

Sun Jun 21 20:53:06 UTC 2015

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

arand-guest pushed a commit to branch debdir
in repository redeclipse.

commit fe103cbc91c5a49906fa7098afdac39111f2a191
Author: Martin Erik Werner <martinerikwerner at gmail.com>
Date:   Fri Jun 19 12:46:04 2015 +0200

    Use Files-Excluded for uscan
    
    devscripts 2.14.2 allows uscan to parse Files-Excluded from
    debian/copyright to automatically repack the tarball with exclusions,
    use this instead of manual removals in the rules file. See
    https://wiki.debian.org/UscanEnhancements for details.
    
    * Rewrite debian/generate-copyright to add Files-Excluded to
      debian/copyright and run it to generate the new file (config/* are
      kept manually)
    * Remove manual deletions from debian/rules and adapt to new uscan
      method
---
 changelog          |  1 +
 copyright          | 13 ++++++++++---
 generate-copyright | 22 ++++++++++++++--------
 rules              | 19 +------------------
 4 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/changelog b/changelog
index 4be1bd9..4882832 100644
--- a/changelog
+++ b/changelog
@@ -5,6 +5,7 @@ redeclipse (1.5.2+ds1-1) UNRELEASED; urgency=medium
     doc->data instead of other way around, avoiding §12.3 policy
     semi-violation (file was used but not *needed*).
     - Add system-install-Move-guidelines.txt-to-common-target.patch
+  * Use uscan to repack tarball via Files-Ecluded in debian/copyright
 
  -- Martin Erik Werner <martinerikwerner at gmail.com>  Wed, 22 Apr 2015 21:42:31 +0200
 
diff --git a/copyright b/copyright
index ebe89c3..95a7f69 100644
--- a/copyright
+++ b/copyright
@@ -3,9 +3,15 @@ Upstream-Name: Red Eclipse
 Upstream-Contact: Quinton "Quin" Reeves <qreeves at gmail.com>
                   Lee "Eihrul" Salzman <lsalzman at gmail.com>
 Source: https://github.com/red-eclipse/base
- The folders src/include/ src/xcode/ src/lib/ bin/ are removed, the header
- files here are already shipped within other Debian packages, or are
- unnecessary on GNU/Linux.
+ The following directories/files are removed from the upstream tarball:
+ * bin contains various binaries and helper libs not relevant for Debian,
+   auto-update scripts are kept (though not used in Debian)
+ * data is instead shipped as redeclipse-data in Debian
+ * src/enet is instead shipped as libenet in Debian
+ * src/include contains duplicate headers already in other Debian packages
+ * src/lib contains prebuilt duplicate libs already in other Debian packages
+Files-Excluded: bin/amd64 bin/redeclipse.app bin/tools bin/x86  data
+                src/enet src/include src/lib
 License: Red-Eclipse
  THE RED ECLIPSE LICENSE
  .
@@ -540,3 +546,4 @@ License: Mark-Policy
  If you currently have a product that is using the Red Eclipse marks in a way
  that don't follow this policy, don't panic. Let us know, and we'll work it out,
  as described above.
+
diff --git a/generate-copyright b/generate-copyright
index 80bde0f..085d33c 100755
--- a/generate-copyright
+++ b/generate-copyright
@@ -9,9 +9,15 @@ Upstream-Name: Red Eclipse
 Upstream-Contact: Quinton "Quin" Reeves <qreeves at gmail.com>
                   Lee "Eihrul" Salzman <lsalzman at gmail.com>
 Source: https://github.com/red-eclipse/base
- The folders src/include/ src/xcode/ src/lib/ bin/ are removed, the header
- files here are already shipped within other Debian packages, or are
- unnecessary on GNU/Linux.
+ The following directories/files are removed from the upstream tarball:
+ * bin contains various binaries and helper libs not relevant for Debian,
+   auto-update scripts are kept (though not used in Debian)
+ * data is instead shipped as redeclipse-data in Debian
+ * src/enet is instead shipped as libenet in Debian
+ * src/include contains duplicate headers already in other Debian packages
+ * src/lib contains prebuilt duplicate libs already in other Debian packages
+Files-Excluded: bin/amd64 bin/redeclipse.app bin/tools bin/x86  data
+                src/enet src/include src/lib
 License: Red-Eclipse
 EOF
 
@@ -29,23 +35,23 @@ mv debian/copyright-temp debian/copyright-new
 awk 'BEGIN{ ORS="\n\n"; RS="" ; FS="\n"} $1 !~ /^Files: data\//' debian/copyright-new > debian/copyright-temp
 mv debian/copyright-temp debian/copyright-new
 
-# Remove record for "OFL-1.1" license
+# Remove record for "OFL-1.1" license (data/* content)
 awk 'BEGIN{ ORS="\n\n"; RS="" ; FS="\n"} $1 !~ /^License: OFL-1.1$/' debian/copyright-new > debian/copyright-temp
 mv debian/copyright-temp debian/copyright-new
 
-# Remove record for "CC-BY-3.0" license
+# Remove record for "CC-BY-3.0" license (data/* content)
 awk 'BEGIN{ ORS="\n\n"; RS="" ; FS="\n"} $1 !~ /^License: CC-BY-3.0$/' debian/copyright-new > debian/copyright-temp
 mv debian/copyright-temp debian/copyright-new
 
-# Remove record for "CC-BY-SA-3.0-US" license
+# Remove record for "CC-BY-SA-3.0-US" license (data/* content)
 awk 'BEGIN{ ORS="\n\n"; RS="" ; FS="\n"} $1 !~ /^License: CC-BY-3.0-US$/' debian/copyright-new > debian/copyright-temp
 mv debian/copyright-temp debian/copyright-new
 
-# Remove record for "CC-BY-SA-3.0-AU" license
+# Remove record for "CC-BY-SA-3.0-AU" license (data/* content)
 awk 'BEGIN{ ORS="\n\n"; RS="" ; FS="\n"} $1 !~ /^License: CC-BY-SA-3.0-AU$/' debian/copyright-new > debian/copyright-temp
 mv debian/copyright-temp debian/copyright-new
 
-# Remove record for "Expat" license
+# Remove record for "Expat" license (src/enet/* content)
 awk 'BEGIN{ ORS="\n\n"; RS="" ; FS="\n"} $1 !~ /^License: Expat$/' debian/copyright-new > debian/copyright-temp
 mv debian/copyright-temp debian/copyright-new
 
diff --git a/rules b/rules
index 7bf8451..c36c4bc 100755
--- a/rules
+++ b/rules
@@ -47,22 +47,5 @@ override_dh_compress:
 override_dh_builddeb:
 	dh_builddeb -- -Zxz
 
-DIR=redeclipse-$(DEB_VERSION_UPSTREAM).orig
 get-orig-source:
-	uscan --noconf --rename --force-download --download-current-version --destdir=.
-	rm -rf $(DIR)
-	tar -xf redeclipse_$(DEB_VERSION_UPSTREAM).orig.tar.gz
-	rm -f redeclipse_$(DEB_VERSION_UPSTREAM).orig.tar.gz
-	mv base-$(DEB_VERSION_UPSTREAM)/ $(DIR)
-	rm -rf $(DIR)/src/include/
-	rm -rf $(DIR)/src/enet/
-	rm -rf $(DIR)/src/xcode/
-	rm -rf $(DIR)/src/lib/
-	rm -rf $(DIR)/src/install/win/
-	rm -rf $(DIR)/bin/
-	rm -rf $(DIR)/data/
-	rm -f $(DIR)/*.bat
-	find $(DIR) -type f -iname '.git*' -delete
-	XZ_OPT="-6" tar --create --xz --owner root --group root --mode a+rX \
-		-f redeclipse_$(DEB_VERSION_UPSTREAM).orig.tar.xz $(DIR)
-	rm -rf $(DIR)
+	uscan --noconf --rename --repack --compression xz --force-download --download-current-version --destdir=.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/redeclipse.git

