~ubuntu-branches/ubuntu/trusty/evince/trusty-proposed

Viewing all changes in revision 109.

  • Committer: Bazaar Package Importer
  • Author(s): Didier Roche
  • Date: 2010-05-26 10:37:56 UTC
  • mfrom: (1.2.10 squeeze)
  • Revision ID: james.westby@ubuntu.com-20100526103756-2j9zyw10kaxf25ca
Tags: 2.30.1-2ubuntu1
* Merge from debian unstable.  Remaining changes:
  + debian/evince-common.dirs,debian/evince-common.postinst,
    debian/evincei-common.postrm, debian/apparmor-profile,
    debian/apparmor-profile.abstraction:
    - apparmor profile
  + debian/{rules,control,control.in}: add hardening-includes to gain
    PIE security build.
  + debian/controli.in:
    - Launchpad integration build-dep
    - evince-common new bin package replaces evince/evince-gtk << 2.30.1-2
  + debian/evince-common.install:
    - install evince manpage
  + debian/control.in, debian/rules, debian/libevview{2,dev},
    debian/libevdocument{2,dev}, debian/libevince{2,dev}:
    provide libevdocument and libevview separate package instead of
    libevince
  + debian/patches/01_launchpad.patch: LPI
  + debian/patches/02_fix_dot_dir_creation.patch: stolen upstream,
    fix dot dir creation when launching evince directly
  + debian/patches/03_fix_opening_hash_filename.patch: stolen upstreama
    fix filename creation when hash filename present
  + debian/patches/99_autoconf.patch: rebuild
  + apport hook:
    - add debian/evince.apport
    - debian/evince.dirs: add usr/share/apport/package-hooks
    - debian/rules: install evince.apport
  + debian/watch:
    - take unstable release

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: