~ubuntu-branches/ubuntu/natty/file-roller/natty-proposed

Viewing all changes in revision 95.

  • Committer: Bazaar Package Importer
  • Author(s): Didier Roche
  • Date: 2010-05-26 15:32:48 UTC
  • mfrom: (2.1.9 squeeze)
  • Revision ID: james.westby@ubuntu.com-20100526153248-gs9bfuongijv3q9j
Tags: 2.30.1.1-1ubuntu1
* Merge from debian unstable, remaining changes:
  + debian/control.in:
    - Add Vcs-Bzr field
    - rpm2cpio as suggests instead of recommends
    - Support zip/unzip instead of p7zip
    - LP integration
    - add quilt support
    - build-dep on libdbus-glib-1-dev to get futur PackageKit integration
  + debian/rules:
    - add quilt support
  + debian/sources: removed, debian/ only branch doesn't seem to support
    quilt format
  + debian/patches/01_menu_change.patch: don't show file-roller in the
    menu
  + debian/patches/02_lpi.patch
  + debian/patches/{20_am-maintainer-mode.patch, 70_autotools.patch}:
    - Call AM_MAINTAINER_MODE as we patch some Makefile.am
  + debian/watch:
    - Watch unstable versions

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: