This is an automated email from the git hooks/post-receive script. gregoa pushed a commit to branch master in repository jabref.
commit 14cc3703e7f0b94e818d17f07b3f7de03e48679d Author: gregor herrmann <[email protected]> Date: Thu Sep 15 23:38:10 2016 +0200 Change repacking framework to Files-Excluded mechanism in debian/copyright. --- debian/copyright | 21 +------------ debian/repack.local | 6 ---- debian/repack.stub | 88 ----------------------------------------------------- debian/watch | 4 +-- 4 files changed, 3 insertions(+), 116 deletions(-) diff --git a/debian/copyright b/debian/copyright index f7b6b48..f01592b 100644 --- a/debian/copyright +++ b/debian/copyright @@ -2,6 +2,7 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: JabRef Upstream-Contact: Morten Alver, Nizar Batada Source: https://github.com/JabRef/jabref/releases +Files-Excluded: lib buildlib gradle osx Comment: The +ds version is created by removing lib/, buildlib/, gradle/, osx/: contain sourceless pre-compiled libraries which are not used anyway @@ -251,17 +252,6 @@ Files: debian/patches/mrDlib_jayatana.patch Copyright: 2012, Oliver Kopp <[email protected]> License: GPL-2 -Files: debian/repack.stub -Copyright: 2009, Ryan Niebur <[email protected]> -License: Artistic or GPL-1+ - -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: BSD-3-clause Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -936,15 +926,6 @@ License: CC-BY-SA-3.0 be included in the License; this License is not intended to restrict the license of any rights under applicable law. -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 - the Free Software Foundation; either version 1, or (at your option) - any later version. - . - On Debian systems, the complete text of version 1 of the GNU General - Public License can be found in `/usr/share/common-licenses/GPL-1'. - License: GPL-2 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 1fad0a6..0000000 --- a/debian/repack.local +++ /dev/null @@ -1,6 +0,0 @@ -requires_version 2 -SUFFIX=+ds -rm lib -rm buildlib -rm gradle -rm osx 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 <[email protected]> - -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/watch b/debian/watch index 7b27f0e..332cd79 100644 --- a/debian/watch +++ b/debian/watch @@ -1,6 +1,6 @@ version=3 opts="dversionmangle=s/\+(dfsg|ds)$//;,\ + repacksuffix=+ds,\ uversionmangle=s/(\D)$/${1}1/;s/b(?:eta)?(\d)?$/~beta${1}/,\ filenamemangle=s/(?:.*?)?v?(\d[\d.]*)\.tar\.gz/jabref-$1.tar.gz/" \ - https://github.com/JabRef/jabref/tags (?:.*?/)?v?(\d[\d.]*)\.tar\.gz \ - debian sh debian/repack.stub + https://github.com/JabRef/jabref/tags (?:.*?/)?v?(\d[\d.]*)\.tar\.gz -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jabref.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
