[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 008376ce620f3c64fa5d01863872e2fb22c2b2f5
Author: Jo Shields <directhex at apebox.org>
Date:   Sun Jan 10 13:30:22 2010 +0000

    Re-add -dev package, and put lib in correct place

diff --git a/debian/changelog b/debian/changelog
index bd9d800..271028c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,6 @@ cecil (0.6+svn148654-1) UNRELEASED; urgency=low
     only used to change assembly version which is now not necessary.
   * debian/rules, debian/mono.snk.uue: No need to sign now, not necessary for
     unstable libs.
-  * debian/control, debian/libmono-cecil-cil-dev*: Drop -dev package as this
-    is used for dynamic linking, which we are not doing any more.
   * debian/changelog, debian/clean, debian/libmono-cecil-cil.docs: Update
     dh7isation
   * debian/control: Change build-depends on packages provided by `mono' source
diff --git a/debian/control b/debian/control
index 325a440..951280b 100644
--- a/debian/control
+++ b/debian/control
@@ -25,3 +25,17 @@ Description: library to generate and inspect CIL assemblies
  disk the modified assembly.
  .
  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
+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.
+ .
+ In simple English, with Cecil, you can load existing managed assemblies,
+ 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
diff --git a/debian/libmono-cecil-cil-dev.install b/debian/libmono-cecil-cil-dev.install
new file mode 100644
index 0000000..0fe9f3f
--- /dev/null
+++ b/debian/libmono-cecil-cil-dev.install
@@ -0,0 +1 @@
+Mono.Cecil/mono-cecil.pc usr/lib/pkgconfig
diff --git a/debian/libmono-cecil-cil.install b/debian/libmono-cecil-cil.install
index 1d666ea..45f5b43 100644
--- a/debian/libmono-cecil-cil.install
+++ b/debian/libmono-cecil-cil.install
@@ -1,2 +1,2 @@
-Mono.Cecil/Mono.Cecil.dll usr/lib/cli/mono-cecil/
+Mono.Cecil/Mono.Cecil.dll usr/lib/mono-cecil/
 #Mono.Cecil.Mdb/Mono.Cecil.Mdb.dll usr/lib/cli/mono-cecil-0.5
diff --git a/debian/rules b/debian/rules
index d48a01f..0d0ab52 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,10 +13,10 @@ override_dh_auto_build:
 	cd Mono.Cecil && mono-csc \
 		@Mono.Cecil.dll.sources /target:library \
 		/out:Mono.Cecil.dll
-#	sed -e 's;@prefix@;/usr;g' \
-#		-e 's;^Version:.*;Version:\ $(UPVERSION);g' \
-#		-e 's;^assemblies_dir=.*;assemblies_dir=$${prefix}/lib/cli/Mono.Cecil-$(ABIVERSION);g' \
-#		Mono.Cecil/mono-cecil.pc.in > Mono.Cecil/mono-cecil.pc
+	sed -e 's;@prefix@;/usr;g' \
+		-e 's;^Version:.*;Version:\ $(UPVERSION);g' \
+		-e 's;lib/Mono.Cecil$$;lib/mono-cecil;g' \
+		Mono.Cecil/mono-cecil.pc.in > Mono.Cecil/mono-cecil.pc
 
 	# build Mono.Cecil.Mdb.dll, needs newer mono!
 	# cd Mono.Cecil.Mdb && mono-csc -keyfile:../debian/mono.snk \

-- 
cecil