« back to all changes in this revision
Viewing changes to share/screens/Makefile.am
- Committer: Bazaar Package Importer
- Date: 2010-09-12 19:44:58 UTC
- mfrom: (1.1.12 upstream) (45.1.3 maverick)
- Revision ID: james.westby@ubuntu.com-20100912194458-4sjwmbl7dlsrk5dc
* Merge with Debian unstable (LP: #628048, LP: #401567, LP: #456248,
LP: #463602, LP: #591986)
* debian/control:
- Ubuntu maintainers
- Promote python-lxml, python-numpy, python-uniconvertor to Recommends.
- Demote pstoedit to Suggests (universe package).
- Suggests ttf-dejavu instead of ttf-bitstream-vera (LP: #513319)
* debian/rules:
- Run intltool-update on build (Ubuntu-specific).
- Add translation domain to .desktop files (Ubuntu-specific).
* debian/dirs:
- Add usr/share/pixmaps. Allow inkscape.xpm installation
* drop 50-poppler-API.dpatch (now upstream)
* drop 51-paste-in-unwritable-directory.dpatch (now upstream)
LP: #463602, LP: #591986)
* debian/control:
- Ubuntu maintainers
- Promote python-lxml, python-numpy, python-uniconvertor to Recommends.
- Demote pstoedit to Suggests (universe package).
- Suggests ttf-dejavu instead of ttf-bitstream-vera (LP: #513319)
* debian/rules:
- Run intltool-update on build (Ubuntu-specific).
- Add translation domain to .desktop files (Ubuntu-specific).
* debian/dirs:
- Add usr/share/pixmaps. Allow inkscape.xpm installation
* drop 50-poppler-API.dpatch (now upstream)
* drop 51-paste-in-unwritable-directory.dpatch (now upstream)
- files added:
- README.osx.txt
- packaging/win32/languages
- share/icons/application
- share/icons/application/16x16
- share/icons/application/22x22
- share/icons/application/24x24
- share/icons/application/256x256
- share/icons/application/32x32
- share/icons/application/48x48
- share/icons/hicolor
- src/ui/tool
- files removed:
- HACKING.de.txt
- src/algorithms
- src/graphlayout
- src/inkjar
- src/removeoverlap
- src/traits
- files modified:
- AUTHORS
- share/tutorials/potrace-zh_TW.png *
added
removed
share/screens/Makefile.am
