[Bug 595450] Re: Please merge apt-cacher 1.6.11 (universe) from Debian unstable (main)
** Changed in: apt-cacher (Ubuntu) Status: Confirmed = In Progress ** Changed in: apt-cacher (Ubuntu) Assignee: (unassigned) = Fabrice Coutadeur (fabricesp) -- Please merge apt-cacher 1.6.11 (universe) from Debian unstable (main) https://bugs.launchpad.net/bugs/595450 You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
[Bug 595450] Re: Please merge apt-cacher 1.6.11 (universe) from Debian unstable (main)
Uploaded. Thanks for your work! I reformated a bit your changelog entry, to delete old bug reference and not have more than 80 caracters in a line. Thanks, Fabrice ** Changed in: apt-cacher (Ubuntu) Status: In Progress = Fix Committed ** Changed in: apt-cacher (Ubuntu) Assignee: Fabrice Coutadeur (fabricesp) = (unassigned) -- Please merge apt-cacher 1.6.11 (universe) from Debian unstable (main) https://bugs.launchpad.net/bugs/595450 You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
[Bug 595450] Re: Please merge apt-cacher 1.6.11 (universe) from Debian unstable (main)
This bug was fixed in the package apt-cacher - 1.6.11ubuntu1 --- apt-cacher (1.6.11ubuntu1) maverick; urgency=low * Merge from debian unstable (LP: #595450). Remaining changes: - apt-cacher-lib.pl: + Cache *.tar.gz.gpg (e.g. jaunty.tar.gz.gpg) + Cache ReleaseAnnouncement + Cache meta-release-* - Support debug symbol packages, changelog and NEWS and files for update-manager -- Bilal Akhtar bilalakhta...@yahoo.com Sat, 19 Jun 2010 14:23:30 +0300 ** Changed in: apt-cacher (Ubuntu) Status: Fix Committed = Fix Released -- Please merge apt-cacher 1.6.11 (universe) from Debian unstable (main) https://bugs.launchpad.net/bugs/595450 You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
[Bug 595450] Re: Please merge apt-cacher 1.6.11 (universe) from Debian unstable (main)
Good to see you helping in getting my diffs into Ubuntu. Maybe because both of us are Indians :) -- Please merge apt-cacher 1.6.11 (universe) from Debian unstable (main) https://bugs.launchpad.net/bugs/595450 You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
[Bug 595450] Re: Please merge apt-cacher 1.6.11 (universe) from Debian unstable (main)
Here are, the debdiffs once again. I haven't deleted yours, but have made my own. Fixes both points 1 and 3. ** Patch removed: Debdiff from Ubuntu version (1.6.10ubuntu2) http://launchpadlibrarian.net/50540044/apt-cacher_1.6.10ubuntu2.debdiff ** Patch removed: Debdiff from Debian version (1.6.11) http://launchpadlibrarian.net/50540046/apt-cacher_1.6.11.debdiff ** Patch added: Debdiff from Debian version (1.6.11) http://launchpadlibrarian.net/50586137/apt-cacher_1.6.11.debdiff -- Please merge apt-cacher 1.6.11 (universe) from Debian unstable (main) https://bugs.launchpad.net/bugs/595450 You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
[Bug 595450] Re: Please merge apt-cacher 1.6.11 (universe) from Debian unstable (main)
** Patch added: Debdiff from Ubuntu version (1.6.10ubuntu2) http://launchpadlibrarian.net/50586151/apt-cacher_1.6.10ubuntu2.debdiff -- Please merge apt-cacher 1.6.11 (universe) from Debian unstable (main) https://bugs.launchpad.net/bugs/595450 You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
[Bug 595450] Re: Please merge apt-cacher 1.6.11 (universe) from Debian unstable (main)
Hello Bilal! Yep and other thing is this is what makes ubuntu community rock.. We work as a team supporting and helping each other out.. The diffs look excellent Regards -- Please merge apt-cacher 1.6.11 (universe) from Debian unstable (main) https://bugs.launchpad.net/bugs/595450 You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
[Bug 595450] Re: Please merge apt-cacher 1.6.11 (universe) from Debian unstable (main)
Thank you Bhavi for your support. Now, moving on practically, sponsor? -- Please merge apt-cacher 1.6.11 (universe) from Debian unstable (main) https://bugs.launchpad.net/bugs/595450 You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
[Bug 595450] Re: Please merge apt-cacher 1.6.11 (universe) from Debian unstable (main)
Hello a few comments about your debdiff:- 1. The changes from -1, i.e - apt-cacher-lib.pl: + Cache *.tar.gz.gpg (e.g. jaunty.tar.gz.gpg) + Cache ReleaseAnnouncement + Cache meta-release-* and the symbols change from -2 seems to be missing from your changelog entry 2. there is no need for a standards-version change in ubuntu (3.8.3 3.8.4) as it will be done by the debian maintainer 3. Your ubuntu version debdiff contains whitespaces please clean them up. Regards ** Changed in: apt-cacher (Ubuntu) Status: Confirmed = Incomplete -- Please merge apt-cacher 1.6.11 (universe) from Debian unstable (main) https://bugs.launchpad.net/bugs/595450 You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
[Bug 595450] Re: Please merge apt-cacher 1.6.11 (universe) from Debian unstable (main)
Bhavani, Your point 1 isn't required, AFAIK. point 3 is invalid; there are no whitespaces. As for point 2, here are the debdiffs ** Patch removed: Debdiff from Ubuntu version (1.6.10ubuntu2) http://launchpadlibrarian.net/50485192/apt-cacher_1.6.10ubuntu2.debdiff ** Patch removed: Debdiff from Debian version (1.6.11) http://launchpadlibrarian.net/50485180/apt-cacher_1.6.11.debdiff -- Please merge apt-cacher 1.6.11 (universe) from Debian unstable (main) https://bugs.launchpad.net/bugs/595450 You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
[Bug 595450] Re: Please merge apt-cacher 1.6.11 (universe) from Debian unstable (main)
** Patch added: Debdiff from Debian version (1.6.11) http://launchpadlibrarian.net/50534120/apt-cacher_1.6.11.debdiff -- Please merge apt-cacher 1.6.11 (universe) from Debian unstable (main) https://bugs.launchpad.net/bugs/595450 You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
[Bug 595450] Re: Please merge apt-cacher 1.6.11 (universe) from Debian unstable (main)
** Patch added: Debdiff from Ubuntu version (1.6.10ubuntu2) http://launchpadlibrarian.net/50534121/apt-cacher_1.6.10ubuntu2.debdiff ** Changed in: apt-cacher (Ubuntu) Status: Incomplete = Confirmed -- Please merge apt-cacher 1.6.11 (universe) from Debian unstable (main) https://bugs.launchpad.net/bugs/595450 You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
[Bug 595450] Re: Please merge apt-cacher 1.6.11 (universe) from Debian unstable (main)
Bhavani, The debian maintainer has updated the standards-version. So, I need to do that. I have done point 2 as well, in these debdiffs. ** Patch removed: Debdiff from Ubuntu version (1.6.10ubuntu2) http://launchpadlibrarian.net/50534121/apt-cacher_1.6.10ubuntu2.debdiff ** Patch removed: Debdiff from Debian version (1.6.11) http://launchpadlibrarian.net/50534120/apt-cacher_1.6.11.debdiff -- Please merge apt-cacher 1.6.11 (universe) from Debian unstable (main) https://bugs.launchpad.net/bugs/595450 You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
[Bug 595450] Re: Please merge apt-cacher 1.6.11 (universe) from Debian unstable (main)
** Patch added: Debdiff from Debian version (1.6.11) http://launchpadlibrarian.net/50534503/apt-cacher_1.6.11.debdiff -- Please merge apt-cacher 1.6.11 (universe) from Debian unstable (main) https://bugs.launchpad.net/bugs/595450 You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
[Bug 595450] Re: Please merge apt-cacher 1.6.11 (universe) from Debian unstable (main)
** Patch added: Debdiff from Ubuntu version (1.6.10ubuntu2) http://launchpadlibrarian.net/50534509/apt-cacher_1.6.10ubuntu2.debdiff -- Please merge apt-cacher 1.6.11 (universe) from Debian unstable (main) https://bugs.launchpad.net/bugs/595450 You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
[Bug 595450] Re: Please merge apt-cacher 1.6.11 (universe) from Debian unstable (main)
Hey, according to https://wiki.ubuntu.com/UbuntuDevelopment/Merging#Outline%20of%20Algorithm%20for%20Tackling%20Merges , I don't need to specify changes that are mentioned in -1ubuntu1 and -1ubuntu2 . I only need to mention manual changes in -2ubuntu1 . I am reverting to the old debdiffs. Bhavi's point 1 is wrong. ** Patch removed: Debdiff from Debian version (1.6.11) http://launchpadlibrarian.net/50534503/apt-cacher_1.6.11.debdiff ** Patch removed: Debdiff from Ubuntu version (1.6.10ubuntu2) http://launchpadlibrarian.net/50534509/apt-cacher_1.6.10ubuntu2.debdiff -- Please merge apt-cacher 1.6.11 (universe) from Debian unstable (main) https://bugs.launchpad.net/bugs/595450 You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
[Bug 595450] Re: Please merge apt-cacher 1.6.11 (universe) from Debian unstable (main)
** Patch added: Debdiff from Ubuntu version (1.6.10ubuntu2) http://launchpadlibrarian.net/50540044/apt-cacher_1.6.10ubuntu2.debdiff -- Please merge apt-cacher 1.6.11 (universe) from Debian unstable (main) https://bugs.launchpad.net/bugs/595450 You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
[Bug 595450] Re: Please merge apt-cacher 1.6.11 (universe) from Debian unstable (main)
** Patch added: Debdiff from Debian version (1.6.11) http://launchpadlibrarian.net/50540046/apt-cacher_1.6.11.debdiff -- Please merge apt-cacher 1.6.11 (universe) from Debian unstable (main) https://bugs.launchpad.net/bugs/595450 You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
[Bug 595450] Re: Please merge apt-cacher 1.6.11 (universe) from Debian unstable (main)
So, this is my declaration I can't use point 1, because of comment 11. I can't use point 2, because debmaint has used 3.8.4 I can't use point 3, because cant find whitespcaes -- Please merge apt-cacher 1.6.11 (universe) from Debian unstable (main) https://bugs.launchpad.net/bugs/595450 You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
[Bug 595450] Re: Please merge apt-cacher 1.6.11 (universe) from Debian unstable (main)
Hmm so my point 2 is wrong(because I got confused seeing the diffs) But point 1 is valid according to point number 5 on the wiki which states Change the debian/changelog to note your work. Note which Ubuntu deltas are still valid and why invalid ones were dropped. Change the M-O-M e-mail address and name to yours. Make sure you keep old Ubuntu changelog entries. x (vvv-1ubuntu1) maverick; urgency=low * Merge from debian unstable. Remaining changes: + Modified build-dep on libfoo to build on maverick. + Added .desktop file. and point number 3 is valid as I find whitespaces in your debian/changelog in the diff as under: - + apt-cacher (1.5.4) unstable; urgency=low Please delete those - and + and refresh the debdiff from ubuntu version please Regards ** Changed in: apt-cacher (Ubuntu) Status: Confirmed = Incomplete -- Please merge apt-cacher 1.6.11 (universe) from Debian unstable (main) https://bugs.launchpad.net/bugs/595450 You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
[Bug 595450] Re: Please merge apt-cacher 1.6.11 (universe) from Debian unstable (main)
Hello bilal, I ve modified the diff and pasted here for a merge (Please take a look as I ve satisfied point 1 and point 3 of my review) Regards ** Patch added: debian ubuntu modified merge diff http://launchpadlibrarian.net/50542386/apt-cacher.diff ** Changed in: apt-cacher (Ubuntu) Status: Incomplete = Confirmed ** Branch linked: lp:ubuntu/apt-cacher -- Please merge apt-cacher 1.6.11 (universe) from Debian unstable (main) https://bugs.launchpad.net/bugs/595450 You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
[Bug 595450] Re: Please merge apt-cacher 1.6.11 (universe) from Debian unstable (main)
** Patch added: Debdiff from Debian version (1.6.11) http://launchpadlibrarian.net/50485180/apt-cacher_1.6.11.debdiff -- Please merge apt-cacher 1.6.11 (universe) from Debian unstable (main) https://bugs.launchpad.net/bugs/595450 You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
[Bug 595450] Re: Please merge apt-cacher 1.6.11 (universe) from Debian unstable (main)
** Patch added: Debdiff from Ubuntu version (1.6.10ubuntu2) http://launchpadlibrarian.net/50485192/apt-cacher_1.6.10ubuntu2.debdiff -- Please merge apt-cacher 1.6.11 (universe) from Debian unstable (main) https://bugs.launchpad.net/bugs/595450 You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
[Bug 595450] Re: Please merge apt-cacher 1.6.11 (universe) from Debian unstable (main)
Build succeeded in pbuilder (maverick). ** Changed in: apt-cacher (Ubuntu) Importance: Undecided = Wishlist ** Changed in: apt-cacher (Ubuntu) Status: New = Confirmed -- Please merge apt-cacher 1.6.11 (universe) from Debian unstable (main) https://bugs.launchpad.net/bugs/595450 You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
