« back to all changes in this revision
Viewing changes to templates/english/Makefile.am
- Committer: Bazaar Package Importer
- Date: 2009-06-07 11:10:47 UTC
- mfrom: (1.1.19 upstream) (2.1.2 squeeze)
- Revision ID: james.westby@ubuntu.com-20090607111047-l3rtbzfjxvmi1kx0
* Merge from debian unstable, remaining changes:
- Promoted gnumeric-doc to Recommends in gnumeric package for help to be
installed automatically
- gnumeric-gtk is a transitional package
- gnumeric conflicts with gnumeric-gtk << 1.8.3-3ubuntu1
- call initltool-update in po*
- remove psiconv support (psiconv is in universe):
o debian/control: remove B-D on libpsiconv-dev
o debian/rules: don't pass --with-psiconv to ./configure
- Promoted gnumeric-doc to Recommends in gnumeric package for help to be
installed automatically
- gnumeric-gtk is a transitional package
- gnumeric conflicts with gnumeric-gtk << 1.8.3-3ubuntu1
- call initltool-update in po*
- remove psiconv support (psiconv is in universe):
o debian/control: remove B-D on libpsiconv-dev
o debian/rules: don't pass --with-psiconv to ./configure
- files added:
- acinclude.m4
- component
- icons/16x16
- icons/22x22
- icons/24x24
- icons/32x32
- icons/48x48
- icons/scalable
- files removed:
- debian/gnumeric.prerm
- files modified:
- BUGS
added
removed
templates/english/Makefile.am
