Re: [SCM] ardour3/master: Droped obsolete patches.
2013/9/7 Adrian Knoth a...@drcomp.erfurt.thur.de On 09/06/13 19:32, mira-guest@users.alioth.**debian.orgmira-gu...@users.alioth.debian.orgwrote: Hi! The following commit has been merged in the master branch: commit 81929e6497ec352138e2a593e24755**7a970411e3 Author: Jaromír Mikeš mira.mi...@seznam.cz Date: Fri Sep 6 19:34:03 2013 +0200 Droped obsolete patches. One issue per commit, please. That means: removing/dropping each patch individually. The waf.patch isn't obsolete, since we're stripping the waf binary from upstream. Consequently, we have to replace it with waf-light. Ops sorry ... waf.patch shouldn't be removed but renamed to 0001-waf.patch ... I didn't push new file :( Anyway it shouldn't committed this way. mira ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Re: [SCM] ardour3/master: Droped obsolete patches.
Quoting Jaromír Mikeš (2013-09-08 08:00:03) 2013/9/7 Adrian Knoth [1]a...@drcomp.erfurt.thur.de One issue per commit, please. That means: removing/dropping each patch individually. The waf.patch isn't obsolete, since we're stripping the waf binary from upstream. Consequently, we have to replace it with waf-light. Ops sorry ... waf.patch shouldn't be removed but renamed to 0001-waf.patch ... I didn't push new file :( Better IMO to avoid renaming, to ease locating patches by reading changelog. Here are some advices about patch naming/numbering: * Use the patch naming micro policy, and include its README. * When adding a patch, mention its number and purpose in changelog. * When dropping a patch, mention at least its number. * If renumbering (if you really must), mention old and new number. * Mention numbers explicitly (not e.g. ranges) to ease grep'ing. - Jonas -- * Jonas Smedegaard - idealist Internet-arkitekt * Tlf.: +45 40843136 Website: http://dr.jones.dk/ [x] quote me freely [ ] ask before reusing [ ] keep private signature.asc Description: signature ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Re: [SCM] ardour3/master: Droped obsolete patches.
2013/9/8 Jonas Smedegaard d...@jones.dk Quoting Jaromír Mikeš (2013-09-08 08:00:03) Ops sorry ... waf.patch shouldn't be removed but renamed to 0001-waf.patch ... I didn't push new file :( Better IMO to avoid renaming, to ease locating patches by reading changelog. Here are some advices about patch naming/numbering: * Use the patch naming micro policy, and include its README. * When adding a patch, mention its number and purpose in changelog. * When dropping a patch, mention at least its number. * If renumbering (if you really must), mention old and new number. * Mention numbers explicitly (not e.g. ranges) to ease grep'ing. Hi Jonas, I agree with all. I am big fan of numbered patches. Just I think that renumbering is harmless in this case because package is unreleased and changelog is clean. mira ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Re: [SCM] ardour3/master: Droped obsolete patches.
Quoting Jaromír Mikeš (2013-09-08 11:52:44) 2013/9/8 Jonas Smedegaard [1]d...@jones.dk Better IMO to avoid renaming, to ease locating patches by reading changelog. [snip] I agree with all. I am big fan of numbered patches. Just I think that renumbering is harmless in this case because package is unreleased and changelog is clean. Ohh, of course - silly me! :-D - Jonas -- * Jonas Smedegaard - idealist Internet-arkitekt * Tlf.: +45 40843136 Website: http://dr.jones.dk/ [x] quote me freely [ ] ask before reusing [ ] keep private signature.asc Description: signature ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Re: [SCM] ardour3/master: Droped obsolete patches.
On 09/06/13 19:32, mira-gu...@users.alioth.debian.org wrote: Hi! The following commit has been merged in the master branch: commit 81929e6497ec352138e2a593e247557a970411e3 Author: Jaromír Mikeš mira.mi...@seznam.cz Date: Fri Sep 6 19:34:03 2013 +0200 Droped obsolete patches. One issue per commit, please. That means: removing/dropping each patch individually. Because: diff --git a/debian/patches/waf.patch b/debian/patches/waf.patch deleted file mode 100644 index 4297359..000 --- a/debian/patches/waf.patch +++ /dev/null @@ -1,12867 +0,0 @@ -Description: Reapply waflib as unpacked source, and add waf-light - waf was shipped by upstream but in non-DFSG binary form so stripped - from Debian redistributed source. - . - This patch was made roughly from these routines: - . -./waf ; \ -mv .waf*/waflib waflib \ -rm waf ; \ -find ./waflib -iname *.pyc -delete ; \ -wget http://waf.googlecode.com/git-history/waf-1.6.11/waf-light ; \ -ln -s waf-light waf chmod +x waf-light -Author: Adrian Knoth a...@drcomp.erfurt.thur.de -Bug-Debian: http://bugs.debian.org/654477 -Last-Update: 2012-12-21 The waf.patch isn't obsolete, since we're stripping the waf binary from upstream. Consequently, we have to replace it with waf-light. I've hence reverted your commit. Cheers ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
