[Pkg-cli-libs-commits] [SCM] cecil branch, master, updated. upstream/0.6+svn148654-13-gd7d7aad

[Jo Shields]

The following commit has been merged in the master branch:
commit d7d7aad63f6919c9489a3bf8b8001baf2afd38b9
Merge: 008376ce620f3c64fa5d01863872e2fb22c2b2f5 c28918d3169eda01ffd0ce38b02fd23abdbb4a4d
Author: Jo Shields <directhex at apebox.org>
Date:   Sun Jan 10 13:33:41 2010 +0000

    Merge branch 'master' of git+ssh://git.debian.org/git/pkg-cli-libs/packages/cecil
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/rules

diff --combined debian/control
index 951280b,b6dfd71..4e88601
--- a/debian/control
+++ b/debian/control
@@@ -2,7 -2,7 +2,7 @@@ Source: ceci
  Section: cli-mono
  Priority: optional
  Maintainer: Debian CLI Libraries Team <pkg-cli-libs-team at lists.alioth.debian.org>
- Uploaders: Sebastian Dröge <slomo at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>
+ Uploaders: Iain Lane <laney at ubuntu.com>
  Build-Depends: debhelper (>= 7.0.50~)
  Build-Depends-Indep: cli-common-dev (>= 0.5.4),
   mono-devel (>= 2.4.3),
@@@ -24,12 -24,12 +24,13 @@@ Description: library to generate and in
   browse all the contained types, modify them on the fly and save back to the
   disk the modified assembly.
   .
 - This package contains the Cecil library.
 + This package contains the Cecil library
  
  Package: libmono-cecil-cil-dev
  Architecture: all
  Depends: libmono-cecil-cil (= ${binary:Version}), ${misc:Depends}
 +Conflicts: libmono-cecil0.3-cil, libmono-cecil0.4-cil, libmono-cecil0.5-cil
+ Replaces: libmono-cecil0.3-cil, libmono-cecil0.4-cil, libmono-cecil0.5-cil
  Description: library to generate and inspect CIL assemblies
   Cecil is a library under development to generate and inspect programs and
   libraries in the ECMA CIL format.
@@@ -38,4 -38,5 +39,5 @@@
   browse all the contained types, modify them on the fly and save back to the
   disk the modified assembly.
   .
-  This package contains the pkg-config file for library
+  This package contains development files for the Cecil library, and should 
+  be used for compilation.

-- 
cecil