lp:~logan/ubuntu/raring/ding/debian-merge

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu/raring/ding at revision 13

Andrew Starr-Bochicchio (community): Approve on 2012-11-29

Ubuntu branches: Pending requested 2012-11-26

Diff: 1166 lines (+199/-760)

28 files modified

.pc/.version (+1/-0)
debian/README.source (+0/-31)
debian/changelog (+25/-0)
debian/compat (+1/-1)
debian/control (+3/-3)
debian/copyright (+2/-2)
debian/ding-1.gif.uue (+0/-348)
debian/ding.jpg.uue (+0/-167)
debian/patches/00list (+0/-6)
debian/patches/01_ispell_dirname.dpatch (+0/-28)
debian/patches/01_ispell_dirname.patch (+23/-0)
debian/patches/02_additionalbrowsers.dpatch (+0/-26)
debian/patches/02_additionalbrowsers.patch (+21/-0)
debian/patches/03_best_match.dpatch (+0/-24)
debian/patches/03_best_match.patch (+20/-0)
debian/patches/04_aspell_quote.dpatch (+0/-20)
debian/patches/04_aspell_quote.patch (+16/-0)
debian/patches/05_manpage.dpatch (+0/-35)
debian/patches/05_manpage.patch (+30/-0)
debian/patches/07_8bit_aspell.dpatch (+0/-20)
debian/patches/07_8bit_aspell.patch (+16/-0)
debian/patches/08_dont_set_locale.patch (+21/-0)
debian/patches/09_dont_set_locale.dpatch (+0/-21)
debian/patches/series (+7/-0)
debian/rules (+10/-8)
debian/source/format (+1/-1)
debian/source/include-binaries (+2/-0)
debian/uudecode (+0/-19)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

13. By Logan Rosen on 2012-11-26

* Merge from Debian unstable. Remaining changes:
  - debian/patches/08_dont_set_locale.patch:
     The explicit definition of LC_TYPE to de_DE.UTF8 causes
     problems if the Linux installation uses another locale setting.
* Converted 09_dont_set_locale.dpatch to quilt.
* Remove deprecated dpatch and upgrade to packaging format "3.0 quilt".
* Update to Standards-Version to 3.9.3 and debhelper to 9.
* Add build-arch and build-indep targets; use dh_prep in rules file.
* Fix copyright-refers-to-symlink-license (Lintian).
* Fix spelling-error-in-copyright (Lintian).
* Fix description-synopsis-starts-with-article (Lintian).
* Thanks to Jari Aalto for providing a patch for the above points.
  (Closes: #668542).
* Get rid of uuencoded images, they are handled by new 3.0 quilt format
  now.

12. By Fabrice Coutadeur on 2011-06-13

* Merge from Debian unstable. Remaining changes:
  - debian/patches/09_dont_set_locale.dpatch:
     The explicit definition of LC_TYPE to de_DE.UTF8 causes
     problems if the Linux installation uses another locale setting.

11. By xteejx on 2010-06-15

* Merge from debian unstable (LP: #594627). Remaining changes:
  - debian/patches/09_dont_set_locale.dpatch:
     The explicit definition of LC_TYPE to de_DE.UTF8 causes
     problems if the Linux installation uses another locale setting.

10. By Ilya Barygin on 2010-01-08

* Merge from Debian testing, remaining changes:
  - The explicit definition of LC_TYPE to de_DE.UTF8 causes
    problems if the Linux installation uses another locale
    setting.
* Converted Ubuntu change to patch: 09_dont_set_locale.dpatch.

9. By Andrea Colangelo on 2008-05-21

Modify Maintainer value to match the DebianMaintainerField
specification. (LP: #230350)

8. By Emanuele Gentili on 2008-05-10

* Merge from debian unstable, remaining changes: (LP: #228859)
 + The explicit definition of LC_TYPE to de_DE.UTF8 causes
    problems if the Linux installation uses another locale
    setting.

7. By Morten Kjeldgaard on 2008-04-10

[ Oliver Sauder ]

The explicit definition of LC_TYPE to de_DE.UTF8 causes
problems if the Linux installation uses another locale
setting (LP: #174596).

6. By Roland Rosenfeld on 2007-07-29

* dict-de-en now provides dictd-dictionary (see: #413575).
* 07_8bit_aspell: Do not replace Umlauts by a" etc. for aspell, but only
  for ispell, because aspell needs 8bit chars (Closes: #359243).
* Added the plugin files for using the dict formatted dictionaries with
  the OpenDict dictionary program. For that added files
  debian/dict-de-en.{dirs, links}, english-german-conf.xml,
  german-english-conf.xml and accordingly added the new statements in
  the targets 'install' of the debian/rules. Thanks to Kęstutis
  Biliūnas <email address hidden> for providing these (Closes: #426597).
* Added the packages dict | opendict | kdict to Suggests.
* Moved dictd | dict-server to Suggests like other dict-freedict
  packages do (because OpenDict can use these dictionaries without
  dict-server running).
* Added serpento as another alternative to dictd. It's already included
  in dict-server, but in Suggests this may be easier to read for users.
* Removed dependency on debconf. This was forgotten to do in the
  revision 1.4-3.

5. By Roland Rosenfeld on 2007-05-19

* New upstream version 1.5.
  * This fixes the word "hanggeahbt" (Closes: #408111).
* Migrate all patches to dpatch mechanism.
* 06_verantwortliche.dpatch: Fix syntax of "Verantwortliche" in
  dictionary.
* Add lintian overrides, because /usr/bin/ding isn't a shell script but
  a wish script and lintian complains about that.
* Add debian/watch file.

4. By Roland Rosenfeld on 2006-06-30

* Build-Depends instead of Build-Depends-Indep on debhelper.
* Upgrade to debhelper v5.
* Upgrade to Standards-Version 3.7.2 (no changes)