Merge lp:~directhex/libubuntuone/mono_packaging into lp:~ken-vandine/libubuntuone/package_with_mono

[Jo Shields]

[Jo Shields (directhex)]

Um, that commit message should say dh_clideps not dh_shlibdeps.

I guess I needed a lot of rum to get it working...

[Ken VanDine (ken-vandine)]

Thanks!

review: Approve

=== modified file 'debian/control'
--- debian/control	2010-03-08 18:24:40 +0000
+++ debian/control	2010-03-08 23:09:16 +0000
@@ -43,26 +43,23 @@
  This library contains GTK widgets needed for integration of Ubuntu
  One functionalities into GTK applications.
 
-Package: libubuntuone-1.0-1-cil
+Package: libubuntuone1.0-cil
 Section: cli-mono
-Architecture: any
+Architecture: all
 Depends: ${misc:Depends},
-         ${cli:Depends},
-         libubuntuone-1.0-1 (= ${binary:Version})
-Provides: ${cli:Provides}
-Description: CLI bindings Ubuntu One widget library
+         ${cli:Depends}
+Description: CLI bindings for Ubuntu One widget library
  This library contains GTK widgets needed for integration of Ubuntu
  One functionalities into GTK applications.
  .
  This package contains assemblies to be used by applications.
 
-Package: libubuntuone-cil-dev
+Package: libubuntuone1.0-cil-dev
 Section: libdevel
-Architecture: any
+Architecture: all
 Depends: ${misc:Depends},
-         ${cli:Depends},
-         libubuntuone-1.0-1-cil (= ${binary:Version})
-Description: Ubuntu One widget library
+         libubuntuone1.0-cil (= ${binary:Version})
+Description: CLI bindings for Ubuntu One widget library - development
  This library contains GTK widgets needed for integration of Ubuntu
  One functionalities into GTK applications.
  .
 
=== renamed file 'debian/libubuntuone-cil-dev.install' => 'debian/libubuntuone1.0-cil-dev.install'
=== renamed file 'debian/libubuntuone-1.0-1-cil.install' => 'debian/libubuntuone1.0-cil.install'
--- debian/libubuntuone-1.0-1-cil.install	2010-03-08 18:24:40 +0000
+++ debian/libubuntuone1.0-cil.install	2010-03-08 23:09:16 +0000
@@ -1,1 +1,1 @@
-debian/tmp/usr/lib/cli/ubuntuone-sharp-1.0/*
+debian/tmp/usr/lib/mono/* usr/lib/cli/
 
=== renamed file 'debian/libubuntuone-1.0-1-cil.installcligac' => 'debian/libubuntuone1.0-cil.installcligac'
--- debian/libubuntuone-1.0-1-cil.installcligac	2010-03-08 18:24:53 +0000
+++ debian/libubuntuone1.0-cil.installcligac	2010-03-08 23:09:16 +0000
@@ -1,1 +1,1 @@
-/usr/lib/mono/ubuntuone-sharp-1.0/ubuntuone-sharp.dll
+/usr/lib/cli/ubuntuone-sharp-1.0/ubuntuone-sharp.dll
 
=== added file 'debian/patches/use_debian_cli_policy_0.7_dir.patch'
--- debian/patches/use_debian_cli_policy_0.7_dir.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/use_debian_cli_policy_0.7_dir.patch	2010-03-08 23:09:16 +0000
@@ -0,0 +1,12 @@
+diff -urNad libubuntuone-0.2.100~/ubuntuone-sharp.pc.in libubuntuone-0.2.100/ubuntuone-sharp.pc.in
+--- libubuntuone-0.2.100~/ubuntuone-sharp.pc.in	2010-03-08 20:31:31.000000000 +0000
++++ libubuntuone-0.2.100/ubuntuone-sharp.pc.in	2010-03-08 20:31:52.000000000 +0000
+@@ -1,7 +1,7 @@
+ prefix=${pcfiledir}/../..
+ exec_prefix=${prefix}
+ libdir=${exec_prefix}/lib
+-assemblies_dir=${libdir}/mono/ubuntuone-sharp-1.0
++assemblies_dir=${libdir}/cli/ubuntuone-sharp-1.0
+ Libraries=${assemblies_dir}/ubuntuone-sharp.dll
+ 
+ 
 
=== modified file 'debian/rules'
--- debian/rules	2010-03-08 18:24:40 +0000
+++ debian/rules	2010-03-08 23:09:16 +0000
@@ -13,6 +13,8 @@
 DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc
 API_VERSION = 0.1
 
+DEB_DH_MAKESHLIBS_ARGS_libubuntuone-1.0-1 := -V 'libubuntuone-1.0-1 (>= 0.2.100)'
+
 configure-stamp-%:
 	mkdir build-$*
 	cd build-$* && PYTHON=`which $*` \
@@ -36,6 +38,15 @@
 binary-install/python-ubuntuone::
 	dh_pycentral
 
+binary-install/libubuntuone1.0-cil::
+	dh_clistrip
+	dh_clifixperms
+	dh_makeclilibs -V
+	dh_installcligac
+
+binary-predeb/libubuntuone1.0-cil:: binary-fixup/libubuntuone-1.0-1
+	dh_clideps -plibubuntuone1.0-cil
+
 configure-stamp:
 	$(DEB_CONFIGURE_SCRIPT) $(DEB_CONFIGURE_NORMAL_ARGS) $(DEB_CONFIGURE_EXTRA_FLAGS)
 	touch $@
@@ -50,8 +61,6 @@
 
 install-stamp:
 	make install DESTDIR=$(CURDIR)/debian/tmp
-	mv $(CURDIR)/debian/tmp/usr/lib/mono $(CURDIR)/debian/tmp/usr/lib/cli
-	dh_clideps 
 	touch $@
 
 install/libubuntuone-1.0-1:: install-stamp