Paul Gevers wrote:
Peter,
Please calm down.
Sorry I could have been clearer in my last mail. I didn't intend to
blame you for most of the issues with the patch (you just took a broken
patch and made it differently broken) but I could see how it could have
come across that way. Still I firmly belive that the name in the
changechangelog trailer should be the person who finalised the upload.
If you belive changes are needed then IMO you should either bounce them
back to the person who prepared the upload for comment or make the
upload in your own name.
Anyway i'm proposing the upload given in the attached debdiff (note:
debdiff is against the version in testing, not the version in unstable).
If noone naks this in the next few days I will go ahead and upload it.
diff -Nru fpc-2.6.0/debian/changelog fpc-2.6.0/debian/changelog
--- fpc-2.6.0/debian/changelog 2012-12-22 09:12:58.000000000 +0000
+++ fpc-2.6.0/debian/changelog 2013-04-13 08:09:02.000000000 +0000
@@ -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 <plugw...@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.almonta...@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 07:00:37.000000000 +0000
+++ fpc-2.6.0/debian/fixdeb 2013-04-13 08:09:39.000000000 +0000
@@ -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 06:31:42.000000000 +0000
+++ fpc-2.6.0/debian/rules 2013-04-13 23:02:21.000000000 +0000
@@ -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
#
