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

« back to all changes in this revision

Viewing changes to pixmaps/hicolor/Makefile.in

  • Committer: Bazaar Package Importer
  • Author(s): Marc Deslauriers
  • Date: 2011-02-03 10:35:22 UTC
  • mfrom: (2.3.3 experimental)
  • Revision ID: james.westby@ubuntu.com-20110203103522-j8and6dsy3taczbj
Tags: 0.8.6-1ubuntu1
* Merge from debian experimental. Remaining changes:
  - 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.
  - Add patch da_l10n.patch since it is not integrated. (refreshed)
  - Add patch show_session_or_system_in_console to make the overview
    screen show which local qemu session you're connected to. (refreshed)
  - Add patch more_helpful_error_message to explain to the user why he
    can't connect to qemu:///system and what he can do fix it.
  - Add patch qemu-system-by-default to automatically add qemu:///system
    to the list of hypervisors if the user has write access to the UNIX
    socket.
  - Drop patchsys-quilt include since dpkg-source does the quilt dance for
    us.
  - 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.
* Removed patches:
  - debian/patches/custom-icon-installation.patch: Upstream.
  - debian/patches/remove-appindicator-workarounds.patch: Upstream.
  - debian/patches/fix-nc-with-zsh.patch: Upstream
* 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.
* debian/patches/fix-cpu-wrong-types.patch: fix "value is of wrong type
  for this column" error by making sure we are using strings in
  src/virtManager/details.py.
* debian/patches/dont-always-launch-consoles.patch: Don't always launch
  consoles for running domains in src/virtManager/manager.py.

Show diffs side-by-side

added added

removed removed

Lines of Context:
95
95
CC = @CC@
96
96
CCDEPMODE = @CCDEPMODE@
97
97
CFLAGS = @CFLAGS@
 
98
CPP = @CPP@
98
99
CPPFLAGS = @CPPFLAGS@
99
100
CYGPATH_W = @CYGPATH_W@
100
101
DATADIRNAME = @DATADIRNAME@
 
102
DEFAULT_QEMU_USER = @DEFAULT_QEMU_USER@
101
103
DEFS = @DEFS@
102
104
DEPDIR = @DEPDIR@
103
105
ECHO_C = @ECHO_C@
104
106
ECHO_N = @ECHO_N@
105
107
ECHO_T = @ECHO_T@
 
108
EGREP = @EGREP@
 
109
ENABLE_UNSUPPORTED_RHEL_OPTS = @ENABLE_UNSUPPORTED_RHEL_OPTS@
106
110
EXEEXT = @EXEEXT@
107
111
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
108
112
GMSGFMT = @GMSGFMT@
109
113
GMSGFMT_015 = @GMSGFMT_015@
 
114
GREP = @GREP@
110
115
INSTALL = @INSTALL@
111
116
INSTALL_DATA = @INSTALL_DATA@
112
117
INSTALL_PROGRAM = @INSTALL_PROGRAM@
118
123
INTLTOOL_PERL = @INTLTOOL_PERL@
119
124
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
120
125
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 
126
KVM_PACKAGES = @KVM_PACKAGES@
121
127
LDFLAGS = @LDFLAGS@
122
128
LIBICONV = @LIBICONV@
123
129
LIBINTL = @LIBINTL@
124
130
LIBOBJS = @LIBOBJS@
125
131
LIBS = @LIBS@
 
132
LIBVIRT_PACKAGES = @LIBVIRT_PACKAGES@
126
133
LTLIBICONV = @LTLIBICONV@
127
134
LTLIBINTL = @LTLIBINTL@
128
135
LTLIBOBJS = @LTLIBOBJS@
 
136
MAINT = @MAINT@
129
137
MAKEINFO = @MAKEINFO@
130
138
MKDIR_P = @MKDIR_P@
131
139
MSGFMT = @MSGFMT@
137
145
PACKAGE_NAME = @PACKAGE_NAME@
138
146
PACKAGE_STRING = @PACKAGE_STRING@
139
147
PACKAGE_TARNAME = @PACKAGE_TARNAME@
 
148
PACKAGE_URL = @PACKAGE_URL@
140
149
PACKAGE_VERSION = @PACKAGE_VERSION@
141
150
PATH_SEPARATOR = @PATH_SEPARATOR@
142
151
POSUB = @POSUB@
143
 
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
 
152
PREFERRED_DISTROS = @PREFERRED_DISTROS@
144
153
SET_MAKE = @SET_MAKE@
145
154
SHELL = @SHELL@
146
155
STRIP = @STRIP@
204
213
all: all-recursive
205
214
 
206
215
.SUFFIXES:
207
 
$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 
216
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
208
217
        @for dep in $?; do \
209
218
          case '$(am__configure_deps)' in \
210
219
            *$$dep*) \
229
238
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
230
239
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
231
240
 
232
 
$(top_srcdir)/configure:  $(am__configure_deps)
 
241
$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
233
242
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
234
 
$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 
243
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
235
244
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
236
245
$(am__aclocal_m4_deps):
237
246