Hi Eddy, thanks for your reply.
On Thu, Nov 27, 2008 at 08:37:38AM +0200, Eddy Petrișor wrote: > In the light of your points, I say the plan goes as follows: > - remove option from help (done in code, but you must remove that from the > docs, too) > - keep the option as a silent one (readd the option, but keep it hidden) > - put a BIG WARNING that linda is deprecated, both when the option is > detected and/or > when the linda would have ran I gave it another try :) and the diff is attached. Since my English is not the best and I don't know the svn-buildpackage's internals (yet ;-)) I'd appreciate if you reviewd it and gave me an OK to upload it if my patch is what you had in mind. Thanks, Hauke
Index: svn-buildpackage
===================================================================
--- svn-buildpackage (Revision 11883)
+++ svn-buildpackage (Arbeitskopie)
@@ -65,6 +65,8 @@
my $opt_tag;
my $opt_only_tag;
my $opt_lintian;
+my $opt_linda; # deprecated; to be completely removed in next major release?
+ my $linda_warning = "########\nWARNING!\nlinda is not developed any more and deprecated.\nPlease remove any reference to it from your config files!\n########\n\n";
my $opt_nolinks;
my $opt_noninteractive;
my $opt_pretag;
@@ -98,6 +100,7 @@
"svn-tag" => \$opt_tag,
"svn-retag" => \$opt_retag,
"svn-lintian" => \$opt_lintian,
+ "svn-linda" => \$opt_linda,
"svn-no-links" => \$opt_nolinks,
"svn-noninteractive" => \$opt_noninteractive,
"svn-pass-diff" => \$opt_pass_diff,
@@ -190,6 +193,7 @@
# convert to options and push to args
s/^/--/;
$_=`echo -n $_` if(/[\$`~]/);
+ print $linda_warning if /--svn-linda/;
push(@CONFARGS, $_);
}
}
@@ -609,6 +613,7 @@
if($opt_lintian) {
withecho "lintian", "$destdir/$chfile";
}
+ print $linda_warning if($opt_linda);
}
if($opt_tag) {
Index: debian/NEWS.Debian
===================================================================
--- debian/NEWS.Debian (Revision 11883)
+++ debian/NEWS.Debian (Arbeitskopie)
@@ -1,3 +1,15 @@
+svn-buildpackage (0.6.24) experimental; urgency=low
+
+ Please note that the option to run package checks by linda has been droped.
+ Since linda is not developed any more and deprecated you should use lintian
+ instead. For now svn-buildpackage will trigger a warning whenever the
+ svn-linda option was found but please remove any references to it from our
+ config files. Later versions of svn-buildpackage will drop the svn-linda
+ option completely which would break your build process if you still have
+ svn-linda in your config files.
+
+ -- Jan Hauke Rahm <[EMAIL PROTECTED]> Fri, 28 Nov 2008 10:14:59 +0100
+
svn-buildpackage (0.6.22) experimental; urgency=low
IMPORTANT: changed default behaviour of saving the configuration in
@@ -24,3 +36,22 @@
/usr/share/svn-buildpackage/contrib
-- Eduard Bloch <[EMAIL PROTECTED]> Wed, 11 Apr 2007 12:41:54 +0200
+svn-buildpackage (0.6.24) experimental; urgency=low
+
+ IMPORTANT: changed default behaviour of saving the configuration in
+ .svn/deb-layout by default to avoid stale data to override the
+ configuration options that were updated in the repository.
+ (Closes: #414581)
+ As a consequence, a new option --svn-savecfg was added to allow a
+ mechanism for easily overriding options locally
+ The priority of the layout information should now be imported in the
+ following order:
+ properties -> debian/svn-deblayout -> .svn/deb-layout -> command line
+
+ is recommended to drop usage of debian/svn-deblayout in favour of svn
+ properties; a simple tool to allow the migration is already present in
+ /usr/share/svn-buildpackage/contrib/deblayout2svnprops
+
+
+
+ -- Jan Hauke Rahm <[EMAIL PROTECTED]> Fri, 28 Nov 2008 10:14:59 +0100
Index: doc/svn-buildpackage.sgml
===================================================================
--- doc/svn-buildpackage.sgml (Revision 11883)
+++ doc/svn-buildpackage.sgml (Arbeitskopie)
@@ -109,7 +109,7 @@
</glossterm>
<glossdef>
<para>Specifies alternative build command instead of dpkg-buildpackage, eg. debuild, pdebuild, etc. Every parameters that svn-buildpackage doesn't know (<emphasis>--svn-*</emphasis>) are passed to COMMAND. There is no difference between the command line and config file parameters . They are used at the same time.</para>
- <para>WARNING: shell quotation rules do not completely apply here, better use wrappers for complex constructs. Using this option may break <emphasis>--svn-lintian</emphasis>, <emphasis>--svn-linda</emphasis> and <emphasis>--svn-move</emphasis> functionality. Some functions may be disabled when a custom build command is used because the output file location is not predictable.</para>
+ <para>WARNING: shell quotation rules do not completely apply here, better use wrappers for complex constructs. Using this option may break <emphasis>--svn-lintian</emphasis> and <emphasis>--svn-move</emphasis> functionality. Some functions may be disabled when a custom build command is used because the output file location is not predictable.</para>
</glossdef>
</glossentry>
@@ -240,11 +240,10 @@
<glossterm>
<cmdsynopsis><group>
<arg><option>--svn-lintian</option></arg>
- <arg><option>--svn-linda</option></arg>
</group></cmdsynopsis>
</glossterm>
<glossdef>
- <para>Run lintian or linda on the resulting changes file when done.</para>
+ <para>Run lintian on the resulting changes file when done.</para>
</glossdef>
</glossentry>
signature.asc
Description: Digital signature
