[libpdfbox-java] 01/07: Clean the upstream tarball using the Files-Excluded field in debian/copyright

Wed Nov 18 18:24:56 UTC 2015

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

ebourg-guest pushed a commit to branch master
in repository libpdfbox-java.

commit 826d42923a77e8933854283f047635511908a371
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Nov 18 16:25:40 2015 +0100

    Clean the upstream tarball using the Files-Excluded field in debian/copyright
---
 debian/changelog    |  2 ++
 debian/copyright    | 17 ++++++-----
 debian/repack.local |  2 --
 debian/repack.stub  | 88 -----------------------------------------------------
 debian/rules        |  1 +
 debian/watch        |  2 +-
 6 files changed, 13 insertions(+), 99 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 47396f6..e795932 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ libpdfbox-java (1:1.8.7+dfsg-2) UNRELEASED; urgency=medium
 
   * Removed the unused build dependency on liblucene2-java
   * Changed the priority from extra to optional
+  * Clean the upstream tarball using the Files-Excluded field
+    in debian/copyright
   * Switch to debhelper level 9
 
  -- Emmanuel Bourg <ebourg at apache.org>  Wed, 15 Jul 2015 21:53:59 +0200
diff --git a/debian/copyright b/debian/copyright
index 5ffe7b5..9af95b8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,14 +2,15 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Apache PDFBox
 Upstream-Contact: The Apache Software Foundation
 Source: https://pdfbox.apache.org/downloads.html
-Disclaimer: 
- - The +dfsg tarball has been created by removing
-   pdfbox/src/main/resources/org/apache/pdfbox/resources/cmap/*
-   (contains non-free cmap file, we use the ones already in Debian instead)
-   and examples/src/main/resources/org/apache/pdfbox/resources/pdfa/sRGB*
-   (non-free color space profile)
- - The contents of the zip file mentions several other third-party copyright
-   holders but the relevant files are not included.
+Files-Excluded: */pdfbox/src/main/resources/org/apache/pdfbox/resources/cmap/*
+                */examples/src/main/resources/org/apache/pdfbox/resources/pdfa/sRGB*
+Comment:
+ The tarball has been created by removing non-free cmap files
+ (we use the ones already in Debian instead) and non-free color
+ space profiles.
+ .
+ The content of the zip file mentions several other third-party copyright
+ holders but the relevant files are not included.
 
 Files: *
 Copyright: 2010-2014, The Apache Software Foundation
diff --git a/debian/repack.local b/debian/repack.local
deleted file mode 100644
index 34aa7b6..0000000
--- a/debian/repack.local
+++ /dev/null
@@ -1,2 +0,0 @@
-rm pdfbox/src/main/resources/org/apache/pdfbox/resources/cmap/*
-rm examples/src/main/resources/org/apache/pdfbox/resources/pdfa/sRGB*
diff --git a/debian/repack.stub b/debian/repack.stub
deleted file mode 100755
index 4d68667..0000000
--- a/debian/repack.stub
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/bin/sh
-
-: <<=cut
-=pod
-
-=head1 NAME
-
-repack.stub - script to repack upstream tarballs from uscan
-
-=head1 INSTRUCTIONS
-
-put this in debian/repack.stub and add "debian sh debian/repack.stub" to
-the end of the line in debian/watch. you will also need to add a version
-mangle to debian/watch.
-
-then create a debian/repack.local. this is a shell script that is
-sourced under "set -e", so be careful to check returns codes.
-
-=head1 FUNCTIONS
-
-=over 4
-
-=item rm
-
-rm is replaced by a function that does some magic ("rm -rv" by default), but also changes MANIFEST if $MANIFEST is 1
-
-=item mv
-
-mv is replaced by a function that just does mv (by default), but also changes MANIFEST if $MANIFEST is 1
-
-=item requires_version
-
-requires_version is there for future usage for requiring certain versions of the script
-
-=back
-
-=head1 VARIABLES
-
-=over 4
-
-=item SUFFIX
-
-defaults to +dfsg
-
-what to append to the upstream version
-
-=item RM_OPTS
-
-defaults to -vrf
-
-options to pass to rm
-
-=item MANIFEST
-
-defaults to 0, set to 1 to turn on.
-
-this will manipulate MANIFEST files in CPAN tarballs.
-
-=item UP_BASE
-
-this is the directory where the upstream source is.
-
-=back
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright 2009, Ryan Niebur <ryan at debian.org>
-
-License: Artistic or GPL-1+
-
-=cut
-
-if [ -z "$REPACK_SH" ]; then
-    if [ -f ../../scripts/repack.sh ]; then
-        REPACK_SH=../../scripts/repack.sh
-    fi
-    if [ -z "$REPACK_SH" ] && which repack.sh > /dev/null; then
-        REPACK_SH=$(which repack.sh)
-    fi
-fi
-
-if [ ! -f "$REPACK_SH" ]; then
-    echo "Couldn't find a repack.sh. please put it in your PATH, put it at ../../scripts/repack.sh, or put it somewhere else and set the REPACK_SH variable"
-    echo "You can get it from http://anonscm.debian.org/gitweb/?p=pkg-perl/scripts.git;a=blob_plain;f=repack.sh;hb=HEAD"
-    exit 1
-fi
-
-exec "$REPACK_SH" "$@"
diff --git a/debian/rules b/debian/rules
index 11418c7..e02f8a8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,6 +20,7 @@ override_dh_auto_clean:
 
 override_dh_auto_configure:
 	# replace what we delete in repacking. never used ...
+	mkdir -p pdfbox/src/main/resources/org/apache/pdfbox/resources/cmap/
 	find /usr/share/poppler/cMap -type f -print0 | xargs -r0 cp -n -t pdfbox/src/main/resources/org/apache/pdfbox/resources/cmap/
 	dh_auto_configure
 
diff --git a/debian/watch b/debian/watch
index d743886..859df2a 100644
--- a/debian/watch
+++ b/debian/watch
@@ -9,4 +9,4 @@ dversionmangle=s/(?:\.|\+)dfsg$//,\
 downloadurlmangle=s/pdfbox\/([\d.]+)\//pdfbox\/$1\/pdfbox-$1-src.zip/,\
 filenamemangle=s/([\d.]+)\//pdfbox-$1-src.zip/,\
 pgpsigurlmangle=s/$/.asc/ \
-	http://archive.apache.org/dist/pdfbox/ ([\d.]+)/ debian sh debian/repack.stub
+	http://archive.apache.org/dist/pdfbox/ ([\d.]+)/

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

