lp:~ubuntu-branches/ubuntu/oneiric/revelation/oneiric-201108190306

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:ubuntu/oneiric/revelation

Ubuntu branches: Pending requested 2011-08-19

Diff: 25134 lines (+207/-24302) (has conflicts)

46 files modified

.pc/.version (+0/-1)
.pc/030_python.dpatch/src/revelation.in (+0/-1812)
.pc/040_xhtml.dpatch/src/lib/datahandler/xhtml.py (+0/-567)
.pc/050_french.dpatch/po/fr.po (+0/-1797)
.pc/060_crash_at_save.dpatch/src/lib/entry.py (+0/-620)
.pc/070_show_passwords.dpatch/data/gconf/revelation.schemas (+0/-467)
.pc/080_transparency.dpatch/src/revelation-applet.in (+0/-902)
.pc/090_applet_crash.dpatch/src/lib/ui.py (+0/-2005)
.pc/091_panel_category.dpatch/data/bonobo/GNOME_RevelationApplet.server.in (+0/-26)
.pc/100_backup_on_save.dpatch/src/lib/io.py (+0/-249)
.pc/100_backup_on_save.dpatch/src/revelation.in (+0/-1809)
.pc/110_unquote_file_names.dpatch/src/lib/io.py (+0/-255)
.pc/120_typo_de_translation.dpatch/po/de.po (+0/-1769)
.pc/140_pwsafe.dpatch/src/lib/datahandler/pwsafe.py (+0/-712)
.pc/150_po.dpatch/src/lib/dialog.py (+0/-1318)
.pc/160-579540.dpatch/src/revelation-applet.in (+0/-928)
.pc/170-escape.dpatch/src/lib/dialog.py (+0/-1318)
.pc/180-luks.dpatch/src/bundle/AfSplitter.py (+0/-116)
.pc/180-luks.dpatch/src/bundle/PBKDFv2.py (+0/-149)
.pc/180-luks.dpatch/src/bundle/luks.py (+0/-708)
.pc/190-ru.dpatch/configure.ac (+0/-57)
.pc/200-icons.dpatch/src/lib/config.py.in (+0/-200)
.pc/200-icons.dpatch/src/lib/ui.py (+0/-2005)
config.guess (+0/-1463)
config.sub (+0/-1579)
configure.ac (+1/-1)
data/bonobo/GNOME_RevelationApplet.server.in (+1/-1)
data/gconf/revelation.schemas (+1/-1)
debian/patches/210-625040-fix-export-dynamic.dpatch (+24/-0)
debian/patches/220-603572-display-icon-on-start.patch (+13/-0)
debian/patches/230-optional-gnomeapplet.patch (+107/-0)
po/de.po (+2/-2)
po/fr.po (+2/-2)
po/ru.po (+0/-1354)
src/bundle/AfSplitter.py (+1/-1)
src/bundle/PBKDFv2.py (+3/-3)
src/bundle/luks.py (+28/-34)
src/lib/config.py.in (+0/-2)
src/lib/datahandler/pwsafe.py (+1/-4)
src/lib/datahandler/xhtml.py (+1/-1)
src/lib/dialog.py (+1/-2)
src/lib/entry.py (+1/-1)
src/lib/io.py (+7/-16)
src/lib/ui.py (+7/-13)
src/revelation-applet.in (+1/-30)
src/revelation.in (+5/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

32. By Laurent Bigonville on 2011-08-19

* Merge from debian unstable. Remaining changes:
  - debian/patches/091_panel_category.dpatch:
    + Change GNOME panel category from "Utility" to the correct "Utilities".
  - debian/rules: Include dh_icons.
  - debian/patches/series: Include 040_xhtml.dpatch
  - Build with python 2.7
  - Note that md5sums between Debian and Ubuntu are different.
* debian/patches/230-optional-gnomeapplet.patch: Make gnome-applet optional
* debian/control:
  - Drop libbonoboui2-0, libbonoboui2-dev, libpanel-applet2-dev,
    python-gnome2-extras-dev build-dependencies
  - Drop python-gnomeapplet dependency (LP: #817260)
* Call gcc with -rdynamic instead of --export-dynamic (Closes: #625040)
* switch to dh_python2 (Closes: #617052)
* fix missing icon on applet start (Closes: 603572)
* provide missing edit icon (copy of gedit-icon.xpm) (Closes: #619447)
* New Standards-Version: 3.9.2 (no changes)

31. By Artem Popov on 2010-12-09

Fix FTBFS with python 2.7 (LP: #688096).

30. By Matthias Klose on 2010-12-08

Rebuild with python 2.7 as the python default.

29. By Artur Rona on 2010-11-05

* Merge from debian unstable. Remaining changes:
  - debian/patches/091_panel_category.dpatch:
    + Change GNOME panel category from "Utility" to the correct "Utilities".
  - debian/rules: Include dh_icons.
  - debian/patches/series: Include 040_xhtml.dpatch
  - Note that md5sums between Debian and Ubuntu are different.
* Dropped changes:
  - debian/rules: Package built fine, other changes are unnecessary.
  - debian/patches/092_typo_de_translation.dpatch: Look prefix 120_.

28. By ghostonline on 2010-01-16

* Merge from debian testing. Remaining changes: (LP: #520281)
  - debian/rules:
    + Fix FTBFS with python >= 2.6
    + Include dh_icons
  - debian/patches/091_panel_category.dpatch:
    + Change GNOME panel category from "Utility" to the correct "Utilities".
  - debian/patches/092_typo_de_translation.dpatch:
    + Fix German translation typo
  - debian/patches/00list:
    + Include 040_xhtml.dpatch
* Rename Ubuntu specific patches to avoid confusion with Debian's patches:
  - 91_panel_category.dpatch -> 091_panel_category.dpatch
  - 92_typo_de_translation.dpatch -> 092_typo_de_translation.dpatch
* debian/patches/00list: Update with new Ubuntu specific patch names
* Dropped changes now applied upstream:
  - debian/patches/94_url_decoding.dpatch:
    - Patches io.py to unquote file url during the normalisation process
* Dropped changes no longer required:
  - debian/patches/010_intltool.dpatch:
    + Remove intltool files when cleaning
  - debian/patches/020_server_data.dpatch:
    + Remove GNOME_RevelationApplet.server when cleaning
  - debian/patches/93_python26_transition.dpatch:
    + Patches aclocal.m4 to return the correct value for
      cv_python_pyexecdir
* debian/patches/100_backup_on_save.dpatch: (LP: #338138)
  Patches io.py to create a backup file before saving and restore
  the backup if saving fails

27. By ghostonline on 2010-01-03

* add 94_url_decoding.dpatch to fix LP: #96968
  - Patches io.py to unquote file url during the
    normalisation process

26. By Andreas Moog on 2009-08-01

* add 93_python26_transition.dpatch to fix FTBFS (LP: #387231)
  - Patches aclocal.m4 to return the correct value for
    cv_python_pyexecdir

25. By Hew on 2009-06-15

* Actually revert ui.py patch so 90_applet_crash.dpatch works.
  - Fixes FTBFS (LP: #387231)

24. By Hew on 2009-06-13

[ Hew McLachlan ]
* Merge from debian unstable (LP: #386624), remaining changes:
  - Fix FTBFS with python >= 2.6
  - debian/patches/91_panel_category.dpatch:
    + Change GNOME panel category from "Utility" to the correct "Utilities".
  - debian/patches/92_typo_de_translation.dpatch:
    + Fix German translation typo
  - debian/rules:
    + Include dh_icons
* Rename Ubuntu specific patches to avoid confusion with Debian's patches:
  - 80_panel_category.dpatch -> 91_panel_category.dpatch
  - 90_typo_de_translation.dpatch -> 92_typo_de_translation.dpatch
* debian/patches/00list: Update with new Ubuntu specific patch names
* Dropped changes now applied upstream:
  - debian/control:
    + Drop python-xml from Depends
  - debian/patches/80_transparency.dpatch:
    + Allow applet to support transparent panels
  - Fix index out of range in ui.py (LP: #362788)
* Dropped changes no longer required:
  - debian/control:
    + Add dependency on python-gnome2-desktop

23. By Laurent Bigonville on 2009-03-08

Fix FTBFS with python >= 2.6