Gah!

  Please, discard previous patch. I have mixed things from new version
and old version. The patch I sent attached is a patch that should be
applied for a version >=2.2.1

  Sorry for any inconvenience.


-- 
Jose Carlos Garcia Sogo
   [EMAIL PROTECTED]
diff -urN gmime2.1-2.1.19/debian/changelog gmime-2.2.1/debian/changelog
--- gmime2.1-2.1.19/debian/changelog	2006-05-06 12:18:43.000000000 +0200
+++ gmime-2.2.1/debian/changelog	2006-05-08 23:41:09.000000000 +0200
@@ -1,3 +1,24 @@
+gmime2.1 (2.2.1-1) unstable; urgency=low
+
+  * New upstream release (Closes: #366231)
+  * debian/control:
+     + Build Depend on cli-common-dev (>= 0.4.0)
+     + Make libgmime2.1-cil package architecture all. It does only contain
+     mono code, so it will work in every environment that has Mono available.
+  * debian/rules:
+     + Bump debhelper compat level to 4.
+     + use dh_install instead of deprecated dh_movefiles.
+     + call dh_installcligac and add correspondent file.
+     + only call dh_*cli* stuff on libgmime2.1-cil package.
+     + do not force a maximum version at dh_makeclilibs call. It will 
+     added later when needed.
+  * mv *.files *.install to complete the above change
+  * Install cli files under /usr/lib/cli/gmime-sharp-2.2 to follow new CLI
+    policy. They will be linked to GAC at postinst by debhelper magic.
+    (Closes: #366453)
+
+ -- Jose Carlos Garcia Sogo <[EMAIL PROTECTED]>  Sun,  7 May 2006 10:56:12 +0200
+
 gmime2.1 (2.1.19-1) unstable; urgency=low
 
   * New upstream release.
diff -urN gmime2.1-2.1.19/debian/compat gmime-2.2.1/debian/compat
--- gmime2.1-2.1.19/debian/compat	1970-01-01 01:00:00.000000000 +0100
+++ gmime-2.2.1/debian/compat	2006-05-07 11:26:45.000000000 +0200
@@ -0,0 +1 @@
+4
diff -urN gmime2.1-2.1.19/debian/control gmime-2.2.1/debian/control
--- gmime2.1-2.1.19/debian/control	2006-05-06 12:18:43.000000000 +0200
+++ gmime-2.2.1/debian/control	2006-05-07 10:55:49.000000000 +0200
@@ -2,7 +2,7 @@
 Section: libs
 Priority: optional
 Maintainer: Guus Sliepen <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>> 4.0.0), libglib2.0-dev, gtk-doc-tools, autotools-dev, docbook-utils, zlib1g-dev, cli-common [i386 powerpc amd64 ia64], mono-mcs [i386 powerpc amd64 ia64], mono-gac [i386 powerpc amd64 ia64], libgtk2.0-cil [i386 powerpc amd64 ia64], gtk-sharp2-gapi (>= 2.4.0) [i386 powerpc amd64 ia64]
+Build-Depends: debhelper (>> 4.0.0), libglib2.0-dev, gtk-doc-tools, autotools-dev, docbook-utils, zlib1g-dev, cli-common-dev (>= 0.4.0) [i386 powerpc amd64 ia64], mono-mcs [i386 powerpc amd64 ia64], mono-gac [i386 powerpc amd64 ia64], libgtk2.0-cil [i386 powerpc amd64 ia64], gtk-sharp2-gapi (>= 2.4.0) [i386 powerpc amd64 ia64]
 Standards-Version: 3.6.2
 
 Package: libgmime2.1-dev
@@ -41,8 +41,8 @@
  This is an "unstable" version which is ABI compatible with 2.0.
 
 Package: libgmime2.1-cil
-Architecture: i386 powerpc amd64 ia64
-Depends: ${shlibs:Depends}, ${cli:Depends}, libgmime2.1 (= ${Source-Version})
+Architecture: all
+Depends: ${shlibs:Depends}, ${cli:Depends}
 Description: CLI binding for the MIME library, unstable version
  GMime is a set of utilities for parsing and creating messages using
  the Multipurpose Internet Mail Extension (MIME).
diff -urN gmime2.1-2.1.19/debian/libgmime2.1-cil.files gmime-2.2.1/debian/libgmime2.1-cil.files
--- gmime2.1-2.1.19/debian/libgmime2.1-cil.files	2006-05-06 12:18:43.000000000 +0200
+++ gmime-2.2.1/debian/libgmime2.1-cil.files	1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-usr/lib/mono/gac/gmime-sharp/*
-usr/lib/mono/gmime-sharp/*
-usr/lib/pkgconfig/gmime-sharp.pc
-usr/share/gapi-2.0/*
diff -urN gmime2.1-2.1.19/debian/libgmime2.1-cil.install gmime-2.2.1/debian/libgmime2.1-cil.install
--- gmime2.1-2.1.19/debian/libgmime2.1-cil.install	1970-01-01 01:00:00.000000000 +0100
+++ gmime-2.2.1/debian/libgmime2.1-cil.install	2006-05-07 10:53:13.000000000 +0200
@@ -0,0 +1,3 @@
+usr/lib/pkgconfig/gmime-sharp.pc
+usr/share/gapi-2.0
+usr/lib/mono/gac/gmime-sharp/2.2*/* /usr/lib/cli/gmime-sharp-2.2
diff -urN gmime2.1-2.1.19/debian/libgmime2.1-cil.installcligac gmime-2.2.1/debian/libgmime2.1-cil.installcligac
--- gmime2.1-2.1.19/debian/libgmime2.1-cil.installcligac	1970-01-01 01:00:00.000000000 +0100
+++ gmime-2.2.1/debian/libgmime2.1-cil.installcligac	2006-05-07 11:21:15.000000000 +0200
@@ -0,0 +1 @@
+/usr/lib/cli/gmime-sharp-2.2/gmime-sharp.dll
diff -urN gmime2.1-2.1.19/debian/libgmime2.1-dev.files gmime-2.2.1/debian/libgmime2.1-dev.files
--- gmime2.1-2.1.19/debian/libgmime2.1-dev.files	2006-05-06 12:18:43.000000000 +0200
+++ gmime-2.2.1/debian/libgmime2.1-dev.files	1970-01-01 01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-usr/bin
-usr/include
-usr/lib/gmimeConf.sh
-usr/lib/pkgconfig/gmime-2.0.pc
-usr/lib/libgmime-2.0.{a,la,so}
diff -urN gmime2.1-2.1.19/debian/libgmime2.1-dev.install gmime-2.2.1/debian/libgmime2.1-dev.install
--- gmime2.1-2.1.19/debian/libgmime2.1-dev.install	1970-01-01 01:00:00.000000000 +0100
+++ gmime-2.2.1/debian/libgmime2.1-dev.install	2006-05-06 12:18:43.000000000 +0200
@@ -0,0 +1,5 @@
+usr/bin
+usr/include
+usr/lib/gmimeConf.sh
+usr/lib/pkgconfig/gmime-2.0.pc
+usr/lib/libgmime-2.0.{a,la,so}
diff -urN gmime2.1-2.1.19/debian/libgmime2.1-doc.files gmime-2.2.1/debian/libgmime2.1-doc.files
--- gmime2.1-2.1.19/debian/libgmime2.1-doc.files	2006-05-06 12:18:43.000000000 +0200
+++ gmime-2.2.1/debian/libgmime2.1-doc.files	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-usr/share/gtk-doc/html/gmime/*
diff -urN gmime2.1-2.1.19/debian/libgmime2.1-doc.install gmime-2.2.1/debian/libgmime2.1-doc.install
--- gmime2.1-2.1.19/debian/libgmime2.1-doc.install	1970-01-01 01:00:00.000000000 +0100
+++ gmime-2.2.1/debian/libgmime2.1-doc.install	2006-05-06 12:18:43.000000000 +0200
@@ -0,0 +1 @@
+usr/share/gtk-doc/html/gmime/*
diff -urN gmime2.1-2.1.19/debian/libgmime2.1.files gmime-2.2.1/debian/libgmime2.1.files
--- gmime2.1-2.1.19/debian/libgmime2.1.files	2006-05-06 12:18:43.000000000 +0200
+++ gmime-2.2.1/debian/libgmime2.1.files	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-usr/lib/libgmime-2.0.so.*
diff -urN gmime2.1-2.1.19/debian/libgmime2.1.install gmime-2.2.1/debian/libgmime2.1.install
--- gmime2.1-2.1.19/debian/libgmime2.1.install	1970-01-01 01:00:00.000000000 +0100
+++ gmime-2.2.1/debian/libgmime2.1.install	2006-05-06 12:18:43.000000000 +0200
@@ -0,0 +1 @@
+usr/lib/libgmime-2.0.so.*
diff -urN gmime2.1-2.1.19/debian/rules gmime-2.2.1/debian/rules
--- gmime2.1-2.1.19/debian/rules	2006-05-06 12:18:43.000000000 +0200
+++ gmime-2.2.1/debian/rules	2006-05-07 11:53:14.000000000 +0200
@@ -74,7 +74,7 @@
 	dh_testdir -s -i
 	dh_testroot -s -i
 	# move files to where they supposedly belong
-	dh_movefiles -s -i
+	dh_install -a -i --sourcedir=debian/tmp
 	rm -f debian/libgmime2.1-dev/usr/bin/uu{decode,encode}
 
 	dh_installdocs -s -i
@@ -86,10 +86,11 @@
 	dh_compress -s -i
 	dh_fixperms -s -i
 	dh_makeshlibs -s -i
-	which dh_makeclilibs && dh_makeclilibs -m $(UPVERSION) -l $(NEXT_UPVERSION) || true
+	dh_makeclilibs -plibgmime2.1-cil -m $(UPVERSION)
+	dh_installcligac -plibgmime2.1-cil
 	dh_installdeb -s -i
 	dh_shlibdeps -s -i
-	which dh_clideps && dh_clideps -d || true
+	dh_clideps -d -plibgmime2.1-cil
 	dh_gencontrol -s -i
 	dh_md5sums -s -i
 	dh_builddeb -s -i

Attachment: signature.asc
Description: Esta parte del mensaje está firmada digitalmente

Reply via email to