[libglazedlists-java] 03/06: Replaced the debian/repack script with the standard Files-Excluded mechanism

Mon May 16 17:04:35 UTC 2016

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

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

commit 7e8dbbbfc00a9c1af9c60d0ae183fa6e5f768be2
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon May 16 17:31:54 2016 +0200

    Replaced the debian/repack script with the standard Files-Excluded mechanism
---
 debian/changelog    |  1 +
 debian/copyright    | 18 +++--------
 debian/repack.local |  3 --
 debian/repack.stub  | 91 -----------------------------------------------------
 debian/watch        |  5 +--
 5 files changed, 7 insertions(+), 111 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b5c3bcc..20c6388 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ libglazedlists-java (1.9.0+dfsg-3) UNRELEASED; urgency=medium
   * Team upload.
   * Standards-Version updated to 3.9.8 (no changes)
   * Use secure Vcs-* URLs
+  * Replaced the debian/repack script with the standard Files-Excluded mechanism
 
  -- Emmanuel Bourg <ebourg at apache.org>  Mon, 16 May 2016 17:17:58 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 0f51b85..114094a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,9 +2,12 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Glazed Lists
 Upstream-Contact: publicobject.com, O'Dell Engineering Ltd.
 Source: http://www.publicobject.com/glazedlists/
-Comment: 
+Files-Excluded: extensions
+                test
+                www
+Comment:
  The ./extensions and ./test directories have been removed in creating the
- +dfsg tarball. Both directories are not used and two files contained an 
+ upstream tarball. Both directories are not used and two files contained an
  unclear copyright/license.
 
 Files: *
@@ -29,10 +32,6 @@ Copyright:
  2007-2013, tony mancill <tmancill at debian.org>
 License: GPL-1+
 
-Files: debian/repack.stub
-Copyright: © 2009, Ryan Niebur <ryan at debian.org>
-License: Artistic or GPL-1+
-
 License: Apache-2.0
  Licensed under the Apache License, Version 2.0 (the "License"); you may not
  use this file except in compliance with the License. You may obtain a copy of
@@ -47,13 +46,6 @@ License: Apache-2.0
  On Debian systems, the complete text of the Apache License,
  Version 2.0 can be found in `/usr/share/common-licenses/Apache-2.0'.
 
-License: Artistic
- This program is free software; you can redistribute it and/or modify
- it under the terms of the Artistic License, which comes with Perl.
- .
- On Debian systems, the complete text of the Artistic License can be
- found in `/usr/share/common-licenses/Artistic'.
-
 License: GPL-1+
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
diff --git a/debian/repack.local b/debian/repack.local
deleted file mode 100644
index 0d5b7ec..0000000
--- a/debian/repack.local
+++ /dev/null
@@ -1,3 +0,0 @@
-requires_version 3
-rm extensions
-rm test
diff --git a/debian/repack.stub b/debian/repack.stub
deleted file mode 100755
index 7e36f5f..0000000
--- a/debian/repack.stub
+++ /dev/null
@@ -1,91 +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>
-
-This program is free software; you can redistribute it and/or modify it
-under the same terms as Perl itself.
-
-=cut
-
-if [ -z "$REPACK_SH" ]; then
-    if [ -x /usr/share/pkg-perl-tools/repack.sh ]; then
-        REPACK_SH='/usr/share/pkg-perl-tools/repack.sh'
-    elif [ -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/packages/pkg-perl-tools.git;a=blob_plain;f=scripts/repack.sh;hb=HEAD"
-    exit 1
-fi
-
-exec "$REPACK_SH" "$@"
diff --git a/debian/watch b/debian/watch
index 6cce60d..24da243 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,6 +1,3 @@
-# Compulsory line, this is a version 3 file
 version=3
-
 opts=dversionmangle=s|(?:[.+])dfsg$||,versionmangle=s|_|\.|g \
-https://github.com/glazedlists/glazedlists/releases .*/glazedlists-v?(\d\S*)\.tar\.gz \
-	debian sh debian/repack.stub
+https://github.com/glazedlists/glazedlists/releases .*/glazedlists-v?(\d\S*)\.tar\.gz

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

