~ubuntu-branches/ubuntu/jaunty/libvirt/jaunty-proposed

« back to all changes in this revision

Viewing changes to debian/rules

  • Committer: Bazaar Package Importer
  • Author(s): Soren Hansen
  • Date: 2008-08-11 15:36:54 UTC
  • mfrom: (3.1.1 lenny)
  • Revision ID: james.westby@ubuntu.com-20080811153654-k65w9a9job1e8xxn
Tags: 0.4.4-3ubuntu1
* Merge from debian unstable, remaining changes:
  - debian/control:
    + DebianMaintainerField
    + Don't build-depend on QEmu.
    + Add "XS-Original-" prefix to Debian's Vcs headers.
    + Bump bridge-utils, dnsmasq-base, netcat-openbsd, and iptables to Depends
      of libvirt-bin.
    + s/interract/interact/g
    + Add versioned Conflicts/Replaces to libvirt0 for libvirt0-dbg, since
      we used to ship them as such.
  - Create /var/run/libvirt in libvirt-bin's init script.
  - Rename libvirt group to libvirtd.
  - 0005-delayed_iff_up_bridge.patch: Don't try to bring up the bridge before at
    least one interface has been added to it.
  - dont_clobber_existing_bridges.patch: Assign the name of the virtual
    bridge dynamically to avoid interfering with existing bridges.
  - better_default_uri_virsh.patch: Default to qemu:///system if the user
    has write access to the libvirt socket, otherwise qemu:///session.
  - We call libxen-dev libxen3-dev, so change all references.

Show diffs side-by-side

added added

removed removed

Lines of Context:
23
23
        --with-polkit            \
24
24
        --with-storage-fs        \
25
25
        --with-storage-lvm       \
26
 
        --with-storage-iscsi  \
27
 
        --with-storage-disk   \
 
26
        --with-storage-iscsi     \
 
27
        --with-storage-disk      \
28
28
        --with-init-scripts=none \
29
29
        --enable-debug           \
30
30
        $(BUILD_XEN)
40
40
binary-install/libvirt-doc::
41
41
        cd $(EXAMPLES) && rm -rf .libs *.o info1 suspend ../html/CVS
42
42
 
 
43
redo-patches::
 
44
        rm -f debian/patches/*
 
45
        git format-patch -N -o debian/patches master...patch-queue | \
 
46
                sed -e 's%debian/patches/%%' > debian/patches/series