The following commit has been merged in the master branch:
commit d7a9b3cfa4dbec53f27e9285c83310dc45d37bc9
Author: James McCoy <[email protected]>
Date: Sat Sep 15 14:45:36 2012 -0400
Revert origtargz related commits.
Signed-off-by: James McCoy <[email protected]>
diff --git a/.gitignore b/.gitignore
index 167cfb4..03ca629 100644
--- a/.gitignore
+++ b/.gitignore
@@ -79,8 +79,6 @@ scripts/mk-build-deps.1
scripts/namecheck
scripts/namecheck.1
scripts/nmudiff
-scripts/origtargz
-scripts/origtargz.1
scripts/plotchangelog
scripts/pts-subscribe
scripts/rc-alert
diff --git a/Makefile.common b/Makefile.common
index 3f04732..3ffa4b4 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -1,7 +1,7 @@
GEN_MAN1S := bts.1 build-rdeps.1 chdist.1 dcontrol.1 debcheckout.1 debcommit.1
\
deb-reversion.1 desktop2menu.1 dget.1 licensecheck.1 mass-bug.1 \
mk-build-deps.1 namecheck.1 rmadison.1 svnpath.1 tagpending.1 \
- origtargz.1 transition-check.1
+ transition-check.1
PERLMOD_DIR = /usr/share/devscripts
EXAMPLES_DIR = /usr/share/devscripts
diff --git a/README b/README
index 43d8836..39ea41d 100644
--- a/README
+++ b/README
@@ -191,9 +191,6 @@ And now, in mostly alphabetical order, the scripts:
previously released version (as per the changelog) and submit the diff
to the BTS. [patchutils, mutt]
-- origtargz: fetch the orig tarball of a Debian package from various sources,
- and unpack it
-
- plotchangelog: display information from a changelog graphically using
gnuplot. [libtimedate-perl, gnuplot]
diff --git a/debian/changelog b/debian/changelog
index e9773b0..b3b471c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,8 +29,6 @@ devscripts (2.12.3) UNRELEASED; urgency=low
* debcheckout: When --package is given, use this package name rather than
trying to guess it from the url. Useful for URLs like
http://anonscm.debian.org/bzr/pkg-postgresql/postgresql-9.2/sid-pgapt/.
- * origtargz: New script: fetch the orig tarball of a Debian package from
- various sources, and unpack it
* po4a/Makefile: use po4a --keep=0 so the build system doesn't die with
untranslated scripts
* dcmd: Reimplement endswith() with case. The original missed quoting and
diff --git a/debian/control b/debian/control
index 1e53809..0c555a3 100644
--- a/debian/control
+++ b/debian/control
@@ -171,8 +171,6 @@ Description: scripts to make the life of a Debian Package
maintainer easier
- namecheck: Check project names are not already taken.
- nmudiff: mail a diff of the current package against the previous version
to the BTS to assist in tracking NMUs [patchutils, mutt]
- - origtargz: fetch the orig tarball of a Debian package from various sources,
- and unpack it
- plotchangelog: view a nice plot of the data in a changelog file
[libtimedate-perl, gnuplot]
- pts-subscribe: subscribe to the PTS for a limited period of time
diff --git a/po4a/devscripts-po4a.conf b/po4a/devscripts-po4a.conf
index acac392..c3e13d9 100644
--- a/po4a/devscripts-po4a.conf
+++ b/po4a/devscripts-po4a.conf
@@ -100,8 +100,6 @@
fr:fr/namecheck.fr.pl add_fr:add_fr/translator_pod.add
[type:man] ../scripts/nmudiff.1 \
fr:fr/nmudiff.fr.1 add_fr:add_fr/translator_man.add
-[type:pod] ../scripts/origtargz.pl \
- fr:fr/origtargz.fr.pl add_fr:add_fr/translator_pod.add
[type:man] ../scripts/plotchangelog.1 \
fr:fr/plotchangelog.fr.1 add_fr:add_fr/translator_man.add
[type:man] ../scripts/pts-subscribe.1 \
diff --git a/scripts/origtargz.pl b/scripts/origtargz.pl
deleted file mode 100755
index bdfab5d..0000000
--- a/scripts/origtargz.pl
+++ /dev/null
@@ -1,348 +0,0 @@
-#!/usr/bin/perl
-#
-# origtargz: fetch the orig tarball of a Debian package from various sources,
-# and unpack it
-# Copyright (C) 2012 Christoph Berg <[email protected]>
-#
-# 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 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-=head1 NAME
-
-origtargz - fetch the orig tarball of a Debian package from various sources,
and unpack it
-
-=head1 SYNOPSIS
-
-=over
-
-=item B<origtargz> [I<OPTIONS>] [B<--unpack>[=B<no>|B<once>|B<yes>]]
-
-=item B<origtargz> B<--help>
-
-=back
-
-=head1 DESCRIPTION
-
-B<origtargz> downloads the orig tarball of a Debian package, and optionally
-unpacks it into the current directory. The version number to be used is
-determined from F<debian/changelog>. The main use for B<origtargz> is with
-debian-dir-only repository checkouts. It should be invoked from the top level
-directory of an unpacked Debian source package.
-
-Various download locations are tried:
-
-=over 4
-
-=item * First, an existing file is looked for.
-
-=item * Directories given with B<--path> are searched.
-
-=item * B<apt-get source> is tried when B<apt-cache showsrc> reports a
matching version.
-
-=item * Finally, B<uscan --download-current-version> is tried.
-
-=back
-
-When asked to unpack the orig tarball, B<origtargz> will remove all files and
-directories from the current directory, except the debian directory, and the
-VCS repository directories. Some files outside F<debian/> which are often
stored
-in VCS even for debian-dir-only repositories are also preserved
(F<.bzr-builddeb>,
-F<.gitignore>, F<.hgignore>). I<Note that this will drop all non-committed
changes>
-for the patch system in use (e.g. source format "3.0 (quilt)"), and will even
-remove all patches from the package when no patch system is in use (the
-original "1.0" source format).
-
-The default behavior is to unpack the orig tarball on the first invocation of
-B<origtargz> in a debian-dir-only checkout.
-
-=head1 NOTES
-
-Despite B<origtargz> being called "targz", it will work with any compression
-scheme used for the tarball.
-
-A similar tool to unpack orig tarballs is B<uupdate>(1). B<uupdate> creates a
-new working directory, unpacks the tarball, and applies the Debian F<.diff.gz>
-changes. In contrast, B<origtargz> uses the current directory, keeping VCS
-metadata.
-
-For Debian package repositories that keep the full upstream source, other tools
-should be used to upgrade the repository from the new tarball. See
-B<git-import-orig>(1) and B<svn-upgrade>(1) for examples. B<origtargz> is still
-useful for downloading the current tarball.
-
-=head1 OPTIONS
-
-=over
-
-=item B<-p>, B<--path> I<directory>
-
-Add I<directory> to the list of locations to search for an existing tarball.
-When found, a hardlink is created if possible, otherwise a symlink.
-
-=item B<-u>, B<--unpack>[=B<no>|B<once>|B<yes>]
-
-Unpack the downloaded orig tarball to the current directory, replacing
-everything except the debian directory. Valid choices are:
-
-=over
-
-=item B<no>
-
-Do not unpack the orig tarball.
-
-=item B<once> (default when B<--unpack> is not used)
-
-If the current directory contains only a F<debian> directory (and possibly some
-dotfiles), unpack the orig tarball. This is the default behavior.
-
-=item B<yes> (default for B<--unpack> without argument)
-
-Always unpack the orig tarball. Existing files are removed, except for
F<debian/>
-and VCS files. Preserved are: F<.bzr>, F<.bzrignore>, F<.bzr-builddeb>,
F<.git>,
-F<.gitignore>, F<.hg>, F<.hgignore>, and F<.svn>.
-
-=back
-
-=item B<-d>, B<--download-only>
-
-Alias for B<--unpack=no>.
-
-=item B<-t>, B<--tar-only>
-
-When using B<apt-get source>, pass B<--tar-only> to it. The default is to
-download the full source package including F<.dsc> and F<.diff.gz> or
-F<.debian.tar.gz> components so B<debdiff> can be used to diff the last upload
-to the next one. With B<--tar-only>, only download the F<.orig.tar.*> file.
-
-=back
-
-=cut
-
-#=head1 CONFIGURATION VARIABLES
-#
-#The two configuration files F</etc/devscripts.conf> and
-#F<~/.devscripts> are sourced by a shell in that order to set
-#configuration variables. Command line options can be used to override
-#configuration file settings. Environment variable settings are ignored
-#for this purpose. The currently recognised variables are:
-
-=head1 SEE ALSO
-
-B<debcheckout>(1), B<git-import-orig>(1), B<svn-upgrade>(1), B<uupdate>(1)
-
-=head1 AUTHOR
-
-B<origtargz> and this manpage have been written by Christoph Berg
-<I<[email protected]>>.
-
-=cut
-
-# option parsing
-
-use strict;
-use warnings;
-use File::Temp qw/tempdir/;
-use Getopt::Long qw(:config gnu_getopt);
-use Pod::Usage;
-
-my @dirs = ();
-my $tar_only = 0;
-my $unpack = 'once'; # default when --unpack is not used
-
-GetOptions(
- "path|p=s" => \@dirs,
- "download-only|d" => sub { $unpack = 'no' },
- "help|h" => sub { pod2usage({-exitval => 0, -verbose => 1}); },
- "tar-only|t" => \$tar_only,
- "unpack|u:s" => \$unpack,
-) or pod2usage({-exitval => 3});
-
-$unpack = 'yes' if (defined $unpack and $unpack eq ''); # default for --unpack
without argument
-pod2usage({-exitval => 3}) if (@ARGV > 0 or $unpack !~ /^(no|once|yes)$/);
-
-# get package name and version number
-
-my ($package, $version, $origversion, $fileversion);
-
-open F, "debian/changelog" or die "debian/changelog: $!\n";
-my $line = <F>;
-close F;
-unless ($line =~ /^(\S+) \((\S+)\)/) {
- die "could not parse debian/changelog:1: $line";
-}
-($package, $version) = ($1, $2);
-unless ($version =~ /-/) {
- print "Package with native version number $version, skipping orig.tar.*
download\n";
- exit 0;
-}
-$origversion = $version;
-$origversion =~ s/(.*)-.*/$1/; # strip everything from the last dash
-$fileversion = $origversion;
-$fileversion =~ s/^\d+://; # strip epoch
-
-sub download_origtar ()
-{
- # look for an existing file
-
- if (my @f = glob "../${package}_$fileversion.orig.tar.*") {
- print "Using existing $f[0]\n";
- return $f[0];
- }
-
- # try other directories
-
- foreach my $dir (@dirs) {
- $dir =~ s!/$!!;
-
- if (my @f = glob "$dir/${package}_$fileversion.orig.tar.*") {
- print "Using $f[0]\n";
- my $basename = $f[0];
- $basename =~ s!.*/!!;
- link $f[0], "../$basename" or
- symlink $f[0], "../$basename" or
- die "symlink: $!";
- return $f[0];
- }
- }
-
- # TODO: try pristine-tar
-
- # try apt-get source
-
- open S, "apt-cache showsrc '$package' |";
- my @showsrc;
- {
- local $/;
- @showsrc = <S>;
- }
- close S;
-
- my $bestsrcversion;
- foreach my $src (@showsrc) {
- $src =~ /^Package: (.*)/m or next;
- next if ($1 ne $package); ; # should never trigger, but who
knows
- $src =~ /^Version: (.*)/m or next;
- my $srcversion = $1;
- my $srcorigversion = $srcversion;
- $srcorigversion =~ s/(.*)-.*/$1/; # strip everything from the
last dash
-
- if ($srcorigversion eq $origversion) { # loop through all
matching versions
- $bestsrcversion = $srcversion;
- last if ($srcversion eq $version); # break if exact
match
- }
- }
-
- if ($bestsrcversion) {
- print "Trying apt-get source $package=$bestsrcversion ...\n";
- my $t = $tar_only ? '--tar-only' : '';
- system "cd .. && apt-get source --only-source --download-only
$t '$package=$bestsrcversion'";
- }
-
- if (my @f = glob "../${package}_$fileversion.orig.tar.*") {
- return $f[0];
- }
-
- # try uscan
-
- if (-f "debian/watch") {
- print "Trying uscan --download-current-version ...\n";
- system "uscan --download-current-version\n";
- }
-
- if (my @f = glob "../${package}_$fileversion.orig.tar.*") {
- return $f[0];
- }
-
- print "Could not find any location for
${package}_$fileversion.orig.tar.*\n";
- return undef;
-}
-
-sub clean_checkout ()
-{
- # delete all files except debian/, our VCS checkout, and some files
- # often in VCS outside debian/ even in debian-dir-only repositories
- opendir DIR, '.' or die "opendir: $!";
- my @rm;
- while (my $file = readdir DIR) {
- next if ($file eq '.' or $file eq '..');
- next if ($file eq 'debian');
- next if ($file =~ /^(\.bzr|\.git|\.hg|\.svn|CVS)$/);
- if ($file =~
/^(\.bzr(ignore|-builddeb)|\.gitignore|\.hgignore)$/) {
- print "Notice: not deleting $file (likely to come from
VCS checkout)\n";
- next;
- }
- push @rm, $file;
- }
- close DIR;
- system ('rm', '-rf', @rm);
-}
-
-sub unpack_tarball ($)
-{
- my $origtar = shift;
- my $tmpdir = File::Temp->newdir(DIR => ".", CLEANUP => 1);
-
- print "Unpacking $origtar\n";
-
- # unpack
- chdir $tmpdir or die "chdir $tmpdir: $!";
- system ('tar', 'xf', "../$origtar");
- if ($? >> 8) {
- print STDERR "tar xf $origtar failed\n";
- return 0;
- }
- chdir '..';
-
- # figure out which directory was created
- my @dirs = glob "$tmpdir/*/";
- unless (@dirs) {
- print STDERR "tar xf $origtar did not create any directory\n";
- return 0;
- }
- my $directory = $dirs[0];
- chop $directory;
-
- # move all files over, except the debian directory
- opendir DIR, $directory or die "opendir $directory: $!";
- foreach my $file (readdir DIR) {
- if ($file eq 'debian') {
- system ('rm', '-rf', "$directory/$file");
- next;
- } elsif ($file eq '.' or $file eq '..') {
- next;
- }
- unless (rename "$directory/$file", "$file") {
- print STDERR "rename $directory/$file $file: $!\n";
- return 0;
- }
- }
- closedir DIR;
- rmdir $directory;
-
- return 1;
-}
-
-my $origtar = download_origtar;
-exit 1 unless ($origtar);
-
-if ($unpack eq 'once') {
- my @files = glob '*'; # ignores dotfiles
- if (@files == 1) { # this is debian/, we have already opened
debian/changelog
- unpack_tarball ($origtar) or exit 1;
- }
-} elsif ($unpack eq 'yes') {
- clean_checkout;
- unpack_tarball ($origtar) or exit 1;
-}
-
-exit 0;
--
Git repository for devscripts
_______________________________________________
devscripts-devel mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel
