← Back to branch summary

~ubuntu-branches/ubuntu/precise/virt-manager/precise-proposed

« back to all changes in this revision

Viewing changes to src/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Marc Deslauriers
  • Date: 2011-05-18 14:11:16 UTC
  • mfrom: (2.1.24 sid)
  • Revision ID: james.westby@ubuntu.com-20110518141116-3457j7twra3zlpve
Tags: 0.8.7-1ubuntu1
https://launchpad.net/bugs/747078
* Merge from debian unstable. Remaining changes: (LP: #747078)
  - debian/control: Depend on python-appindicator for appindicator
    support.
  - Add a /usr/share/pixmaps/virt-manager-icon.svg symlink to link icon to
    where the Application Indicator can find it.
  - debian/patches/more_helpful_error_message.patch: explain to the user
    why he can't connect to qemu:///system and what he can do fix it.
  - debian/control: lower libvirt-bin from Recommends to Suggests; seems
    some users (like netbooks) want to manage VMs, but not host them; see
    meta packages (ubuntu-virt, ubuntu-virt-server, ubuntu-virt-mgmt) for
    group installation of virt package sets.
  - debian/patches/use_ubuntu_package_names.patch: Suggest installing the
    packages that are actually available in Ubuntu.
  - debian/rules: Set qemu user to libvirt-qemu so appropriate
    permissions get set.
  - debian/rules: Set Ubuntu as the preferred distro so we appear first
    in the list.
  - debian/rules: disable TUI for now, since the required dependencies
    are not available (Newt Syrup).
  - debian/rules: Drop patchsys-quilt include since dpkg-source does the
    quilt dance for us.
  - debian/patches/fork_before_using_gconf.patch: fork earlier to resolve
    cpu usage issue and appindicator issue.
  - Removed python-ipy dependency as it is in universe:
    - debian/control: remove python-ipy from Depends
    - debian/series: disable 0002-Use-IPy-from-python-ipy.patch patch so
      we use the one that's included in the virt-manager source.
    - debian/rules: don't delete the IPy file.
* Removed patches:
  - debian/patches/dont-always-launch-consoles.patch: Upstream
  - debian/patches/fix_apparmor_details.patch: Upstream
  - debian/patches/fix-cpu-wrong-types.patch: Upstream
  - debian/patches/no_hal_traceback.patch: Upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/Makefile.am
42
42
 
43
43
@INTLTOOL_DESKTOP_RULE@
44
44
 
45
 
%.desktop.in: $(srcdir)/%.desktop.in.in
 
45
%.desktop.in: $(srcdir)/%.desktop.in.in ${top_builddir}/config.status
46
46
        sed -e "s,::PACKAGE::,$(PACKAGE)," -e "s,::ICONDIR::,$(pkgdatadir)/pixmaps," < $< > $@
47
47
 
48
 
%.service: $(srcdir)/%.service.in
 
48
%.service: $(srcdir)/%.service.in ${top_builddir}/config.status
49
49
        sed -e "s,::PACKAGE::,$(PACKAGE)," -e "s,::PREFIX::,$(prefix)," < $< > $@
50
50
 
51
 
%.schemas: $(srcdir)/%.schemas.in
52
 
        sed -e "s,::PACKAGE::,$(PACKAGE)," < $< > $@
 
51
%.schemas: $(srcdir)/%.schemas.in ${top_builddir}/config.status
 
52
        sed -e "s|::DEFAULT_GRAPHICS::|$(DEFAULT_GRAPHICS)|g" \
 
53
            -e "s,::PACKAGE::,$(PACKAGE)," \
 
54
            < $< > $@
53
55
 
54
 
%.py: $(srcdir)/%.py.in
 
56
%.py: $(srcdir)/%.py.in ${top_builddir}/config.status
55
57
        sed -e "s,::PACKAGE::,$(PACKAGE)," \
56
58
          -e "s,::VERSION::,$(VERSION)," \
57
59
          -e "s,::ASSETDIR::,$(pkgdatadir)," \
67
69
          -e "s|::LIBVIRT_PACKAGES::|$(LIBVIRT_PACKAGES)|" \
68
70
          < $< > $@
69
71
 
70
 
$(PACKAGE): $(srcdir)/$(PACKAGE).in
 
72
$(PACKAGE): $(srcdir)/$(PACKAGE).in ${top_builddir}/config.status
71
73
        sed -e "s,::PACKAGE::,$(PACKAGE)," -e "s,::PYTHONDIR::,$(pkgdatadir)," < $< > $@
72
74
 
73
 
$(PACKAGE)-tui: $(srcdir)/$(PACKAGE)-tui.in
 
75
$(PACKAGE)-tui: $(srcdir)/$(PACKAGE)-tui.in ${top_builddir}/config.status
74
76
        sed -e "s,::PACKAGE::,$(PACKAGE)-tui," -e "s,::PYTHONDIR::,$(pkgdatadir)," < $< > $@
75
77
 
76
 
$(PACKAGE)-launch: $(srcdir)/$(PACKAGE)-launch.in
 
78
$(PACKAGE)-launch: $(srcdir)/$(PACKAGE)-launch.in ${top_builddir}/config.status
77
79
        sed -e "s,::PACKAGE::,$(PACKAGE)," -e "s,::PYTHONDIR::,$(pkgdatadir)," < $< > $@
78
80
 
79
81