On 11:21 Sat 19 Oct , intrigeri wrote: > Hi, > > Vasudev Kamath wrote (19 Oct 2013 05:59:12 GMT) : > >> It seems to me that the attached patch symlinks > >> /usr/share/xmail/sample to /usr/share/doc/xmail/sample (while it > >> should do the contrary, right?) and does not move > >> /usr/share/doc/xmail/sample to /usr/share/xmail/sample. > > > Regarding the symbolic linking excerpt from � 12.3 > > >>> Packages must not require the existence of any files in /usr/share/doc/ > >>> in order to function 7 . Any files that are refer- enced by programs but > >>> are also useful as stand alone documentation should be installed under > >>> /usr/share/package/ with symbolic links from /usr/share/doc/package. > > > So did I do something wrong in understanding above? > > I believe you did it the wrong way. > > >> Vasudev, did you actually test it with 'dpkg --path-exclude=...'? > > > Regarding dpkg --path-exclude=... actually I don't know how to execute > > this with piuparts as stated in bug report. I also encountered some > > other error with piuparts which I mentioned in the bug report reply. > > I think you should install the patched package without piuparts,
I see I tested this and it works fine.
> but with dpkg --path-exclude=, see if it installs and configures fine,
> look at the resulting symlinks, and see if it makes sense to you :)
>
> (Or I am totally misunderstanding your path, which is possible too.)
Symbolic link looks sane
root@rudra:/usr/share/xmail# ls -l
total 0
lrwxrwxrwx 1 root root 19 Oct 19 05:44 sample -> ../doc/xmail/sample
root@rudra:/usr/share/xmail#
So I guess patch is fine then?
>
> >> Also, although a minor issue, unrelated whitespace changes are
> >> generally not well suited for a NMU.
>
> > Are you referring to new lines introduced by me or is there any
> > whitespace in patch? I just did a white space cleanup on patch let me
> > know if its fine.
>
> The attached patch removes an empty line somewhere unrelated to
> its purpose. That's what I call "unrelated changes".
Ah okay here comes the fixed patch
Best Regards
--
Vasudev Kamath
http://copyninja.info
Connect on ~friendica: copyninja@{frndk.de | vasudev.homelinux.net}
IRC nick: copyninja | vasudev {irc.oftc.net | irc.freenode.net}
GPG Key: C517 C25D E408 759D 98A4 C96B 6C8F 74AE 8770 0B7E
diff -u xmail-1.27/debian/changelog xmail-1.27/debian/changelog
--- xmail-1.27/debian/changelog
+++ xmail-1.27/debian/changelog
@@ -1,3 +1,13 @@
+xmail (1.27-1.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Symlink contents of /usr/share/doc/xmail/sample to /usr/share/xmail/
+ in rules file and use the file from /usr/share/xmail/ in maintainer
+ script.
+ Closes: bug#710311. Thanks to Andreas Beckmann.
+
+ -- Vasudev Kamath <kamathvasu...@gmail.com> Sat, 21 Sep 2013 14:01:46 +0530
+
xmail (1.27-1.1) unstable; urgency=low
* Non-maintainer upload.
diff -u xmail-1.27/debian/rules xmail-1.27/debian/rules
--- xmail-1.27/debian/rules
+++ xmail-1.27/debian/rules
@@ -85,6 +85,9 @@
cp MailRoot/*.tab $(DESTDIR)/usr/share/doc/xmail/sample/
cp MailRoot/dnsroots $(DESTDIR)/usr/share/doc/xmail/sample/
+ # symlink the sample cfgs to /usr/share/xmail
+ dh_link /usr/share/doc/xmail/sample /usr/share/xmail/sample
+
touch $(DESTDIR)/etc/xmail/cmd_line
#Enable Logging
echo "Md -Pl -Sl -Fl -Cl -Ll" > $(DESTDIR)/etc/xmail/cmd_line
diff -u xmail-1.27/debian/postinst xmail-1.27/debian/postinst
--- xmail-1.27/debian/postinst
+++ xmail-1.27/debian/postinst
@@ -15,8 +15,8 @@
if [ -z "$2" ]; then
#we are installing for the first time
- cp /usr/share/doc/xmail/sample/*.tab /etc/xmail
- cp /usr/share/doc/xmail/sample/dnsroots /etc/xmail
+ cp /usr/share/xmail/sample/*.tab /etc/xmail
+ cp /usr/share/xmail/sample/dnsroots /etc/xmail
#make links to xmail config files
ln -s /etc/xmail/*.tab /var/lib/xmail/
ln -s /etc/xmail/dnsroots /var/lib/xmail
signature.asc
Description: Digital signature
