Re: [Bug 1510198] Re: Rebase/Reimplement Ubuntu changes upon Debian (possibly upstream them)
On Tue, Mar 01, 2016 at 09:23:08PM -, Gunnar Hjalmarsson wrote: > As you suggested I created a bunch of transitional packages. That > required that the Conficts fields in the corresponding hunspell-* > packages and the hyphen-no package were replaced with Breaks/Replaces. I > agree it's not necessary to make those changes in Debian, since they can > be dropped after xenial. > > Please note that I made a transitional myspell-es package. The current > myspell-es includes a Conflict field to hunspell-es, so the packages do > conflict, even if there are no file conflicts. umh, actually I was talking about the migrating away from the myspell-* packages built by lo-dicts, I didn't check the list of those produced by ubuntu, but now I see there is a missing transitional package for myspell-en-us. I recall now that I wanted to move that to src:hunspell-en-us, but totally forgot to do. If we do that we would take over several binaries from other sources, that means that some of those sources may become pointless and just be removed from the archive (in ubuntu). That needs to be backed by somebody else, I can't really help here (it was a way longer term plan for me), and not sure we would do that in during FF. It would indeed be nice to kick all those other packages, though. > I blacklisted hyphen-et for consistency reasons - hunspell-et is > blacklisted - and deleted debian/hyphen-et.install. You may want to > consider these changes for Debian. Otherwise, if someone installs > hyphen-et, myspell-et gets deleted, and they have no access to a > spellchecker. yeah, nice catch, incorporated :) -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad.net/bugs/1510198 Title: [FFe] Sync (almost) with libreoffice-dictionaries in Debian sid To manage notifications about this bug go to: https://bugs.launchpad.net/ubuntu/+source/language-selector/+bug/1510198/+subscriptions -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
[Bug 1510198] Re: Rebase/Reimplement Ubuntu changes upon Debian (possibly upstream them)
Thanks for your comments, Mattia. I have considered it further, and created a new PPA, this time with lo- dicts 1:5.1.0-1: https://launchpad.net/~gunnarhj/+archive/ubuntu/lo-dicts4 This time I made use of the nifty debian/helper.py, and to start with I made the version change which you already made in git. As you suggested I created a bunch of transitional packages. That required that the Conficts fields in the corresponding hunspell-* packages and the hyphen-no package were replaced with Breaks/Replaces. I agree it's not necessary to make those changes in Debian, since they can be dropped after xenial. Please note that I made a transitional myspell-es package. The current myspell-es includes a Conflict field to hunspell-es, so the packages do conflict, even if there are no file conflicts. I blacklisted hyphen-et for consistency reasons - hunspell-et is blacklisted - and deleted debian/hyphen-et.install. You may want to consider these changes for Debian. Otherwise, if someone installs hyphen-et, myspell-et gets deleted, and they have no access to a spellchecker. As regards openoffice.org-hyphenation, I think you are right: The Conflicts/Replaces fields I first suggested would be unnecessary. ** Summary changed: - Rebase/Reimplement Ubuntu changes upon Debian (possibly upstream them) + [FFe] Sync (almost) with libreoffice-dictionaries in Debian sid ** Description changed: - libreoffice-dictionaries hasnt been synced from Debian for a while and - has Ubuntu-local change. Rebase/Reimplement those on Debian and upstream - those, if possible. + Proposed uploads are available in this PPA: + https://launchpad.net/~gunnarhj/+archive/ubuntu/lo-dicts4 + + This proposal gives us updated dictionaries in xenial, and quite a few + new ones. libreoffice-dictionaries in Ubuntu was introduced before the + release of trusty, but hasn't been maintained since. This proposal + should make it possible to really sync with Debian after the xenial + release. + + [Original description] + libreoffice-dictionaries hasnt been synced from Debian for a while and has Ubuntu-local change. Rebase/Reimplement those on Debian and upstream those, if possible. (libreoffice-dictionaries was created rather ad-hoc around 4.2 before Debian did, replacing the old openoffice-dictionaries, thus the missing updates since). ** Also affects: language-selector (Ubuntu) Importance: Undecided Status: New ** Also affects: openoffice.org-hyphenation (Ubuntu) Importance: Undecided Status: New ** Changed in: language-selector (Ubuntu) Importance: Undecided => Medium ** Changed in: libreoffice-dictionaries (Ubuntu) Importance: Low => Medium ** Changed in: libreoffice-dictionaries (Ubuntu) Status: Triaged => New ** Changed in: libreoffice-dictionaries (Ubuntu) Assignee: Björn Michaelsen (bjoern-michaelsen) => (unassigned) ** Changed in: openoffice.org-hyphenation (Ubuntu) Importance: Undecided => Medium -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad.net/bugs/1510198 Title: [FFe] Sync (almost) with libreoffice-dictionaries in Debian sid To manage notifications about this bug go to: https://bugs.launchpad.net/ubuntu/+source/language-selector/+bug/1510198/+subscriptions -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
[Bug 1510198] Re: Rebase/Reimplement Ubuntu changes upon Debian (possibly upstream them)
So, I applied a version of the first point in git (with a different version that is not invented), that should be enough. For the second one: I'm not sure I like adding that in debian at all. It shouldn't be necessary anyway (also considering that my evil plan includes pushing for the removals of those conflicting dictionaries in the long run), tbh. In particular, the addition of the Conflicts to myspell-es is not necessary, the files don't conflicts For the third: I'd rather upload a openoffice.org-hyphenation without the conflicting dictionaries once this one is uploaded and don't care more, it sounds cleaner, and maybe add a Breaks+Replaces on lo-dicts instead. The remaining hyphenation dicts in oo.o-hyphenation would be en_CA, es_ES (but this is really redundant), fi_FI, ga_IE, id_ID, is_IS; maybe I can get some of them in libreoffice-dictionaries in the future (way too late for xenial). There is another thing that probably you missed: adding transitional packages from myspell-* to hunspell-*. I don't want to add them in debian for sure. This is maybe the only little thing that I veto against, so this is actually the only delta that should be needed, in debian/control.in, that can just go away once xenial is released. -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad.net/bugs/1510198 Title: Rebase/Reimplement Ubuntu changes upon Debian (possibly upstream them) To manage notifications about this bug go to: https://bugs.launchpad.net/ubuntu/+source/libreoffice-dictionaries/+bug/1510198/+subscriptions -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
[Bug 1510198] Re: Rebase/Reimplement Ubuntu changes upon Debian (possibly upstream them)
Hmm.. Time goes by, and lo-dicts 1:5.1.0-1 seems to be stuck in Debian's new queue for some reason. One possibility is that we simply upload in Ubuntu with a debian/control delta for now, to make reasonably updated dictionaries available in 16.04. However, it would still be good if we could agree on the debian/control changes, to prepare for sync going forward. @Mattia: Would that be a reasonable plan? @Björn: Do you have any doubts, given the tests I mentioned in comment #9? I suppose this would require a feature freeze exception. -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad.net/bugs/1510198 Title: Rebase/Reimplement Ubuntu changes upon Debian (possibly upstream them) To manage notifications about this bug go to: https://bugs.launchpad.net/ubuntu/+source/libreoffice-dictionaries/+bug/1510198/+subscriptions -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
[Bug 1510198] Re: Rebase/Reimplement Ubuntu changes upon Debian (possibly upstream them)
On 2016-02-10 16:34, Mattia Rizzolo wrote: > Well, lo-dicts builds a binary hunspell-sv containing both dictionaries. Aha, great, missed that. Then all is well, I think. > the source hunspell-sv instead builds 2 binaries hunspell-sv-se and > myspell-sv-se. They probably conflicts, but one doesn't take the other > over automatically, no. I decided that some testing is a good thing as a base for decision, so I created a PPA: https://launchpad.net/~gunnarhj/+archive/ubuntu/lo-dicts It includes libreoffice-dictionaries from Debian sid, with a few adjustments in debian/control. I have identified two other source packages which need to be changed, so the PPA also includes modified builds of: * openoffice.org-hyphenation * language-selector There are three kinds of debian/control adjustments in lo-dicts: 1. The version number of lo-dicts in Ubuntu is 1:4.2.1-0ubuntu3, so I replaced the occurrences of "(<= 1:3.3.0-4)" in Breaks/Replaces with "(<< 1:5)". 2. Added "Replaces" fields to new hunspell-* packages which conflict with other packages. This gives them precedence over conflicting packages, and at least in Ubuntu I think that feels safer, considering that language support packages are typically pulled by language-selector in Ubuntu, and not so often picked manually by the users. 3. Added "Replaces"/"Conflicts" fields to new hyphen-* packages which replace hyph_* dictionaries in openoffice.org-hyphenation 0.8. After having enabled the PPA, I could smoothly upgrade with Synaptic and add new packages by opening gnome-language-selector. @Mattia: Could you please review the changes I made to debian/control, and consider them for inclusion in the Debian repository. With those changes, I think that a sync is not only possible, but also the preferred way to do it. -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad.net/bugs/1510198 Title: Rebase/Reimplement Ubuntu changes upon Debian (possibly upstream them) To manage notifications about this bug go to: https://bugs.launchpad.net/ubuntu/+source/libreoffice-dictionaries/+bug/1510198/+subscriptions -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
[Bug 1510198] Re: Rebase/Reimplement Ubuntu changes upon Debian (possibly upstream them)
Well, lo-dicts builds a binary hunspell-sv containing both dictionaries. the source hunspell-sv instead builds 2 binaries hunspell-sv-se and myspell-sv-se. They probably conflicts, but one doesn't take the other over automatically, no. I'd be lovely see this done before xenial… Björn?? -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad.net/bugs/1510198 Title: Rebase/Reimplement Ubuntu changes upon Debian (possibly upstream them) To manage notifications about this bug go to: https://bugs.launchpad.net/ubuntu/+source/libreoffice-dictionaries/+bug/1510198/+subscriptions -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
[Bug 1510198] Re: Rebase/Reimplement Ubuntu changes upon Debian (possibly upstream them)
I don't think that hunspell-sv-se is a blocker for syncing from Debian. Currently there are two versions of hunspell-sv-se in the Ubuntu archive: The latest is built by libreoffice-dictionaries, but there is also an old one built by the hunspell-sv source package. If we would sync, both would be overridden by hunspell-sv, and that's what we want, isn't it? OTOH, libreoffice-dictionaries includes spellcheckers for both sv-se and sv-fi, so we should change it in debian so it builds both hunspell-sv-se and hunspell-sv-fi. But that can be done afterwards, if I understand it correctly. Since I'm from Sweden, I'll be happy to help sorting out any Swedish issues. ;) It would be great if the sync with Debian could be done ASAP. -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad.net/bugs/1510198 Title: Rebase/Reimplement Ubuntu changes upon Debian (possibly upstream them) To manage notifications about this bug go to: https://bugs.launchpad.net/ubuntu/+source/libreoffice-dictionaries/+bug/1510198/+subscriptions -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
[Bug 1510198] Re: Rebase/Reimplement Ubuntu changes upon Debian (possibly upstream them)
I'd love to see Björn Michaelsen do the initial merge (because I don't think a sync is possible). After that I'll happily take care of the subsequent uploads, but I don't have enough time to dedicate to the first, big one. -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad.net/bugs/1510198 Title: Rebase/Reimplement Ubuntu changes upon Debian (possibly upstream them) To manage notifications about this bug go to: https://bugs.launchpad.net/ubuntu/+source/libreoffice-dictionaries/+bug/1510198/+subscriptions -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
[Bug 1510198] Re: Rebase/Reimplement Ubuntu changes upon Debian (possibly upstream them)
Please, sync the latest with Debian and merge the changes. -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad.net/bugs/1510198 Title: Rebase/Reimplement Ubuntu changes upon Debian (possibly upstream them) To manage notifications about this bug go to: https://bugs.launchpad.net/ubuntu/+source/libreoffice-dictionaries/+bug/1510198/+subscriptions -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
[Bug 1510198] Re: Rebase/Reimplement Ubuntu changes upon Debian (possibly upstream them)
** Tags added: xenial -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad.net/bugs/1510198 Title: Rebase/Reimplement Ubuntu changes upon Debian (possibly upstream them) To manage notifications about this bug go to: https://bugs.launchpad.net/ubuntu/+source/libreoffice-dictionaries/+bug/1510198/+subscriptions -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
[Bug 1510198] Re: Rebase/Reimplement Ubuntu changes upon Debian (possibly upstream them)
are there any news on this? would be nice to have this done for xenial, so we can drop conflicts and stuff right after it, instead of keeping them for 2 more years. -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad.net/bugs/1510198 Title: Rebase/Reimplement Ubuntu changes upon Debian (possibly upstream them) To manage notifications about this bug go to: https://bugs.launchpad.net/ubuntu/+source/libreoffice-dictionaries/+bug/1510198/+subscriptions -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
[Bug 1510198] Re: Rebase/Reimplement Ubuntu changes upon Debian (possibly upstream them)
** Changed in: libreoffice-dictionaries (Ubuntu) Importance: Undecided => Low -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad.net/bugs/1510198 Title: Rebase/Reimplement Ubuntu changes upon Debian (possibly upstream them) To manage notifications about this bug go to: https://bugs.launchpad.net/ubuntu/+source/libreoffice-dictionaries/+bug/1510198/+subscriptions -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
Re: [Bug 1510198] Re: Rebase/Reimplement Ubuntu changes upon Debian (possibly upstream them)
On Mon, Oct 26, 2015 at 07:52:11PM -, Björn Michaelsen wrote:
> I just looked if we can do a direct sync, but stopped when I found that
> Debian wasnt building hunspell-sv-se. I wouldnt merge if there is not
> more to it, rather just readd those on top of Debian package ..
debian's lo-dicts builds hunspell-sv, which conflicts with
hunspell-sv-se, which is built by another source package, also in
ubuntu.
Since I'm the debian maintainer of lo-dicts please just ask if you
notice something weird. Please also note that just syncing might not be
that wise. replaces/conflicts might be very well needed due to
myspell-${lang} → hunspell-${lang} transition or a lot of other reasons.
I'm up for adding those (versioned) conflicts directly in the debian
package if they don't clash with somthing)
--
regards,
Mattia Rizzolo
GPG Key: 66AE 2B4A FCCF 3F52 DA18 4D18 4B04 3FCD B944 4540 .''`.
more about me: http://mapreri.org : :' :
Launchpad user: https://launchpad.net/~mapreri `. `'`
Debian QA page: https://qa.debian.org/developer.php?login=mattia `-
--
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.
https://bugs.launchpad.net/bugs/1510198
Title:
Rebase/Reimplement Ubuntu changes upon Debian (possibly upstream them)
To manage notifications about this bug go to:
https://bugs.launchpad.net/ubuntu/+source/libreoffice-dictionaries/+bug/1510198/+subscriptions
--
ubuntu-bugs mailing list
ubuntu-bugs@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
[Bug 1510198] Re: Rebase/Reimplement Ubuntu changes upon Debian (possibly upstream them)
I just looked if we can do a direct sync, but stopped when I found that Debian wasnt building hunspell-sv-se. I wouldnt merge if there is not more to it, rather just readd those on top of Debian package .. -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad.net/bugs/1510198 Title: Rebase/Reimplement Ubuntu changes upon Debian (possibly upstream them) To manage notifications about this bug go to: https://bugs.launchpad.net/ubuntu/+source/libreoffice-dictionaries/+bug/1510198/+subscriptions -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
[Bug 1510198] Re: Rebase/Reimplement Ubuntu changes upon Debian (possibly upstream them)
are there ubuntu changes that make sense to keep at all? I see the most relevant delta is the bunch of .dictlistinfo installed in $(CURDIR)/debian/$$pkg/usr/share/myspell/infos/ooo/$$pkg that ttbomk are not used anymore nowadays. as stated on #268953 I wanted to give a shoot at this now that xenial is open, but by all means I'll let you do it instead (at least the initial difficult merge). -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad.net/bugs/1510198 Title: Rebase/Reimplement Ubuntu changes upon Debian (possibly upstream them) To manage notifications about this bug go to: https://bugs.launchpad.net/ubuntu/+source/libreoffice-dictionaries/+bug/1510198/+subscriptions -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
[Bug 1510198] Re: Rebase/Reimplement Ubuntu changes upon Debian (possibly upstream them)
** Tags added: upgrade-software-version -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad.net/bugs/1510198 Title: Rebase/Reimplement Ubuntu changes upon Debian (possibly upstream them) To manage notifications about this bug go to: https://bugs.launchpad.net/ubuntu/+source/libreoffice-dictionaries/+bug/1510198/+subscriptions -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
