[26157] in Source-Commits
/svn/athena r25426 - in trunk/debathena/debathena/config-package-dev: . debian
daemon@ATHENA.MIT.EDU (Anders Kaseorg)
Tue Oct 25 20:13:51 2011
Date: Tue, 25 Oct 2011 20:13:50 -0400
From: Anders Kaseorg <andersk@MIT.EDU>
Message-Id: <201110260013.p9Q0Dosd014120@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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 at 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
===================================================================
--- trunk/debathena/debathena/config-package-dev/check-files.mk 2011-10-25 18:14:42 UTC (rev 25425)
+++ trunk/debathena/debathena/config-package-dev/check-files.mk 2011-10-26 00:13:50 UTC (rev 25426)
@@ -61,19 +61,21 @@
$(call debian_check_files_tmp,%): target = $(call undebian_check_files_tmp,$@)
$(call debian_check_files_tmp,%): name = $(call debian_check_files_check,$(target))
$(call debian_check_files_tmp,%): truename = $(shell /usr/sbin/dpkg-divert --truename $(name))
-$(call debian_check_files_tmp,%): package = $(shell dpkg -S $(name) | grep -v "^diversion by" | cut -f1 -d:)
+$(call debian_check_files_tmp,%): package = $(shell dpkg -S $(name) | sed -n '/^diversion by /! s/: .*$$// p')
$(call debian_check_files_tmp,%): $(truename)
[ -n "$(package)" ]
mkdir -p $(@D)
cp "$(truename)" $@
set -e; \
+ md5sums="$$(dpkg-query --control-path $(package) md5sums 2>/dev/null)" || \
+ md5sums=/var/lib/dpkg/info/$(package).md5sums; \
md5=$$(dpkg-query --showformat='$${Conffiles}\n' --show $(package) | \
sed -n 's,^ $(name) \([0-9a-f]*\)$$,\1 $@, p'); \
if [ -n "$$md5" ]; then \
echo "$$md5" | md5sum -c; \
- elif [ -e /var/lib/dpkg/info/$(package).md5sums ]; then \
+ elif [ -e "$$md5sums" ]; then \
md5=$$(sed -n 's,^\([0-9a-f]*\) $(patsubst /%,%,$(name))$$,\1 $@, p' \
- /var/lib/dpkg/info/$(package).md5sums); \
+ "$$md5sums"); \
[ -n "$$md5" ] && echo "$$md5" | md5sum -c; \
else \
echo "config-package-dev: warning: $(package) does not include md5sums!"; \
Modified: trunk/debathena/debathena/config-package-dev/debian/changelog
===================================================================
--- trunk/debathena/debathena/config-package-dev/debian/changelog 2011-10-25 18:14:42 UTC (rev 25425)
+++ trunk/debathena/debathena/config-package-dev/debian/changelog 2011-10-26 00:13:50 UTC (rev 25426)
@@ -1,3 +1,14 @@
+config-package-dev (4.13) unstable; urgency=low
+
+ * 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’re 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=low
[ Tim Abbott ]
Modified: trunk/debathena/debathena/config-package-dev/debian/control
===================================================================
--- trunk/debathena/debathena/config-package-dev/debian/control 2011-10-25 18:14:42 UTC (rev 25425)
+++ trunk/debathena/debathena/config-package-dev/debian/control 2011-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 (>= 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
===================================================================
--- trunk/debathena/debathena/config-package-dev/debian/control.in 2011-10-25 18:14:42 UTC (rev 25425)
+++ trunk/debathena/debathena/config-package-dev/debian/control.in 2011-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
===================================================================
--- trunk/debathena/debathena/config-package-dev/decode 2011-10-25 18:14:42 UTC (rev 25425)
+++ trunk/debathena/debathena/config-package-dev/decode 2011-10-26 00:13:50 UTC (rev 25426)
@@ -1,4 +1,8 @@
#!/usr/bin/perl
+
+use strict;
+use warnings;
+
$ARGV[0] =~ s/\+([^+]*)\+/unparse($1)/eg;
print $ARGV[0];
sub unparse {
Modified: trunk/debathena/debathena/config-package-dev/encode
===================================================================
--- trunk/debathena/debathena/config-package-dev/encode 2011-10-25 18:14:42 UTC (rev 25425)
+++ trunk/debathena/debathena/config-package-dev/encode 2011-10-26 00:13: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] =~ s,^/,,;
-split('', $ARGV[0]);
-foreach (@_){
+foreach (split('', $ARGV[0])) {
if (m/[a-z0-9.-]/) {
print "$_";
} elsif (m/[A-Z]/) {
