[26159] in Source-Commits
Re: /svn/athena r25426 - in trunk/debathena/debathena/config-package-dev:
daemon@ATHENA.MIT.EDU (Geoffrey Thomas)
Tue Oct 25 20:30:52 2011
Date: Tue, 25 Oct 2011 20:30:50 -0400 (EDT)
From: Geoffrey Thomas <geofft@MIT.EDU>
To: Anders Kaseorg <andersk@MIT.EDU>
cc: source-commits@MIT.EDU
In-Reply-To: <201110260013.p9Q0Dosd014120@drugstore.mit.edu>
Message-ID: <alpine.DEB.2.00.1110252030480.29514@tyger.mit.edu>
MIME-Version: 1.0
Content-Type: MULTIPART/MIXED; BOUNDARY="-1156401407-1300816609-1319589050=:29514"
This message is in MIME format. The first part should be readable text,
while the remaining parts are likely unreadable without MIME-aware tools.
---1156401407-1300816609-1319589050=:29514
Content-Type: TEXT/PLAIN; charset=UTF-8; format=flowed
Content-Transfer-Encoding: QUOTED-PRINTABLE
ACK
--=20
Geoffrey Thomas
geofft@mit.edu
On Tue, 25 Oct 2011, Anders Kaseorg wrote:
> Author: andersk
> Date: 2011-10-25 20:13:50 -0400 (Tue, 25 Oct 2011)
> New Revision: 25426
>
> Modified:
> trunk/debathena/debathena/config-package-dev/check-files.mk
> trunk/debathena/debathena/config-package-dev/debian/changelog
> trunk/debathena/debathena/config-package-dev/debian/control
> trunk/debathena/debathena/config-package-dev/debian/control.in
> trunk/debathena/debathena/config-package-dev/decode
> trunk/debathena/debathena/config-package-dev/encode
> Log:
> In config-package-dev:
> * Fix DEB_CHECK_FILES and DEB_TRANSFORM_FILES with non-conffiles in
> Multi-Arch: same packages.
> * Fix encode script to work with Perl 5.12. While we?\226?\128?\153re a=
t it, turn on
> strict and warnings.
> * Bump Standards-Version to 3.9.2 (no changes required).
> * Add Vcs-Git, Vcs-Browser.
>
> Modified: trunk/debathena/debathena/config-package-dev/check-files.mk
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> --- trunk/debathena/debathena/config-package-dev/check-files.mk=092011-10=
-25 18:14:42 UTC (rev 25425)
> +++ trunk/debathena/debathena/config-package-dev/check-files.mk=092011-10=
-26 00:13:50 UTC (rev 25426)
> @@ -61,19 +61,21 @@
> $(call debian_check_files_tmp,%): target =3D $(call undebian_check_files_=
tmp,$@)
> $(call debian_check_files_tmp,%): name =3D $(call debian_check_files_chec=
k,$(target))
> $(call debian_check_files_tmp,%): truename =3D $(shell /usr/sbin/dpkg-div=
ert --truename $(name))
> -$(call debian_check_files_tmp,%): package =3D $(shell dpkg -S $(name) | =
grep -v "^diversion by" | cut -f1 -d:)
> +$(call debian_check_files_tmp,%): package =3D $(shell dpkg -S $(name) | =
sed -n '/^diversion by /! s/: .*$$// p')
> $(call debian_check_files_tmp,%): $(truename)
> =09[ -n "$(package)" ]
> =09mkdir -p $(@D)
> =09cp "$(truename)" $@
> =09set -e; \
> +=09md5sums=3D"$$(dpkg-query --control-path $(package) md5sums 2>/dev/nul=
l)" || \
> +=09 md5sums=3D/var/lib/dpkg/info/$(package).md5sums; \
> =09md5=3D$$(dpkg-query --showformat=3D'$${Conffiles}\n' --show $(package)=
| \
> =09 sed -n 's,^ $(name) \([0-9a-f]*\)$$,\1 $@, p'); \
> =09if [ -n "$$md5" ]; then \
> =09 echo "$$md5" | md5sum -c; \
> -=09elif [ -e /var/lib/dpkg/info/$(package).md5sums ]; then \
> +=09elif [ -e "$$md5sums" ]; then \
> =09 md5=3D$$(sed -n 's,^\([0-9a-f]*\) $(patsubst /%,%,$(name))$$,\1 =
$@, p' \
> -=09=09/var/lib/dpkg/info/$(package).md5sums); \
> +=09=09"$$md5sums"); \
> =09 [ -n "$$md5" ] && echo "$$md5" | md5sum -c; \
> =09else \
> =09 echo "config-package-dev: warning: $(package) does not include md5=
sums!"; \
>
> Modified: trunk/debathena/debathena/config-package-dev/debian/changelog
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> --- trunk/debathena/debathena/config-package-dev/debian/changelog=092011-=
10-25 18:14:42 UTC (rev 25425)
> +++ trunk/debathena/debathena/config-package-dev/debian/changelog=092011-=
10-26 00:13:50 UTC (rev 25426)
> @@ -1,3 +1,14 @@
> +config-package-dev (4.13) unstable; urgency=3Dlow
> +
> + * Fix DEB_CHECK_FILES and DEB_TRANSFORM_FILES with non-conffiles in
> + Multi-Arch: same packages.
> + * Fix encode script to work with Perl 5.12. While we=E2=80=99re at it=
, turn on
> + strict and warnings.
> + * Bump Standards-Version to 3.9.2 (no changes required).
> + * Add Vcs-Git, Vcs-Browser.
> +
> + -- Anders Kaseorg <andersk@mit.edu> Tue, 25 Oct 2011 20:08:02 -0400
> +
> config-package-dev (4.12) unstable; urgency=3Dlow
>
> [ Tim Abbott ]
>
> Modified: trunk/debathena/debathena/config-package-dev/debian/control
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> --- trunk/debathena/debathena/config-package-dev/debian/control=092011-10=
-25 18:14:42 UTC (rev 25425)
> +++ trunk/debathena/debathena/config-package-dev/debian/control=092011-10=
-26 00:13:50 UTC (rev 25426)
> @@ -4,10 +4,12 @@
> Maintainer: Tim Abbott <tabbott@mit.edu>
> Uploaders: Anders Kaseorg <andersk@mit.edu>
> Homepage: http://debathena.mit.edu/config-package-dev
> +Vcs-Git: git://andersk.mit.edu/config-package-dev.git
> +Vcs-Browser: http://andersk.mit.edu/gitweb/config-package-dev.git
> Build-Depends: cdbs,
> debhelper (>=3D 6),
> dh-buildinfo
> -Standards-Version: 3.9.1
> +Standards-Version: 3.9.2
>
> Package: config-package-dev
> Architecture: all
>
> Modified: trunk/debathena/debathena/config-package-dev/debian/control.in
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> --- trunk/debathena/debathena/config-package-dev/debian/control.in=092011=
-10-25 18:14:42 UTC (rev 25425)
> +++ trunk/debathena/debathena/config-package-dev/debian/control.in=092011=
-10-26 00:13:50 UTC (rev 25426)
> @@ -4,8 +4,10 @@
> Maintainer: Tim Abbott <tabbott@mit.edu>
> Uploaders: Anders Kaseorg <andersk@mit.edu>
> Homepage: http://debathena.mit.edu/config-package-dev
> +Vcs-Git: git://andersk.mit.edu/config-package-dev.git
> +Vcs-Browser: http://andersk.mit.edu/gitweb/config-package-dev.git
> Build-Depends: @cdbs@
> -Standards-Version: 3.9.1
> +Standards-Version: 3.9.2
>
> Package: config-package-dev
> Architecture: all
>
> Modified: trunk/debathena/debathena/config-package-dev/decode
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> --- trunk/debathena/debathena/config-package-dev/decode=092011-10-25 18:1=
4:42 UTC (rev 25425)
> +++ trunk/debathena/debathena/config-package-dev/decode=092011-10-26 00:1=
3:50 UTC (rev 25426)
> @@ -1,4 +1,8 @@
> #!/usr/bin/perl
> +
> +use strict;
> +use warnings;
> +
> $ARGV[0] =3D~ s/\+([^+]*)\+/unparse($1)/eg;
> print $ARGV[0];
> sub unparse {
>
> Modified: trunk/debathena/debathena/config-package-dev/encode
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> --- trunk/debathena/debathena/config-package-dev/encode=092011-10-25 18:1=
4:42 UTC (rev 25425)
> +++ trunk/debathena/debathena/config-package-dev/encode=092011-10-26 00:1=
3:50 UTC (rev 25426)
> @@ -10,10 +10,12 @@
> # This encoding is intended to be human-readable, so that users can
> # determine the cause of conflicts between different configuration
> # packages.
> +
> +use strict;
> +use warnings;
>
> $ARGV[0] =3D~ s,^/,,;
> -split('', $ARGV[0]);
> -foreach (@_){
> +foreach (split('', $ARGV[0])) {
> if (m/[a-z0-9.-]/) {
> =09print "$_";
> } elsif (m/[A-Z]/) {
>
>
---1156401407-1300816609-1319589050=:29514--
