[ovs-git] Open vSwitch: debian: Use a different way to avoid failing install without kernel module. (branch-1.4)

Mon Mar 19 17:39:50 UTC 2012

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Open vSwitch".

The branch, branch-1.4 has been updated
       via  0d4000c2f610fe4b7e5b19d3a5fe8dc7a0d5fd08 (commit)
       via  0c869d3808af7cd2e1500f40285d2dcc4773d28e (commit)
       via  5955764c2794cab79d97705f7a67beefd8a61d02 (commit)
       via  c233d1b2ba095afe88fc3b763dabfec9dfbfcf0d (commit)
       via  4fe0f600d7f283afab68f4c32800fab89e86aaef (commit)
       via  af6641239aacdc277c4a6f6209c3bbc8e32cabd9 (commit)
       via  1fc478324caf0e57a1afcabec061984ad5dc1b7b (commit)
       via  9c06032b145b329dfd1adcd0f73fc631d1d50cc2 (commit)
       via  e3e13d047f9871e026206557933eeae1735b6a51 (commit)
       via  4ccdda5208a0c0dff9775ee206b94c5df3cfb5ec (commit)
       via  417761468a69ec50f5a837aa75305c674e3d451b (commit)
       via  5aaa384f467f8b72f663ee2b9b7fe7eaa621a017 (commit)
       via  e44acfe6a8cfb2b670b8380a26561557125d480e (commit)
       via  a64304caeb6b16f28f98c14f315444a106039c2b (commit)
      from  759351411d307772bd0ec5e0f6e1d634df6a8b3f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0d4000c2f610fe4b7e5b19d3a5fe8dc7a0d5fd08
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=0d4000c2f610fe4b7e5b19d3a5fe8dc7a0d5fd08
Author: Ben Pfaff <blp at nicira.com>

debian: Use a different way to avoid failing install without kernel module.

The dh_installinit --error-handler option makes a lot of sense, but after
playing with it for a while I could not figure out a nice way to use it
only for openvswitch-switch without either duplicating the dh_installinit
fragments in postinst and prerm (the actual bug that was reported) or
omitting them for some package.

Also, we forgot to write the error handler function for the prerm.

This commit switches to a different way to avoid failing the install when
the kernel module is not available, without using --error-handler.

CC: 663051 at bugs.debian.org
Reported-by: Thomas Goirand <zigo at debian.org>
Reviewed-by: Simon Horman <horms at verge.net.au>
Signed-off-by: Ben Pfaff <blp at nicira.com>

commit 0c869d3808af7cd2e1500f40285d2dcc4773d28e
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=0c869d3808af7cd2e1500f40285d2dcc4773d28e
Author: Ben Pfaff <blp at nicira.com>

ovsdb-doc: Use minus sign in negative numbers in nroff output.

ovs-vswitchd.conf.db.5 has autogenerated text "at least -1" in one place.
This '-' should be a minus sign, but ovsdb-doc was generating it as a
hyphen.

Found by lintian.

Reported-by: Thomas Goirand <zigo at debian.org>
Reviewed-by: Simon Horman <horms at verge.net.au>
Signed-off-by: Ben Pfaff <blp at nicira.com>

commit 5955764c2794cab79d97705f7a67beefd8a61d02
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=5955764c2794cab79d97705f7a67beefd8a61d02
Author: Ben Pfaff <blp at nicira.com>

ovsdb-doc: Convert '-' preceding a number as a minus sign, not a hyphen.

ovs-vswitchd.conf.db.5 contains the following sentence:

   If the interface cannot be added then Open vSwitch sets this column
   to -1.

The '-' in "-1" should be a minus sign, not a hyphen, but the heuristic
in ovsdb-doc wasn't smart enough.  This commit improves the heuristic and
fixes the problem.

Found by lintian.

Reported-by: Thomas Goirand <zigo at debian.org>
Reviewed-by: Simon Horman <horms at verge.net.au>
Signed-off-by: Ben Pfaff <blp at nicira.com>

commit c233d1b2ba095afe88fc3b763dabfec9dfbfcf0d
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=c233d1b2ba095afe88fc3b763dabfec9dfbfcf0d
Author: Ben Pfaff <blp at nicira.com>

ovsdb-doc: Put NAME section into generated manpage.

This makes the manpage indexable by standard system tools.

Found by lintian.

Reported-by: Thomas Goirand <zigo at debian.org>
Reviewed-by: Simon Horman <horms at verge.net.au>
Signed-off-by: Ben Pfaff <blp at nicira.com>

commit 4fe0f600d7f283afab68f4c32800fab89e86aaef
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=4fe0f600d7f283afab68f4c32800fab89e86aaef
Author: Ben Pfaff <blp at nicira.com>

debian: Avoid unit test failure when doing "unofficial" builds.

The configure option --with-build-number=0 is interpreted differently in
different places.  The configure script itself accepts 0 as an actual
build number and puts '#define BUILDNR "+build0"' into config.h.  The
code in python/automake.mk treats 0 as "no build number" and puts
'BUILDNR = ""' into version.py.

This commit avoids the problem by not passing 0 as a build number.

Reviewed-by: Simon Horman <horms at verge.net.au>
Signed-off-by: Ben Pfaff <blp at nicira.com>

commit af6641239aacdc277c4a6f6209c3bbc8e32cabd9
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=af6641239aacdc277c4a6f6209c3bbc8e32cabd9
Author: Thomas Goirand <zigo at debian.org>

doc: Fix typo in manpage.

Found by lintian.

Reviewed-by: Simon Horman <horms at verge.net.au>
Signed-off-by: Thomas Goirand <zigo at debian.org>
Signed-off-by: Ben Pfaff <blp at nicira.com>

commit 1fc478324caf0e57a1afcabec061984ad5dc1b7b
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=1fc478324caf0e57a1afcabec061984ad5dc1b7b
Author: Thomas Goirand <zigo at debian.org>

debian: Bump standards-version to 3.9.3.

No other changes necessary.

Reviewed-by: Simon Horman <horms at verge.net.au>
Signed-off-by: Thomas Goirand <zigo at debian.org>
Signed-off-by: Ben Pfaff <blp at nicira.com>

commit 9c06032b145b329dfd1adcd0f73fc631d1d50cc2
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=9c06032b145b329dfd1adcd0f73fc631d1d50cc2
Author: Thomas Goirand <zigo at debian.org>

debian: Remove some useless files from the dkms pacakge.

This commit removes useless files from the dkms package that caused
lintian warnings.

(Many of the other files in the dkms package are also useless but do not
cause lintian warnings so they are less important.)

Reviewed-by: Simon Horman <horms at verge.net.au>
Signed-off-by: Thomas Goirand <zigo at debian.org>
Signed-off-by: Ben Pfaff <blp at nicira.com>

commit e3e13d047f9871e026206557933eeae1735b6a51
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=e3e13d047f9871e026206557933eeae1735b6a51
Author: Thomas Goirand <zigo at debian.org>

debian: Clean .pyc files in "clean" target.

Reviewed-by: Simon Horman <horms at verge.net.au>
Signed-off-by: Thomas Goirand <zigo at debian.org>
Signed-off-by: Ben Pfaff <blp at nicira.com>

commit 4ccdda5208a0c0dff9775ee206b94c5df3cfb5ec
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=4ccdda5208a0c0dff9775ee206b94c5df3cfb5ec
Author: Thomas Goirand <zigo at debian.org>

debian: Remove po-debconf build dependency.

Open vSwitch no longer uses Debconf at all, for some time now.

Reviewed-by: Simon Horman <horms at verge.net.au>
Signed-off-by: Thomas Goirand <zigo at debian.org>
Signed-off-by: Ben Pfaff <blp at nicira.com>

commit 417761468a69ec50f5a837aa75305c674e3d451b
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=417761468a69ec50f5a837aa75305c674e3d451b
Author: Thomas Goirand <zigo at debian.org>

debian: Build-depend on python-all to pull in all Python versions.

Open vSwitch should support all Python versions in the distribution.  This
is the way to do it.

Reviewed-by: Simon Horman <horms at verge.net.au>
Signed-off-by: Thomas Goirand <zigo at debian.org>
Signed-off-by: Ben Pfaff <blp at nicira.com>

commit 5aaa384f467f8b72f663ee2b9b7fe7eaa621a017
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=5aaa384f467f8b72f663ee2b9b7fe7eaa621a017
Author: Thomas Goirand <zigo at debian.org>

debian: Add missing ${python:Depends} to openvswitch-test package.

Reviewed-by: Simon Horman <horms at verge.net.au>
Signed-off-by: Thomas Goirand <zigo at debian.org>
Signed-off-by: Ben Pfaff <blp at nicira.com>

commit e44acfe6a8cfb2b670b8380a26561557125d480e
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=e44acfe6a8cfb2b670b8380a26561557125d480e
Author: Thomas Goirand <zigo at debian.org>

debian: Improve long descriptions so as to better describe the packages.

Reviewed-by: Simon Horman <horms at verge.net.au>
Signed-off-by: Thomas Goirand <zigo at debian.org>
Signed-off-by: Ben Pfaff <blp at nicira.com>

commit a64304caeb6b16f28f98c14f315444a106039c2b
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=a64304caeb6b16f28f98c14f315444a106039c2b
Author: Thomas Goirand <zigo at debian.org>

debian: Bump debhelper compat level to 8 and make build-depends consistent.

Reviewed-by: Simon Horman <horms at verge.net.au>
Signed-off-by: Thomas Goirand <zigo at debian.org>
Signed-off-by: Ben Pfaff <blp at nicira.com>

-----------------------------------------------------------------------

Summary of changes:
 debian/compat                      |    2 +-
 debian/control                     |  126 +++++++++++++++++++++++++++++-------
 debian/openvswitch-switch.init     |    7 ++
 debian/openvswitch-switch.postinst |   18 +-----
 debian/rules                       |   22 ++++++-
 lib/stress-unixctl.man             |    2 +-
 ovsdb/ovsdb-doc.in                 |   22 ++++---
 python/ovs/db/types.py             |   31 ++++++----
 8 files changed, 163 insertions(+), 67 deletions(-)

hooks/post-receive
-- 
Open vSwitch