2008/11/28 Jan Hauke Rahm <[EMAIL PROTECTED]>:
> Sorry, the patch is somewhat wrong... :-/
>
> Attached is a new patch.
That looks better, still there were some minor issues (the warning
wasn't always showed, small wording issues) which I fixed (can't
commit now, so I'm sending the modified patch - apply over current
trunk).
Please commit it.
--
Regards,
EddyP
=============================================
"Imagination is more important than knowledge" A.Einstein
Index: svn-buildpackage
===================================================================
--- svn-buildpackage (revision 11883)
+++ svn-buildpackage (working copy)
@@ -83,6 +83,27 @@
my $opt_savecfg;
my $opt_dbgsdcommon;
+# deprecated; to be completely removed in next major release?
+my $opt_linda;
+my $linda_warning = <<EOLINDAW;
+
+################################################################################
+
+ !!!!!!!! WARNING: linda is deprecated and no longer developed !!!!!!!!
+ The corresponding option is still accepted, but is ignored.
+
+ If the option svn-linda is present in your ~/.svn-buildpackage.conf
+ or any scripts you might use to call svn-buildpackage, please remove
+ it! This option is scheduled for complete removal in the near
+ future, so using it would lead to broken builds with such future
+ versions of svn-buildpackage.
+
+ !!!!!!! PLEASE STOP USING THE OPTION --svn-linda / svn-linda !!!!!!!
+
+################################################################################
+
+EOLINDAW
+
my %options = (
# "h|help" => \&help,
"svn-savecfg" => \$opt_savecfg,
@@ -98,6 +119,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,
@@ -224,6 +246,9 @@
needs_tagsUrl if($opt_tag);
my $c=\%SDCommon::c;
+# linda is deprecated - big fat warning since we found it
+print $linda_warning if (defined $opt_linda);
+
#some things may have been overriden by user options
&setallenv;
if($opt_buildcmd) { # pass @ARGV but carefully
@@ -609,6 +634,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 (working copy)
@@ -1,3 +1,16 @@
+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 or if you pass it from the command line.
+
+ -- 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
Index: doc/svn-buildpackage.sgml
===================================================================
--- doc/svn-buildpackage.sgml (revision 11883)
+++ doc/svn-buildpackage.sgml (working copy)
@@ -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>
