diff options
| author | Justin Davis <jrcd83@gmail.com> | 2011-09-09 23:41:26 +0200 |
|---|---|---|
| committer | Justin Davis <jrcd83@gmail.com> | 2011-09-09 23:41:26 +0200 |
| commit | 4f22914b1945c076856e42a06b8d5e8a05025240 (patch) | |
| tree | e163eaa89a938ffc82cbb735b14e2a3574f78262 | |
| parent | a904c6436bb93ce4c3fdeb583f40845db90de5be (diff) | |
| download | genpkg-4f22914b1945c076856e42a06b8d5e8a05025240.tar.gz genpkg-4f22914b1945c076856e42a06b8d5e8a05025240.tar.xz | |
Remove addsvnid macro. Add the $Id$ tagging to pushpkg.
The pushpkg script is specific to releasing packages on Arch's
official repositories. It is more appropriate there and not as
a generic macro that I might forget to add. This way I cannot
forget to add it.
| -rwxr-xr-x | bin/macros/addsvnid | 5 | ||||
| -rw-r--r-- | pbj/perl-cpanplus-dist-arch.pbj | 1 | ||||
| -rw-r--r-- | pbj/perl-html-form.pbj | 1 | ||||
| -rw-r--r-- | pbj/perl-libwww.pbj | 1 | ||||
| -rw-r--r-- | pbj/perl-lwp-protocol-https.pbj | 1 | ||||
| -rwxr-xr-x | pushpkgs | 10 |
6 files changed, 9 insertions, 10 deletions
diff --git a/bin/macros/addsvnid b/bin/macros/addsvnid deleted file mode 100755 index b010edc..0000000 --- a/bin/macros/addsvnid +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/awk -f -# Add an SVN $Id$ comment at the end of the comments header -/^#/ { aftercom = 1 } -!/^#/ && aftercom && ! done { print "# $Id$"; done = 1 } -{ print } diff --git a/pbj/perl-cpanplus-dist-arch.pbj b/pbj/perl-cpanplus-dist-arch.pbj index 6f101de..1364f2c 100644 --- a/pbj/perl-cpanplus-dist-arch.pbj +++ b/pbj/perl-cpanplus-dist-arch.pbj @@ -1,2 +1 @@ ! perl-cpan CPANPLUS-Dist-Arch -| addsvnid diff --git a/pbj/perl-html-form.pbj b/pbj/perl-html-form.pbj index c205e7d..a103b0a 100644 --- a/pbj/perl-html-form.pbj +++ b/pbj/perl-html-form.pbj @@ -1,3 +1,2 @@ ! perl-cpan HTML-Form -| addsvnid + conflicts perl-libwww<6 diff --git a/pbj/perl-libwww.pbj b/pbj/perl-libwww.pbj index 8937d54..dc86546 100644 --- a/pbj/perl-libwww.pbj +++ b/pbj/perl-libwww.pbj @@ -1,3 +1,2 @@ ! perl-cpan libwww-perl + optdepends perl-lwp-protocol-https: for https:// url schemes -| addsvnid diff --git a/pbj/perl-lwp-protocol-https.pbj b/pbj/perl-lwp-protocol-https.pbj index 4cd95c2..c937004 100644 --- a/pbj/perl-lwp-protocol-https.pbj +++ b/pbj/perl-lwp-protocol-https.pbj @@ -1,2 +1 @@ ! perl-cpan LWP-Protocol-https -| addsvnid @@ -21,5 +21,13 @@ while [ $# -gt 0 ] ; do mkdir -p "$DEST/$pkg/"{trunk,repos} cp -r -t "$DEST/$pkg/trunk" "$pkg"/* -done + # Add an SVN $Id$ comment at the end of the comments header + cd "$DEST/$pkg/trunk" + awk '!/^#/ && ! done { print "# $Id$"; done = 1 } 1' PKGBUILD \ + > PKGBUILD.new + mv PKGBUILD.new PKGBUILD + + # Make sure it is used. + svn propset svn:keywords Id PKGBUILD +done |