Bug#705494: unblock: fpc/2.6.0-9
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Please unblock package fpc
Version 2.6.0-9 fixes bug 704252 where it was reported that the package
change the debian/control file during the build process.
The proposed fix was approved by Jonathan on IRC on Wednesday, however,
as can seen in the follow-up in bug 704252 after my upload of 2.6.0-8, the
fix had it's bugs, so the final change from the current 2.6.0-7 to 2.6.0-9
is kept very simple, as it should at this stage of the release.
Please find attached the debdiff between 2.6.0-7 and 2.6.0-9.
unblock fpc/2.6.0-9
- -- System Information:
Debian Release: 7.0
APT prefers testing
APT policy: (500, 'testing'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.2.0-4-amd64 (SMP w/1 CPU core)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iQEcBAEBCAAGBQJRbCzhAAoJEJxcmesFvXUKlo0H/1qNQfRjkHY//5YXgLPpJzL7
SHz6mmOfhgt/JCwILC0kzfvwcRkRCYiSQ1FtnEhDx9xf3PuCtPlcda1VgEHNXv1l
q7ftNcIk1YxBzA8kMwlq94tlYZ7PNpRjMoBeBrmA+i0ejb/asywAYBoMnTo0lhxh
UvITCYivpPhAnR8iJ1+dRKDE+yXQBvd5SL14WYfpOm7dxccDn6G76e0xfLoRnDeO
IKg99v+4Oze0g0HqXY76YniHy3IW1IU2ze+u7w7NpBuvj7USe63FfLjow03MOpUO
oD39naDBsdb8p9KPq6GGXZ3JoB+IENnj3y5g9i6z5E/PFKqYt9heIM7kD9OuSN0=
=VYTu
-----END PGP SIGNATURE-----
diff -Nru fpc-2.6.0/debian/changelog fpc-2.6.0/debian/changelog
--- fpc-2.6.0/debian/changelog 2012-12-22 10:12:58.000000000 +0100
+++ fpc-2.6.0/debian/changelog 2013-04-13 10:09:02.000000000 +0200
@@ -1,3 +1,18 @@
+fpc (2.6.0-9) unstable; urgency=low
+
+ * Revert previous broken and unnessacerally intrustive fix for debian/control
+ issue. Replace it with a more targetted fix inspired by abou's and paul's
+ proposed patches.
+
+ -- Peter Michael Green <plugwash@debian.org> Sat, 13 Apr 2013 07:52:42 +0000
+
+fpc (2.6.0-8) unstable; urgency=low
+
+ * Removed auto-generation of debian/control during build process as required
+ by policy. (Closes: Bug#704252)
+
+ -- Abou Al Montacir <abou.almontacir@sfr.fr> Tue, 26 Mar 2013 09:54:00 +0100
+
fpc (2.6.0-7) unstable; urgency=low
* Proofread templates by debian-l10n-english list. (Closes: Bug#686038)
diff -Nru fpc-2.6.0/debian/fixdeb fpc-2.6.0/debian/fixdeb
--- fpc-2.6.0/debian/fixdeb 2012-11-28 08:00:37.000000000 +0100
+++ fpc-2.6.0/debian/fixdeb 2013-04-13 10:09:39.000000000 +0200
@@ -27,5 +27,8 @@
for i in $1/*.in
do
j=`basename ${i} .in`
- sed ${SUBST_CMD} ${i} > $1/${j/./${PACKAGESUFFIX}.}
+ if ${GEN_CONTROL} || test ${j} != 'control'
+ then
+ sed ${SUBST_CMD} ${i} > $1/${j/./${PACKAGESUFFIX}.}
+ fi
done
diff -Nru fpc-2.6.0/debian/rules fpc-2.6.0/debian/rules
--- fpc-2.6.0/debian/rules 2012-11-28 07:31:42.000000000 +0100
+++ fpc-2.6.0/debian/rules 2013-04-14 01:02:21.000000000 +0200
@@ -169,9 +169,13 @@
debian-files: debian-files-stamp
debian-files-stamp:
@echo "--- Creating/fixing *.install files"
- /bin/bash debian/fixdeb debian $(FPCTARGET) $(PPNEW)
+ GEN_CONTROL=false /bin/bash debian/fixdeb debian $(FPCTARGET) $(PPNEW)
touch debian-files-stamp
+debian/control: debian/control.in
+ GEN_CONTROL=true /bin/bash debian/fixdeb debian $(FPCTARGET) $(PPNEW)
+
+
###################
# Arch packages
#
Reply to: