gnustep-base 1.13.0-7: fixes #402558 (really, this time)
As per the previous discussion, I have renamed the pl binary in
gnustep-base-runtime, to avoid the conflict with tendra, in order to
fix bug #402558. I have checked that the new name is not contained in
any other package (at least not in sid, i386).
Since this bug is a policy violation, I would like to request a freeze
exception for gnustep-base 1.13.0-7. The only change between 1.13.0-7
and 1.13.0-5 (which is currently in sid/etch) is the renaming of the
program, manpage, and updating the manpage and README. Here is the
interdiff between 1.13.0-5 and 1.13.0-7 (line breaks will probably get
messed up by my mailer):
diff -u gnustep-base-1.13.0/debian/README.Debian
gnustep-base-1.13.0/debian/README.Debian
--- gnustep-base-1.13.0/debian/README.Debian
+++ gnustep-base-1.13.0/debian/README.Debian
@@ -39,6 +39,9 @@
If you're going to run GNUstep applications regularly, you certainly
want to put this in your .bashrc or something.
+Note: Due to a conflict with the tendra package, the pl tool for
reading and
+writing property lists has been renamed plio in Debian.
+
Examples
--------
@@ -134,0 +138,2 @@
+
+ -- Hubert Chan <uhoreg@debian.org>, Tue, 12 Dec 2006 14:10:43 -0500
diff -u gnustep-base-1.13.0/debian/changelog
gnustep-base-1.13.0/debian/changelog
--- gnustep-base-1.13.0/debian/changelog
+++ gnustep-base-1.13.0/debian/changelog
@@ -1,3 +1,17 @@
+gnustep-base (1.13.0-7) unstable; urgency=low
+
+ * Revert conflict: with tendra; rename pl binary to plio, as per
Section
+ 10.1 of Policy. (really closes: #402558)
+
+ -- Hubert Chan <uhoreg@debian.org> Tue, 12 Dec 2006 13:31:22 -0500
+
+gnustep-base (1.13.0-6) unstable; urgency=low
+
+ * gnustep-base-runtime: Conflict: with tendra, since they both
contain
+ the pl binary and manpage. (Closes: #402558)
+
+ -- Hubert Chan <uhoreg@debian.org> Mon, 11 Dec 2006 16:33:09 -0500
+
gnustep-base (1.13.0-5) unstable; urgency=low
* Remove obsolete dependency on timezoneconf. (Closes: #397423)
diff -u gnustep-base-1.13.0/debian/rules
gnustep-base-1.13.0/debian/rules
--- gnustep-base-1.13.0/debian/rules
+++ gnustep-base-1.13.0/debian/rules
@@ -487,14 +487,17 @@
Tools/pldes.1 Tools/sfparse.1 Tools/xmlparse.1
dh_link -a
+ @: # rename pl binary, to avoid conflict with tendra package
+ mv $(d_run)/$(GS_SYSTEM_ROOT)/Tools/pl
$(d_run)/$(GS_SYSTEM_ROOT)/Tools/plio
+
@: # create wrapper scripts
mkdir -p $(d_run)/usr/bin $(d_run)/usr/sbin
- for i in autogsdoc cvtenc defaults gdnc pl pl2link pldes plget
\
+ for i in autogsdoc cvtenc defaults gdnc plio pl2link pldes
plget \
plmerge plparse plser sfparse xmlparse; \
do \
ln -sf gnustep-tool-wrapper $(d_run)/usr/bin/$$i; \
done
- for i in pl plget plser plmerge plparse pl2link; do \
+ for i in plio plget plser plmerge plparse pl2link; do \
ln -sf pldes.1 $(d_run)/usr/share/man/man1/$$i.1; \
done
for i in gdomap; do \
only in patch2:
unchanged:
--- gnustep-base-1.13.0.orig/Tools/pldes.1
+++ gnustep-base-1.13.0/Tools/pldes.1
@@ -25,7 +25,7 @@
.nl
.BI "pl2link " "input-file" " [ " "destination-file" " ]"
.nl
-.BI "pl -input [ " "input-file" " ] " " -output [ "
"destination-file" " ]"
+.BI "plio -input [ " "input-file" " ] " " -output [ "
"destination-file" " ]"
.nl
.SH DESCRIPTION
@@ -59,9 +59,9 @@
.IP "\fBpl2link\fR \fIinput-file\fR [ \fIdestination-file\fR ]" 4
Produces a desktop link file for KDE and Gnome for the given text
representation of a property list.
-.IP "\fBpl\fR \fI-input\fR [ \fIinput-file\fR ]" 4
+.IP "\fBplio\fR \fI-input\fR [ \fIinput-file\fR ]" 4
Takes the serialized plist represented by input-file and outputs it
to standard output.
-.IP "\fBpl\fR \fI-output\fR [ \fIdestination-file\fR ]" 4
+.IP "\fBplio\fR \fI-output\fR [ \fIdestination-file\fR ]" 4
Takes a plist from standard input and serializes it into
destination-file.
.PP
@@ -84,4 +84,4 @@
was written by Fred Kiefer <FredKiefer@gmx.de>.
.PP
.B pl
-was written by Gregory Casamento <greg_casamento@yahoo.com>.
+(renamed to plio in Debian) was written by Gregory Casamento
<greg_casamento@yahoo.com>.
--
Hubert Chan <uhoreg@debian.org> -- Jabber: hubert@uhoreg.ca
PGP/GnuPG key: 1024D/124B61FA http://www.uhoreg.ca/
Fingerprint: 96C5 012F 5F74 A5F7 1FF7 5291 AF29 C719 124B 61FA
Reply to: