many people manually edit the debian/control file, not realising that it is auto-generated, (and their changes will be lost) a warning message in the file, would stop people making this mistake
Created attachment 16847 [details] [review] A patch
This looks totally safe to me. As it's not really essential, I'll let it go through the normal signoff process unless the RM feels like pushing it through.
Created attachment 16880 [details] [review] Bug 8816: Add warning about manual edits to top of debian/control And we need to add it to control.in as well, because control is created from control.in (which is the whole point of the warning ;) Signed-off-by: Mason James <mtj@kohaaloha.com>
(In reply to comment #2) > This looks totally safe to me. As it's not really essential, I'll let it go > through the normal signoff process unless the RM feels like pushing it > through. hmm, #comment lines seem to cause a parsing error, and make Parse::Deb::Control barf "Field names must not begin with the comment character, #." http://www.debian.org/doc/debian-policy/ch-controlfields.html#s-controlsyntax i'll send a patch to fix
Created attachment 16901 [details] [review] Bug 8816: Add warning about manual edits to top of debian/control And we need to add it to control.in as well, because control is created from control.in (which is the whole point of the warning ;)
(In reply to comment #4) > (In reply to comment #2) > > This looks totally safe to me. As it's not really essential, I'll let it go > > through the normal signoff process unless the RM feels like pushing it > > through. > > hmm, #comment lines seem to cause a parsing error oops, my bad the #comment lines are ok after all, i'll revert my new patch
Comment on attachment 16901 [details] [review] Bug 8816: Add warning about manual edits to top of debian/control >From 58ee3231373b451f433d61befa41b45f5e4704ac Mon Sep 17 00:00:00 2001 >From: Mason James <mtj@kohaaloha.com> >Date: Wed, 27 Mar 2013 07:44:55 +1300 >Subject: [PATCH] Bug 8816: Add warning about manual edits to top of debian/control >Content-Type: text/plain; charset="utf-8" > >And we need to add it to control.in as well, because control is >created from control.in (which is the whole point of the warning ;) >--- > debian/control | 17 ++++++++++++----- > debian/control.in | 13 ++++++++----- > 2 files changed, 20 insertions(+), 10 deletions(-) > >diff --git a/debian/control b/debian/control >index be19e0c..b8e827c 100644 >--- a/debian/control >+++ b/debian/control >@@ -3,9 +3,16 @@ Maintainer: Robin Sheat <robin@catalyst.net.nz> > Section: web > Priority: optional > Standards-Version: 3.8.4 >-# NOTA BENE: Build dependencies end up as runtime dependencies as well. >-# See debian/rules, the override_dh_gencontrol rules. >-# There are some exceptions. >+XBC-Comment: WARNING: The "control" file is manually generated from the "control.in" file. >+ Do not manually edit "control" or your changes will be clobbered when you >+ run update-control >+ NOTA BENE: Build dependencies end up as runtime dependencies as well. >+ See debian/rules, the override_dh_gencontrol rules. >+ There are some exceptions. >+Build-Depends:__AUTODEPENDS__, >+ debhelper (>= 7.0.50), gettext, python, python-debian, xsltproc, docbook-xsl, >+ libxml2-utils >+ > Build-Depends: libalgorithm-checkdigits-perl, > libanyevent-http-perl, > libanyevent-perl, >@@ -111,7 +118,7 @@ Build-Depends: libalgorithm-checkdigits-perl, > libyaml-perl, > libyaml-syck-perl, > perl, >- perl-modules, >+ perl-modules, > debhelper (>= 7.0.50), gettext, python, python-debian, xsltproc, docbook-xsl, > libxml2-utils > >@@ -130,7 +137,7 @@ Depends: ${misc:Depends}, ${koha:Depends}, > perl-doc, > pwgen, > sudo, >- tinymce2, >+ tinymce2, > unzip, > xmlstarlet, > yaz >diff --git a/debian/control.in b/debian/control.in >index a30aeed..b84c040 100644 >--- a/debian/control.in >+++ b/debian/control.in >@@ -3,10 +3,13 @@ Maintainer: Robin Sheat <robin@catalyst.net.nz> > Section: web > Priority: optional > Standards-Version: 3.8.4 >-# NOTA BENE: Build dependencies end up as runtime dependencies as well. >-# See debian/rules, the override_dh_gencontrol rules. >-# There are some exceptions. >-Build-Depends:__AUTODEPENDS__, >+XBC-Comment: WARNING: The "control" file is manually generated from the "control.in" file. >+ Do not manually edit "control" or your changes will be clobbered when you >+ run update-control >+ NOTA BENE: Build dependencies end up as runtime dependencies as well. >+ See debian/rules, the override_dh_gencontrol rules. >+ There are some exceptions. >+Build-Depends:__AUTODEPENDS__, > debhelper (>= 7.0.50), gettext, python, python-debian, xsltproc, docbook-xsl, > libxml2-utils > >@@ -25,7 +28,7 @@ Depends: ${misc:Depends}, ${koha:Depends}, > perl-doc, > pwgen, > sudo, >- tinymce2, >+ tinymce2, > unzip, > xmlstarlet, > yaz >-- >1.7.2.5
Created attachment 17068 [details] [review] [PASSED QA] Bug 8816: Add warning about manual edits to top of debian/control And we need to add it to control.in as well, because control is created from control.in (which is the whole point of the warning ;) Signed-off-by: Mason James <mtj@kohaaloha.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Adds comments with a warning.
This patch has been pushed to master. Welcome, Aaron, you're the 207th person to have a patch committed to Koha.
This was pushed to 3.10.x and released in 3.10.5