This is an automated email from the git hooks/post-receive script. dmn pushed a commit to branch master in repository libcatalyst-modules-perl.
commit 58e251eb3613600983014ec1ddfd0567cbafd7a9 Author: Damyan Ivanov <d...@debian.org> Date: Thu May 15 07:37:09 2014 +0000 remove bundling machinery --- debian/README.source | 39 -------------- debian/fetch | 112 ---------------------------------------- debian/make-module.sh | 70 ------------------------- debian/source.lintian-overrides | 2 - 4 files changed, 223 deletions(-) diff --git a/debian/README.source b/debian/README.source deleted file mode 100644 index 626cb10..0000000 --- a/debian/README.source +++ /dev/null @@ -1,39 +0,0 @@ -This package is a bundle of several upstream distributions, so it cannot -be updated in the usual manner (using uscan, uupdate, git-import-orig, etc.) - -Instead, you update it in the following way: - $ git status # make sure the source is clean - $ debian/fetch - -Then 'git add' and commit individual directories under sources/ explaining -about the upgrade. - -Adding new distribution to the bundle is done by: - $ debian/fetch Dist-Name - $ ln -s ../../sources/Dist-Name bundle/*/ - $ git add sources/Dist-Name - -========================================================================== - -This package uses quilt to manage all modifications to the upstream -source. Changes are stored as diffs in debian/patches inside the source -package and applied during the build. - -The following addition to ~/.quiltrc is needed for easier patch handling: - - if echo $PWD | grep -q -E "^$(pkg-perl-root)/git/packages/libcatalyst-modules-perl/build-area/"; then - QUILT_PATCHES=patches - fi - -In order to patch a specific upstream distribution, first prepare the -build-area and apply all patches: - - $ debian/rules patch - -Then to the module directory in build-area/$(xx)/$(Module-Name). -The symlink "patches" there should point to a directory in debian/patches. -You can now use quilt as usual. - -Run - make -f debian/rules unpatch -in the package root (../../..) to remove all applied patches. diff --git a/debian/fetch b/debian/fetch deleted file mode 100755 index d291940..0000000 --- a/debian/fetch +++ /dev/null @@ -1,112 +0,0 @@ -#!/usr/bin/perl - -use strict; -use warnings; -use utf8; - -use Archive::Extract (); -use DirHandle (); -use File::Copy::Recursive (); -use File::Remove (); -use File::Temp (); -use Term::Cap (); -use WWW::Mechanize (); - - -my $term = Term::Cap->Tgetent(); -my $cd = $term->Tputs('cd'); -my $sc = $term->Tputs('sc'); -my $rc = $term->Tputs('rc'); - -sub doing { - print $sc, @_, '...'; -} - -sub done { - print "$rc$cd"; -} - -$| = 1; - -my $ua = WWW::Mechanize->new; - -sub fetch_dist { - my $dist = shift; - - print "$dist... "; - - my $tmp_dir = File::Temp->newdir( - "bundle-fetch-$dist-XXXXXXX", - DIR => '.', - CLEANUP => 1, - ); - - my $url = "https://metacpan.org/release/$dist"; - doing("metacpan.org page"); - $ua->get($url); - done(); - - my $download_link = $ua->find_link( - text_regex => qr(Download), - url_regex => qr(/$dist-.+\.(?:zip|tar\.(?:gz|xz|bz2|lzma))) - ); - - my $fn = $download_link->url; - $fn =~ s{.+/}{}; - $fn or die "No file name in response"; - die "Invalid file name '$fn'" - if $fn =~ m{[/\\:\ \$\%'"]} or $fn !~ /^[\x21-\x7f]+$/; - - my $tarball_file = File::Spec->catfile( $tmp_dir, $fn ); - - doing("Downloading"); - $ua->get( $download_link, ':content_file' => $tarball_file ); - done(); - - my $extract_dir = File::Spec->catdir($tmp_dir, 'extract'); - my $tarball = Archive::Extract->new( archive => $tarball_file ); - doing("Extracting"); - $tarball->extract( to => $extract_dir ); - done(); - - my $dir = DirHandle->new($extract_dir); - my $extracted_tree; - while ( defined( $_ = $dir->read ) ) { - next if $_ eq '.'; - next if $_ eq '..'; - - die "Multiple directories extracted ($extracted_tree, $_)" - if $extracted_tree; - - $extracted_tree = $_; - } - - die "Nothing in the archive" unless $extracted_tree; - - my $destination = File::Spec->catdir( 'sources', $dist ); - doing("Removing current tree"); - File::Remove::remove( \1, $destination ); - done(); - - $extracted_tree = File::Spec->catdir( $extract_dir, $extracted_tree ); - - # remove .gitignore files from upstream sources these can do us only harm, - # since we want to track all changes there, always - File::Find::find( - { wanted => sub { - unlink $_ if $_ eq '.gitignore'; - }, - }, - $extracted_tree - ); - - doing("Copying extracted source"); - File::Copy::Recursive::dircopy( $extracted_tree, $destination ); - done(); - - print "done.\n"; -} - -@ARGV = map { s{^sources/}{}; $_ } glob('sources/*') unless @ARGV; - -fetch_dist($_) for @ARGV; diff --git a/debian/make-module.sh b/debian/make-module.sh deleted file mode 100755 index 31ec141..0000000 --- a/debian/make-module.sh +++ /dev/null @@ -1,70 +0,0 @@ -#!/bin/sh - -set -e - -PERL5LIB="$DESTDIR/usr/share/perl5/" -ROOT=$PWD - -export PERL5LIB - -echo "==========================================================================" -echo "Make $1" -echo "PERL5LIB = $PERL5LIB" -echo "DESTDIR = $DESTDIR" -echo "==========================================================================" - -#--- unpacking tar.gz in proper folders -if [ "$1" = "unpack" ]; then - if [ -d build-area ]; then rm -rf build-area; fi - mkdir build-area - - cd bundle - for m in `find . -type l`; do - name=$(basename $m) - order=$(dirname $m) - - mkdir -p ../build-area/$order - cp -a ../sources/$name ../build-area/$order/ - done -fi - -if [ "$1" = patch -o "$1" = unpatch ]; then - if [ "$1" = patch ]; then - action=push - else - action=pop - fi - - for dir in build-area/* - do - [ -d $dir ] || continue - cd $dir - for module in * - do - mkdir -p $ROOT/debian/patches/$module - [ -h $module/patches ] || ln -s $ROOT/debian/patches/$module $module/patches - - [ -e $module/patches/series ] || continue - - echo "Applying patches for $module:" - cd $module - QUILT_PATCHES=patches quilt --quiltrc /dev/null $action -a || test $? = 2 - cd .. - done - cd ../.. - done -fi - -if [ "$1" = "build" ]; then - - for module in $(find build-area -type d -mindepth 2 -maxdepth 2 | sort) - do - set -e -x - d=$module - dh_auto_configure -D $d - dh_auto_build -D $d - dh_auto_test -D $d - dh_auto_install -D $d - set +e +x - done -fi diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides deleted file mode 100644 index 2cc4aea..0000000 --- a/debian/source.lintian-overrides +++ /dev/null @@ -1,2 +0,0 @@ -# We use quilt in a different way, see README.source -libcatalyst-modules-perl source: quilt-build-dep-but-no-series-file -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libcatalyst-modules-perl.git _______________________________________________ Pkg-perl-cvs-commits mailing list Pkg-perl-cvs-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits