** 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
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:
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
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
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
** 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
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
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.
--
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
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
** 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
** 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)
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:
** 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
** 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
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
** 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
** 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
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
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
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)
** 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
** 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
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
24 matches
Mail list logo
