[SCM] serd/master: Refresh

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit d80de388423c79f873fd97db5fbd8626879984a9
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu May 26 00:02:16 2011 +0200

    Refresh

diff --git a/debian/patches/1001-dont_run_ldconfig.patch b/debian/patches/1001-dont_run_ldconfig.patch
index 4199b6f..56a6fd0 100644
--- a/debian/patches/1001-dont_run_ldconfig.patch
+++ b/debian/patches/1001-dont_run_ldconfig.patch
@@ -8,11 +8,11 @@ Forwarded: not-needed
 
 --- serd.orig/wscript
 +++ serd/wscript
-@@ -127,7 +127,6 @@ def build(bld):
+@@ -125,7 +125,6 @@ def build(bld):
      # Man page
      bld.install_files('${MANDIR}/man1', 'doc/serdi.1')
  
 -    bld.add_post_fun(autowaf.run_ldconfig)
+     if bld.env['DOCS']:
+         bld.add_post_fun(fix_docs)
  
- def lint(ctx):
-     subprocess.call('cpplint.py --filter=-whitespace,+whitespace/comments,-build/header_guard,-readability/casting,-readability/todo src/* serd/*', shell=True)

-- 
serd packaging