[Bug 903098] Re: Please merge (sort of) couchdb 1.1.1-1 from Debian testing

2012-07-30 Thread Steve Langasek
*** This bug is a duplicate of bug 817656 *** https://bugs.launchpad.net/bugs/817656 ** This bug has been marked a duplicate of bug 817656 [FFE] Please merge couchdb 1.1.0-1 (main) from Debian unstable (main) -- You received this bug notification because you are a member of Ubuntu Bugs,

[Bug 903098] Re: Please merge (sort of) couchdb 1.1.1-1 from Debian testing

2012-07-18 Thread Jason Gerard DeRose
Added new debdiff for couchdb_1.2.0-1 = couchdb_1.2.0-1ubuntu1 ** Patch added: couchdb_1.2.0-1_to_couchdb_1.2.0-1ubuntu1.debdiff https://bugs.launchpad.net/ubuntu/+source/couchdb/+bug/903098/+attachment/3227271/+files/couchdb_1.2.0-1_to_couchdb_1.2.0-1ubuntu1.debdiff -- You received this

[Bug 903098] Re: Please merge (sort of) couchdb 1.1.1-1 from Debian testing

2012-07-16 Thread Jason Gerard DeRose
Okay, I'm attempting this again, this time with CouchDB 1.2.0 aiming for Quantal. I'm not sure what the best practice is here: should I update this bug title, or work from a new bug? I filed a new bug, but I'll mark it as a duplicate if needed:

[Bug 903098] Re: Please merge (sort of) couchdb 1.1.1-1 from Debian testing

2012-03-06 Thread Jason Gerard DeRose
Evan: no, haven't make any progress on this and unfortunately I wont have any time to for at least few weeks. However, I did confirm that the init.d script is working fine under Oneiric, for both the current Ubuntu version and my proposed version. I'm not sure why this is, but I guess it helps

Re: [Bug 903098] Re: Please merge (sort of) couchdb 1.1.1-1 from Debian testing

2012-03-06 Thread Benjamin McGough
It was replication across a longhaul link. It seems to be working now, but it didn't work the first handful of time I tried it. Just timed out with no good errors in the logs. I have not tried continuous replication, but I plan to. Thanks, -Ben On Tue, Mar 6, 2012 at 3:45 PM, Jason Gerard

[Bug 903098] Re: Please merge (sort of) couchdb 1.1.1-1 from Debian testing

2012-03-05 Thread Benjamin McGough
I was able to replicate between identical versions of couchdb on identical versions of Ubuntu. Don't know what was going on the first time, but I've been able to do it several times now. -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu.

[Bug 903098] Re: Please merge (sort of) couchdb 1.1.1-1 from Debian testing

2012-03-03 Thread Evan Broder
Jason: Have you made any progress on fixing the initscript? Also, at this point we really need to get a FFe for this change. Could you fill one out? (http://wiki.ubuntu.com/FreezeExceptionProcess lists the information that the release team will want to see - feel free to subscribe me to the new

[Bug 903098] Re: Please merge (sort of) couchdb 1.1.1-1 from Debian testing

2012-02-25 Thread Jason Gerard DeRose
Evan, couchdb now Replaces couchdb-bin (= 1.0.1-0ubuntu18). I tested the upgrade with the 1.0.1 couchdb and couchdb-bin packages installed, and the upgrade works without triggering a conffile conflict. I attached an updated debdiff. Thanks again for the review! ** Patch added:

[Bug 903098] Re: Please merge (sort of) couchdb 1.1.1-1 from Debian testing

2012-02-25 Thread Jason Gerard DeRose
Evan, Also, I was pretty darn careful testing the upgrade before too, so unless I missed an important permutation, it wasn't triggering a conffile conflict before the Replaces was added... or I just missed it. Anyway, I guess the important thing is it isn't triggering it now with what (might) be

[Bug 903098] Re: Please merge (sort of) couchdb 1.1.1-1 from Debian testing

2012-02-25 Thread Jason Gerard DeRose
Errr! Okay, one issue I just found, this is broken: sudo /etc/init.d/couchdb stop It's broken for both the version currently in Precise and my proposed version here. In 1.0.1, `/etc/init.d/couchdb stop` says it fails and doesn't kill couchdb. In my 1.1.1 package, `/etc/init.d/couchdb stop`

[Bug 903098] Re: Please merge (sort of) couchdb 1.1.1-1 from Debian testing

2012-02-24 Thread Launchpad Bug Tracker
Status changed to 'Confirmed' because the bug affects multiple users. ** Changed in: couchdb (Ubuntu) Status: New = Confirmed -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad.net/bugs/903098 Title:

[Bug 903098] Re: Please merge (sort of) couchdb 1.1.1-1 from Debian testing

2012-02-24 Thread Benjamin McGough
Perhaps worth noting here that couchdb replication is broken with the current packages. -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad.net/bugs/903098 Title: Please merge (sort of) couchdb 1.1.1-1 from

[Bug 903098] Re: Please merge (sort of) couchdb 1.1.1-1 from Debian testing

2012-02-24 Thread Jason Gerard DeRose
Benjamin - broken in what way? Overall I've had decent luck replicating with this version... in what scenario do you consider it broken? Do you happen to have links to upstream bugs that might be involved? Thanks! -- You received this bug notification because you are a member of Ubuntu Bugs,

[Bug 903098] Re: Please merge (sort of) couchdb 1.1.1-1 from Debian testing

2012-02-21 Thread Jason Gerard DeRose
Evan, Thanks for reviewing this! I'll add the Replaces and test out the conf file upgrade ASAP. Sorry, I didn't know about debdif, thought I was doing this the appropriate Ubuntu way. Yeah, the config file situation is a bit screwy. Moving local.ini and local.d into couchdb-bin might be a bit

[Bug 903098] Re: Please merge (sort of) couchdb 1.1.1-1 from Debian testing

2012-02-10 Thread Evan Broder
Hi Jason - In the future, I'd strongly encourage falling back to debdiffs instead of bzr branches when you run into this much trouble getting the bzr MPs to do what you want. I don't want to blame you for the tardiness of the review here - that's clearly a failure of the development and

[Bug 903098] Re: Please merge (sort of) couchdb 1.1.1-1 from Debian testing

2012-02-10 Thread Evan Broder
Oh yeah - and because the merge proposal just makes my eyes bleed, I'm going to go ahead and attach the debdiff from Debian here and reject the MP. The useful discussion is here and not on the MP, and the MP doesn't accurately represent the patch anyway. ** Patch added:

[Bug 903098] Re: Please merge (sort of) couchdb 1.1.1-1 from Debian testing

2011-12-26 Thread Jason Gerard DeRose
After quite a lot of testing, I feel that it's reasonable to push both my proposed couchdb 1.1.1 package and a fixed desktopcouch package out to the Novacut Stable PPA, for both Precise and Oneiric. This should get these proposed changes quite a lot of testing and hopefully help move this

[Bug 903098] Re: Please merge (sort of) couchdb 1.1.1-1 from Debian testing

2011-12-18 Thread Jason Gerard DeRose
Okay, after fixing a packaging foobar I made that broke the build on amd64, I now have packages available for testing in the Novacut Daily Builds PPA: https://launchpad.net/~novacut/+archive/daily?field.series_filter=precise It's currently building for Oneiric also, to help get wider testing.

[Bug 903098] Re: Please merge (sort of) couchdb 1.1.1-1 from Debian testing

2011-12-15 Thread Philipp Kaluza
** Bug watch added: Debian Bug tracker #573061 http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=573061 ** Also affects: couchdb (Debian) via http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=573061 Importance: Unknown Status: Unknown -- You received this bug notification because

[Bug 903098] Re: Please merge (sort of) couchdb 1.1.1-1 from Debian testing

2011-12-15 Thread Bug Watch Updater
** Changed in: couchdb (Debian) Status: Unknown = New -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad.net/bugs/903098 Title: Please merge (sort of) couchdb 1.1.1-1 from Debian testing To manage

[Bug 903098] Re: Please merge (sort of) couchdb 1.1.1-1 from Debian testing

2011-12-13 Thread A Jackson
It's usuall the other way around. Debian spliting packages in many, and Ubuntu want one large, like for wine. So, an open discussion, where thechnical merits is most important and good patches to Debians package prob. will make Debian and Ubuntu packages look mostly the same. Keep up the good

[Bug 903098] Re: Please merge (sort of) couchdb 1.1.1-1 from Debian testing

2011-12-12 Thread Jason Gerard DeRose
For reference, here is the debian/changelog bits I added: couchdb (1.1.1-1ubuntu1) precise; urgency=low * Started with branch of 1.1.1-1 from Debian testing * Split into `couchdb-bin` and `couchdb` packages as found in Ubuntu, with goal of keeping delta between Debian and Ubuntu as low

[Bug 903098] Re: Please merge (sort of) couchdb 1.1.1-1 from Debian testing

2011-12-12 Thread John Lenton
Makes a ton of sense to me. -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad.net/bugs/903098 Title: Please merge (sort of) couchdb 1.1.1-1 from Debian testing To manage notifications about this bug go to:

[Bug 903098] Re: Please merge (sort of) couchdb 1.1.1-1 from Debian testing

2011-12-12 Thread Rodney Dawes
It looks like your branch has a ton of conflicts in the merge proposal. But I think the best solution is to get the packaging updated in debian, and not have any ubuntu-specific changes in here. -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed

[Bug 903098] Re: Please merge (sort of) couchdb 1.1.1-1 from Debian testing

2011-12-12 Thread Jason Gerard DeRose
@dobey - I'm not sure what's the right and proper way to do this VCS- wise, but what I'm proposing is a sync from Debian plus a small delta. It makes more sense looking at this as a merge into lp:debian/wheezy/couchdb : https://code.launchpad.net/~jderose/ubuntu/precise/couchdb/1.1.1-low-

[Bug 903098] Re: Please merge (sort of) couchdb 1.1.1-1 from Debian testing

2011-12-12 Thread Micah Gersten
You can't merge into the Debian VCS branches, you can only merge from them. -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad.net/bugs/903098 Title: Please merge (sort of) couchdb 1.1.1-1 from Debian testing

[Bug 903098] Re: Please merge (sort of) couchdb 1.1.1-1 from Debian testing

2011-12-12 Thread Jason Gerard DeRose
@micahg - gotcha, thanks! I guess it still illustrates the low-delta from Debian. So what's the correct way for me to propose this sync/merge? I think the important thing is that there be a small, understandable delta between Ubuntu and Debian. I think having a clean history in

[Bug 903098] Re: Please merge (sort of) couchdb 1.1.1-1 from Debian testing

2011-12-12 Thread Micah Gersten
That should be One, not Once in the last sentence. -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad.net/bugs/903098 Title: Please merge (sort of) couchdb 1.1.1-1 from Debian testing To manage notifications

[Bug 903098] Re: Please merge (sort of) couchdb 1.1.1-1 from Debian testing

2011-12-12 Thread Micah Gersten
The large diff from Ubuntu - Ubuntu is fine given that we're going from 1.0.1 to 1.1.0, the uploader should just verify the Debian - Ubuntu diff is actually minimal. Once could also run filterdiff on the Ubuntu - Ubuntu diff, limiting to the debian dir, to make sure any needed changes are not

[Bug 903098] Re: Please merge (sort of) couchdb 1.1.1-1 from Debian testing

2011-12-12 Thread Jason Gerard DeRose
Even the diff of just debian/ from precise to wheezy or my proposal is 25k lines as so many cherry-picked patches are being carried (some of which are crazy big... most of that 25k is one patch). So not an easy thing to make sense of. Aside from the cherry-picking so Ubuntu could continue to