← Back to branch summary

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

« back to all changes in this revision

Viewing changes to .pc/0001-use-usr-share-gconf-for-schema-data.patch/src/Makefile.in

  • 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:
.pc/0001-use-usr-share-gconf-for-schema-data.patch/src/Makefile.in
134
134
CPPFLAGS = @CPPFLAGS@
135
135
CYGPATH_W = @CYGPATH_W@
136
136
DATADIRNAME = @DATADIRNAME@
 
137
DEFAULT_GRAPHICS = @DEFAULT_GRAPHICS@
137
138
DEFAULT_QEMU_USER = @DEFAULT_QEMU_USER@
138
139
DEFS = @DEFS@
139
140
DEPDIR = @DEPDIR@
788
789
 
789
790
@INTLTOOL_DESKTOP_RULE@
790
791
 
791
 
%.desktop.in: $(srcdir)/%.desktop.in.in
 
792
%.desktop.in: $(srcdir)/%.desktop.in.in ${top_builddir}/config.status
792
793
        sed -e "s,::PACKAGE::,$(PACKAGE)," -e "s,::ICONDIR::,$(pkgdatadir)/pixmaps," < $< > $@
793
794
 
794
 
%.service: $(srcdir)/%.service.in
 
795
%.service: $(srcdir)/%.service.in ${top_builddir}/config.status
795
796
        sed -e "s,::PACKAGE::,$(PACKAGE)," -e "s,::PREFIX::,$(prefix)," < $< > $@
796
797
 
797
 
%.schemas: $(srcdir)/%.schemas.in
798
 
        sed -e "s,::PACKAGE::,$(PACKAGE)," < $< > $@
 
798
%.schemas: $(srcdir)/%.schemas.in ${top_builddir}/config.status
 
799
        sed -e "s|::DEFAULT_GRAPHICS::|$(DEFAULT_GRAPHICS)|g" \
 
800
            -e "s,::PACKAGE::,$(PACKAGE)," \
 
801
            < $< > $@
799
802
 
800
 
%.py: $(srcdir)/%.py.in
 
803
%.py: $(srcdir)/%.py.in ${top_builddir}/config.status
801
804
        sed -e "s,::PACKAGE::,$(PACKAGE)," \
802
805
          -e "s,::VERSION::,$(VERSION)," \
803
806
          -e "s,::ASSETDIR::,$(pkgdatadir)," \
813
816
          -e "s|::LIBVIRT_PACKAGES::|$(LIBVIRT_PACKAGES)|" \
814
817
          < $< > $@
815
818
 
816
 
$(PACKAGE): $(srcdir)/$(PACKAGE).in
 
819
$(PACKAGE): $(srcdir)/$(PACKAGE).in ${top_builddir}/config.status
817
820
        sed -e "s,::PACKAGE::,$(PACKAGE)," -e "s,::PYTHONDIR::,$(pkgdatadir)," < $< > $@
818
821
 
819
 
$(PACKAGE)-tui: $(srcdir)/$(PACKAGE)-tui.in
 
822
$(PACKAGE)-tui: $(srcdir)/$(PACKAGE)-tui.in ${top_builddir}/config.status
820
823
        sed -e "s,::PACKAGE::,$(PACKAGE)-tui," -e "s,::PYTHONDIR::,$(pkgdatadir)," < $< > $@
821
824
 
822
 
$(PACKAGE)-launch: $(srcdir)/$(PACKAGE)-launch.in
 
825
$(PACKAGE)-launch: $(srcdir)/$(PACKAGE)-launch.in ${top_builddir}/config.status
823
826
        sed -e "s,::PACKAGE::,$(PACKAGE)," -e "s,::PYTHONDIR::,$(pkgdatadir)," < $< > $@
824
827
 
825
828
# Tell versions [3.59,3.63) of GNU make to not export all variables.