r18819 - in /packages/unstable/gmime2.2/debian: ./ patches/

meebey at users.alioth.debian.org meebey at users.alioth.debian.org
Sat Mar 7 00:20:54 UTC 2009 

Author: meebey
Date: Sat Mar  7 00:20:54 2009
New Revision: 18819

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=18819
Log:
   * debian/control:
    + Replaced mono-mcs and mono-gac build-deps with mono-devel >= 2.0 as part
      of the Mono 2.0 transition.
  * debian/patches/gmime_sharp_signing_key.dpatch:
    + Modified patch to sign assembly at compile stage using the
      AssemblyKeyFile attribute.
 
  [ Steve Langasek ]
  * debian/rules: pass CSC=/usr/bin/csc to configure, for the mono 2.0
    transition.
  * debian/patches/gmime_sharp_signing_key.dpatch: new patch to pull in
    the signing key from upstream 2.4, to allow the package to build
    with current mono-devel; this implies an ABI change, so rename to
    libgmime2.2a-cil.
  * debian/control: build-depend on sharutils for the above patch.
 

Added:
    packages/unstable/gmime2.2/debian/gmime-sharp.snk.uu
    packages/unstable/gmime2.2/debian/libgmime2.2a-cil.docs
    packages/unstable/gmime2.2/debian/libgmime2.2a-cil.install
    packages/unstable/gmime2.2/debian/libgmime2.2a-cil.installcligac
    packages/unstable/gmime2.2/debian/libgmime2.2a-cil.links
    packages/unstable/gmime2.2/debian/patches/gmime_sharp_signing_key.dpatch   (with props)
Removed:
    packages/unstable/gmime2.2/debian/libgmime2.2-cil.docs
    packages/unstable/gmime2.2/debian/libgmime2.2-cil.install
    packages/unstable/gmime2.2/debian/libgmime2.2-cil.installcligac
    packages/unstable/gmime2.2/debian/libgmime2.2-cil.links
Modified:
    packages/unstable/gmime2.2/debian/changelog
    packages/unstable/gmime2.2/debian/control
    packages/unstable/gmime2.2/debian/control.in
    packages/unstable/gmime2.2/debian/patches/00list
    packages/unstable/gmime2.2/debian/rules

Modified: packages/unstable/gmime2.2/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.2/debian/changelog?rev=18819&op=diff
==============================================================================
--- packages/unstable/gmime2.2/debian/changelog (original)
+++ packages/unstable/gmime2.2/debian/changelog Sat Mar  7 00:20:54 2009
@@ -1,8 +1,11 @@
-gmime2.2 (2.2.22-3) UNRELEASED; urgency=low
-
+gmime2.2 (2.2.22-3) unstable; urgency=low
+
+  [ Mirco Bauer ]
   * debian/control:
     + Debian GNOME Team adopts this package, updating Maintainer and Uploaders
       according to that. (Closes: #513428)
+    + Replaced mono-mcs and mono-gac build-deps with mono-devel >= 2.0 as part
+      of the Mono 2.0 transition.
   * debian/control
     debian/control.in:
     + Renamed control to control.in, control is generated by debian/rules.
@@ -11,8 +14,20 @@
     + Added Vcs-Browser and Vcs-Svn fields.
   * debian/rules:
     + Generate control in clean target using gnome-pkg-tools.
-
- -- Mirco Bauer <meebey at debian.org>  Thu, 19 Feb 2009 21:19:11 +0100
+  * debian/patches/gmime_sharp_signing_key.dpatch:
+    + Modified patch to sign assembly at compile stage using the
+      AssemblyKeyFile attribute.
+
+  [ Steve Langasek ]
+  * debian/rules: pass CSC=/usr/bin/csc to configure, for the mono 2.0
+    transition.
+  * debian/patches/gmime_sharp_signing_key.dpatch: new patch to pull in
+    the signing key from upstream 2.4, to allow the package to build
+    with current mono-devel; this implies an ABI change, so rename to
+    libgmime2.2a-cil.
+  * debian/control: build-depend on sharutils for the above patch.
+
+ -- Mirco Bauer <meebey at debian.org>  Sat, 07 Mar 2009 00:06:43 +0100
 
 gmime2.2 (2.2.22-2) unstable; urgency=low
 

Modified: packages/unstable/gmime2.2/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.2/debian/control?rev=18819&op=diff
==============================================================================
--- packages/unstable/gmime2.2/debian/control (original)
+++ packages/unstable/gmime2.2/debian/control Sat Mar  7 00:20:54 2009
@@ -3,8 +3,19 @@
 Priority: optional
 Maintainer: Mirco Bauer <meebey at debian.org>
 Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Build-Depends: debhelper (>> 4.0.0), gnome-pkg-tools (>= 0.10), libglib2.0-dev, autotools-dev, zlib1g-dev, dpatch, gtk-doc-tools (>= 1.8), docbook-utils
-Build-Depends-Indep: cli-common-dev (>= 0.4.4), mono-mcs, mono-gac, libgtk2.0-cil (>= 2.4.0), gtk-sharp2-gapi (>= 2.4.0)
+Build-Depends: debhelper (>> 4.0.0),
+ gnome-pkg-tools (>= 0.10),
+ libglib2.0-dev,
+ autotools-dev,
+ zlib1g-dev,
+ dpatch,
+ gtk-doc-tools (>= 1.8),
+ docbook-utils
+Build-Depends-Indep: cli-common-dev (>= 0.4.4),
+ mono-devel (>= 2.0),
+ libgtk2.0-cil (>= 2.4.0),
+ gtk-sharp2-gapi (>= 2.4.0),
+ sharutils
 Standards-Version: 3.8.0
 Homepage: http://spruce.sourceforge.net/gmime/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/packages/unstable/gmime2.2
@@ -40,7 +51,9 @@
  GMime is a set of utilities for parsing and creating messages using
  the Multipurpose Internet Mail Extension (MIME).
 
-Package: libgmime2.2-cil
+Package: libgmime2.2a-cil
+Replaces: libgmime2.2-cil
+Conflicts: libgmime2.2-cil
 Architecture: all
 Depends: ${shlibs:Depends}, ${cli:Depends}
 Description: CLI binding for the MIME library

Modified: packages/unstable/gmime2.2/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.2/debian/control.in?rev=18819&op=diff
==============================================================================
--- packages/unstable/gmime2.2/debian/control.in (original)
+++ packages/unstable/gmime2.2/debian/control.in Sat Mar  7 00:20:54 2009
@@ -3,8 +3,19 @@
 Priority: optional
 Maintainer: Mirco Bauer <meebey at debian.org>
 Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper (>> 4.0.0), gnome-pkg-tools (>= 0.10), libglib2.0-dev, autotools-dev, zlib1g-dev, dpatch, gtk-doc-tools (>= 1.8), docbook-utils
-Build-Depends-Indep: cli-common-dev (>= 0.4.4), mono-mcs, mono-gac, libgtk2.0-cil (>= 2.4.0), gtk-sharp2-gapi (>= 2.4.0)
+Build-Depends: debhelper (>> 4.0.0),
+ gnome-pkg-tools (>= 0.10),
+ libglib2.0-dev,
+ autotools-dev,
+ zlib1g-dev,
+ dpatch,
+ gtk-doc-tools (>= 1.8),
+ docbook-utils
+Build-Depends-Indep: cli-common-dev (>= 0.4.4),
+ mono-devel (>= 2.0),
+ libgtk2.0-cil (>= 2.4.0),
+ gtk-sharp2-gapi (>= 2.4.0),
+ sharutils
 Standards-Version: 3.8.0
 Homepage: http://spruce.sourceforge.net/gmime/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/packages/unstable/gmime2.2
@@ -40,7 +51,9 @@
  GMime is a set of utilities for parsing and creating messages using
  the Multipurpose Internet Mail Extension (MIME).
 
-Package: libgmime2.2-cil
+Package: libgmime2.2a-cil
+Replaces: libgmime2.2-cil
+Conflicts: libgmime2.2-cil
 Architecture: all
 Depends: ${shlibs:Depends}, ${cli:Depends}
 Description: CLI binding for the MIME library

Added: packages/unstable/gmime2.2/debian/gmime-sharp.snk.uu
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.2/debian/gmime-sharp.snk.uu?rev=18819&op=file
==============================================================================
--- packages/unstable/gmime2.2/debian/gmime-sharp.snk.uu (added)
+++ packages/unstable/gmime2.2/debian/gmime-sharp.snk.uu Sat Mar  7 00:20:54 2009
@@ -1,0 +1,17 @@
+begin 644 gmime-sharp.snk
+M!P(````D``!24T$R``0``!$````[K9_N#S+U/8\O%Z6@=_2GY]E&5/9ED;+4
+M_3IEYS\D;3S<5I5+Y42B,+\"/0\X-!#@*`X87T5QGVM*=^-Z;0#BFVX52POU
+MP2#9X3I6<'-Q!Z>74^C12LK!;E1$,XX`[.+:%7:3"4KP4='3 at TW:U7V3/YF=
+M+^E'R"#.A%%V(!09K[4`=K&*3WWQJD->HDR!3 at .0&^NJ_>M!('.>%LYZ=/8=
+MDR(+-GTMYOQ%(*20!M3I at S@I29>L8!>Y5KPWAH)Y$[HOW#)6\W86<'FD=3<"
+M[X-9$,8!S)_D_I+3/H\+U?`\\A\7->)`YE'4Z409]"UP1O*2<0LNLVHNB!ZM
+M=T-I at N7P,8CGB(+P=1#.7?[%[;4<`P`IOX*R=*=I>^^ZA60Q)`TAMT:<.93)
+ML133]%HS;3:+C^I3?[$/)9]1P'^K36,AK\5<>RVAS^F!T/VA(EM4\GFZ&'G`
+MDC*6Z(9P%`0><P;=H8#63X"-PAWIKLS[TV.@<\K<UJ:H)=3S-UM(D(ZU!55W
+MD80P7#DK'7C<M5ZE[<FXSG/[<SZA0C,A^[2Z1YM`(5P!\B!(QH51/@$#P;H_
+M;"N6L^TN.8E#@0,JAK^GR&"9`<+\R7ZM;?-A1I\I:-7>=&0;>JAJZ932YG0'
+M]:W4)WLP#!<=7[,QLVG%8YNV^Y=R-$$%\"Q)`.5',>S;C*`"JG*0!Z*I at U//
+M>1-@#Y'[&'O"<0YAE4<I"!AI8UU?+35N>LM'<!(+D<(KM%L;7"WP%;S;<[:[
++<PJ$#%RS&K&=S#T`
+`
+end

Added: packages/unstable/gmime2.2/debian/libgmime2.2a-cil.docs
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.2/debian/libgmime2.2a-cil.docs?rev=18819&op=file
==============================================================================
--- packages/unstable/gmime2.2/debian/libgmime2.2a-cil.docs (added)
+++ packages/unstable/gmime2.2/debian/libgmime2.2a-cil.docs Sat Mar  7 00:20:54 2009
@@ -1,0 +1,3 @@
+AUTHORS
+README
+TODO

Added: packages/unstable/gmime2.2/debian/libgmime2.2a-cil.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.2/debian/libgmime2.2a-cil.install?rev=18819&op=file
==============================================================================
--- packages/unstable/gmime2.2/debian/libgmime2.2a-cil.install (added)
+++ packages/unstable/gmime2.2/debian/libgmime2.2a-cil.install Sat Mar  7 00:20:54 2009
@@ -1,0 +1,3 @@
+usr/share/gapi-2.0
+usr/lib/pkgconfig/gmime-sharp-2.2.pc
+usr/lib/mono/gac/gmime-sharp/2.2*/* /usr/lib/cli/gmime-sharp-2.2

Added: packages/unstable/gmime2.2/debian/libgmime2.2a-cil.installcligac
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.2/debian/libgmime2.2a-cil.installcligac?rev=18819&op=file
==============================================================================
--- packages/unstable/gmime2.2/debian/libgmime2.2a-cil.installcligac (added)
+++ packages/unstable/gmime2.2/debian/libgmime2.2a-cil.installcligac Sat Mar  7 00:20:54 2009
@@ -1,0 +1,1 @@
+/usr/lib/cli/gmime-sharp-2.2/gmime-sharp.dll

Added: packages/unstable/gmime2.2/debian/libgmime2.2a-cil.links
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.2/debian/libgmime2.2a-cil.links?rev=18819&op=file
==============================================================================
--- packages/unstable/gmime2.2/debian/libgmime2.2a-cil.links (added)
+++ packages/unstable/gmime2.2/debian/libgmime2.2a-cil.links Sat Mar  7 00:20:54 2009
@@ -1,0 +1,1 @@
+usr/lib/pkgconfig/gmime-sharp-2.2.pc usr/lib/pkgconfig/gmime-sharp.pc

Modified: packages/unstable/gmime2.2/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.2/debian/patches/00list?rev=18819&op=diff
==============================================================================
--- packages/unstable/gmime2.2/debian/patches/00list (original)
+++ packages/unstable/gmime2.2/debian/patches/00list Sat Mar  7 00:20:54 2009
@@ -1,1 +1,2 @@
 gmime-sharp-pc.dpatch
+gmime_sharp_signing_key.dpatch

Added: packages/unstable/gmime2.2/debian/patches/gmime_sharp_signing_key.dpatch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.2/debian/patches/gmime_sharp_signing_key.dpatch?rev=18819&op=file
==============================================================================
--- packages/unstable/gmime2.2/debian/patches/gmime_sharp_signing_key.dpatch (added)
+++ packages/unstable/gmime2.2/debian/patches/gmime_sharp_signing_key.dpatch Sat Mar  7 00:20:54 2009
@@ -1,0 +1,17 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## gmime_sharp_signing_key.dpatch by Steve Langasek <vorlon at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad gmime-2.2.22~/mono/AssemblyInfo.cs.in gmime-2.2.22/mono/AssemblyInfo.cs.in
+--- gmime-2.2.22~/mono/AssemblyInfo.cs.in	2008-05-24 02:38:27.000000000 +0200
++++ gmime-2.2.22/mono/AssemblyInfo.cs.in	2009-03-07 00:20:03.000000000 +0100
+@@ -2,5 +2,4 @@
+ using System.Runtime.CompilerServices;
+ 
+ [assembly:AssemblyVersion("@API_VERSION@")]
+-[assembly:AssemblyDelaySign(true)]
+-[assembly:AssemblyKeyFile("@srcdir@/gmime-sharp.pub")]
++[assembly:AssemblyKeyFile("@top_srcdir@/debian/gmime-sharp.snk")]

Propchange: packages/unstable/gmime2.2/debian/patches/gmime_sharp_signing_key.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: packages/unstable/gmime2.2/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.2/debian/rules?rev=18819&op=diff
==============================================================================
--- packages/unstable/gmime2.2/debian/rules (original)
+++ packages/unstable/gmime2.2/debian/rules Sat Mar  7 00:20:54 2009
@@ -19,13 +19,16 @@
 configure-stamp: patch
 	dh_testdir
 	
-	./configure --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --enable-gtk-doc --disable-rpath --enable-largefile --enable-rfc2047-workarounds
+	./configure --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --enable-gtk-doc --disable-rpath --enable-largefile --enable-rfc2047-workarounds CSC=/usr/bin/csc
 
 	touch configure-stamp
 
 build: build-stamp
 build-stamp: configure
 	dh_testdir
+
+	# unpack signing key
+	cd debian && uudecode < gmime-sharp.snk.uu
 
 	$(MAKE)
 
@@ -38,7 +41,7 @@
 
 	[ ! -f Makefile ] || $(MAKE) -C docs/reference maintainer-clean-local
 	[ ! -f Makefile ] || $(MAKE) distclean
-	rm -rf .wapi libgmime gmime.h libgmime.spec
+	rm -rf .wapi libgmime gmime.h libgmime.spec debian/gmime-sharp.snk
 
 	dh_clean
 	rm -rf debian/patched

More information about the pkg-gnome-commits mailing list