lp:~cosmos-door/ubuntu/trusty/aeskulap/merge-1272642

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu/trusty/aeskulap

Iain Lane: Approve on 2014-02-11

Diff: 31329 lines (+388/-29916)

47 files modified

.pc/.quilt_patches (+0/-1)
.pc/.quilt_series (+0/-1)
.pc/.version (+0/-1)
.pc/10_desktop.patch/src/aeskulap.desktop (+0/-11)
.pc/20_gcc4.4.patch/configuration/aconfiguration-gconf.cpp (+0/-275)
.pc/20_i18n_pt.patch/po/pt.po (+0/-591)
.pc/30_as_needed.patch/src/Makefile.am (+0/-85)
.pc/DcmElement_has_no_member_error.patch/imagepool/poolassociation.h (+0/-200)
.pc/applied-patches (+0/-10)
.pc/circular_svg_icon.patch/pixmaps/aeskulap.svg (+0/-169)
.pc/dcmdata_debug.patch/imagepool/poolfindassociation.cpp (+0/-143)
.pc/dcmdata_debug.patch/imagepool/poolmoveassociation.cpp (+0/-342)
.pc/findAndCopyElement.patch/imagepool/dicomdir.cpp (+0/-255)
.pc/oflog.patch/configure (+0/-25949)
.pc/oflog.patch/configure.in (+0/-143)
.pc/patientsname.patch/imagepool/netloader.cpp (+0/-197)
.pc/patientsname.patch/imagepool/netquery.cpp (+0/-452)
.pc/patientsname.patch/imagepool/poolinstance.cpp (+0/-719)
configuration/aconfiguration-gconf.cpp (+0/-1)
configure (+1/-1)
configure.in (+1/-1)
debian/changelog (+27/-0)
debian/control (+19/-12)
debian/patches/10_desktop.patch (+9/-6)
debian/patches/20_gcc4.4.patch (+2/-2)
debian/patches/20_i18n_pt.patch (+8/-8)
debian/patches/30_as_needed.patch (+3/-3)
debian/patches/DcmElement_has_no_member_error.patch (+3/-5)
debian/patches/circular_svg_icon.patch (+2/-4)
debian/patches/dcmdata_debug.patch (+7/-8)
debian/patches/findAndCopyElement.patch (+4/-6)
debian/patches/move_icon_to_correct_dir.patch (+12/-0)
debian/patches/oflog.patch (+9/-10)
debian/patches/patientsname.patch (+14/-17)
debian/patches/remove_rpath.patch (+28/-0)
debian/patches/series (+2/-0)
imagepool/dicomdir.cpp (+30/-30)
imagepool/netloader.cpp (+1/-1)
imagepool/netquery.cpp (+3/-3)
imagepool/poolassociation.h (+3/-1)
imagepool/poolfindassociation.cpp (+1/-1)
imagepool/poolinstance.cpp (+4/-4)
imagepool/poolmoveassociation.cpp (+1/-0)
pixmaps/aeskulap.svg (+37/-43)
po/pt.po (+151/-200)
src/Makefile.am (+3/-3)
src/aeskulap.desktop (+3/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1272642: Please merge aeskulap 0.2.2b1-12 (main) from Debian unstable (main)

Undecided

Fix Released

Link a bug report

Related blueprints

14. By Mitsuya Shibata on 2014-01-25

* Merge from debian (LP: #1272642). Remaining changes:
  - Build-depend on libtiff-dev rather than libtiff4-dev.

[ Mathieu Malaterre ]
* Remove self from maint list
* Remove deprecated DMUA flag
[ Andreas Tille ]
* debian/control:
   - cme fix dpkg-control
   - canonical Vcs fields
* debian/patches/10_desktop.patch: Add Keywords entry
* Refreshed patches (DEP3 headers ... admittedly weak comments since
  there is not even documentation in d/changelog)
* debian/patches/move_icon_to_correct_dir.patch: Move icon to correct
  dir
* debian/patches/remove_rpath.patch: Remove rpath
  Closes: #731952

13. By Colin Watson on 2012-09-09

Build-depend on libtiff-dev rather than libtiff4-dev.

12. By Andreas Tille on 2012-03-05

* enable hardening flags by bumping debhelper compat version to 9
  (thanks for the patch to Simon Ruderich <email address hidden>)
  Closes: #662252
* debian/control: Standards-Version: 3.9.3 (no changes needed)
* debian/copyright: Rewritten to match DEP5
* debian/patches/20_gcc4.4.patch: Add missing description

11. By Andreas Tille on 2012-01-02

Follow the advise to use dh-autoreconf (control+rules) of
Julian Taylor <email address hidden> (thanks Julian)
Closes: #607535

10. By Felix Geyer on 2011-06-04

Reduce dcmtk dependency to >= 3.6.0 to make the package installable.
(LP: #777940)

9. By Felix Geyer on 2011-03-14

* Merge from Debian experimental, remaining changes:
  - debian/patches/30_as_needed.patch: Fix link order for --as-needed.
  - Build-depend on dh-autoreconf and include it in debian/rules.

8. By StefanPotyra on 2010-12-19

* debian/patches/30_as_needed.patch: Fix link order for --as-needed.
* debian/patches/99_autoreconf: Run autoreconf.

7. By Charles Plessy on 2010-03-07

* Team upload.
* Stop installing libtool .la files (debian/rules, Closes: #572819).
* Corrected patch on Desktop menu file (debian/patches/10_desktop.patch).
* Transferred the previous contents of debian/README.Debian to
  debian/README.source, and give links to example data.
* Added a new patch that corrects Aeskulap's icon shape in the desktop
  menus that accept SVG (debian/patches/circular_svg_icon.patch).
* Incremented Standards-Version to reflect conformance with Policy 3.8.4
  (debian/control, no changes needed).

6. By Andreas Tille on 2010-01-26

[ Andreas Tille ]
* debian/control:
  - s/Debian-Med/Debian Med/
  - Standards-Version: 3.8.3 (Added README.source)
* debian/copyright: link to versioned file in common-licenses

[ Nelson A. de Oliveira ]
* Fix watch file

5. By Andreas Tille on 2009-03-25

* Fixed watch file
* Standards-Version: 3.8.1 (no changes needed)
* debian/patches/20_gcc4.4.patch: Patch to compile with gcc 4.4
  (Thanks to Martin Michlmayr <email address hidden>)
  Closes: #504891