Re: dpatch and .diff.gz files
Hallo David, David Paleino d.pale...@gmail.com wrote: On Fri, 16 Jan 2009 13:26:33 +0900, Charles Plessy wrote: Le Fri, Jan 16, 2009 at 01:01:16PM +1100, Ben Finney a écrit : Examine the ‘foo.diff.gz’ cat foo.diff.gz | lsdiff, for instance lsdiff -z foo.diff.gz | grep -v debian/ lsdiff -z -p1 -xdebian/\* foo.diff.gz Bye, Jörg. -- Das Recht, seine Meinung zu wechseln, ist eines der wichtigsten menschlichen Privilegien. (Robert Peel) -- To UNSUBSCRIBE, email to debian-mentors-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Re: dpatch and .diff.gz files
On Fri, 16 Jan 2009 13:26:33 +0900, Charles Plessy wrote: Le Fri, Jan 16, 2009 at 01:01:16PM +1100, Ben Finney a écrit : Examine the ‘foo.diff.gz’ cat foo.diff.gz | lsdiff, for instance lsdiff -z foo.diff.gz | grep -v debian/ That's what I do :-) David -- . ''`. Debian maintainer | http://wiki.debian.org/DavidPaleino : :' : Linuxer #334216 --|-- http://www.hanskalabs.net/ `. `'` GPG: 1392B174 | http://snipr.com/qa_page `- 2BAB C625 4E66 E7B8 450A C3E1 E6AA 9017 1392 B174 signature.asc Description: PGP signature
Re: dpatch and .diff.gz files
Le Fri, Jan 16, 2009 at 07:34:28AM +0100, Cyril Brulebois a écrit : Charles Plessy ple...@debian.org (16/01/2009): Examine the ‘foo.diff.gz’ cat foo.diff.gz | lsdiff, for instance I think you wanted “zcat”. Anyway, no need to waste a fork: | lsdiff -z foo.diff.gz Nice little gem that was not in the manpage (patch submitted upstream). Thanks for the hint ! -- Charles Plessy Tsurumi, Kanagawa, Japan -- To UNSUBSCRIBE, email to debian-mentors-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
dpatch and .diff.gz files
Hi, I've a question for you: I've a package which I recently adopted and I've created 2 .patch files to fix some open bugs, to manage this I've followed the dpatch procedure, so I add the template, put the patches in debian/patches and so on. When I try to upload the package to mentors.debian.net, lintian says that the package uses a patch-system but the diff.gz cotnains changes made on files without being separated out in a patch. This is the package: http://mentors.debian.net/cgi-bin/sponsor-pkglist?action=details;package=pam-dotfile What do I need to move to dpatch? Am I missing something? Cheers Antonio -- To UNSUBSCRIBE, email to debian-mentors-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Re: dpatch and .diff.gz files
Antonio Radici wrote: When I try to upload the package to mentors.debian.net, lintian says that the package uses a patch-system but the diff.gz cotnains changes made on files without being separated out in a patch. [snip] What do I need to move to dpatch? Am I missing something? FYI I fixed this asking #debian-mentors: I used diff2patches to identify the files outside debian/ (which have to be included in separate patches). Cheers Antonio -- To UNSUBSCRIBE, email to debian-mentors-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Re: dpatch and .diff.gz files
Antonio Radici anto...@dyne.org writes: When I try to upload the package to mentors.debian.net, lintian says that the package uses a patch-system but the diff.gz cotnains changes made on files without being separated out in a patch. Right. Lintian is pointing out that, since you're using a patch system, you should use that patch system for *all* changes you want to make. Examine the ‘foo.diff.gz’ you're trying to upload to see what changes you've made outside the ‘debian/’ directory. Make those changes via ‘dpatch’, instead. This is the package: http://mentors.debian.net/cgi-bin/sponsor-pkglist?action=details;package=pam-dotfile Notice that the most recent version of the ‘foo.diff.gz’ there, URL:http://mentors.debian.net/debian/pool/main/p/pam-dotfile/pam-dotfile_0.7-5.diff.gz, makes no changes outside the ‘debian/’ directory. What do I need to move to dpatch? Am I missing something? Either don't use dpatch at all, or use dpatch for *every* change you want to make to the upstream files. -- \ “I was in the first submarine. Instead of a periscope, they had | `\ a kaleidoscope. ‘We're surrounded.’” —Steven Wright | _o__) | Ben Finney -- To UNSUBSCRIBE, email to debian-mentors-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Re: dpatch and .diff.gz files
Le Fri, Jan 16, 2009 at 01:01:16PM +1100, Ben Finney a écrit : Examine the ‘foo.diff.gz’ cat foo.diff.gz | lsdiff, for instance Make those changes via ‘dpatch’, instead. Note that if the changes you see are in files related to autoconf, the solution goes rather through a proper use of the clean target of debian/rules. Have a nice day, -- Charles Plessy Tsurumi, Kanagawa, Japan -- To UNSUBSCRIBE, email to debian-mentors-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Re: dpatch and .diff.gz files
Charles Plessy ple...@debian.org (16/01/2009): Examine the ‘foo.diff.gz’ cat foo.diff.gz | lsdiff, for instance I think you wanted “zcat”. Anyway, no need to waste a fork: | lsdiff -z foo.diff.gz Mraw, KiBi. signature.asc Description: Digital signature
Re: dpatch and .diff.gz files
Charles Plessy ple...@debian.org writes: Le Fri, Jan 16, 2009 at 01:01:16PM +1100, Ben Finney a écrit : Make those changes via ‘dpatch’, instead. Note that if the changes you see are in files related to autoconf, the solution goes rather through a proper use of the clean target of debian/rules. Right. More generally, ensure that the ‘foo.diff.gz’ contains *only* the changes you want to make. If it contains unexpected changes, well, you can thank the ‘lintian’ maintainers for catching yet another packaging bug :-) -- \ “For of those to whom much is given, much is required.” —John | `\F. Kennedy | _o__) | Ben Finney -- To UNSUBSCRIBE, email to debian-mentors-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
