[Pkg-cli-libs-commits] r3604 - in /packages/evolution-sharp/trunk/debian: changelog compat control copyright dirs install links patches/evolution-sharp.pc.dpatch patches/fix-dllmappings.dpatch rules

meebey at users.alioth.debian.org meebey at users.alioth.debian.org
Sun Feb 24 20:28:57 UTC 2008 

Author: meebey
Date: Sun Feb 24 20:28:56 2008
New Revision: 3604

URL: http://svn.debian.org/wsvn/pkg-cli-libs/?sc=1&rev=3604
Log:
evolution-sharp love


Added:
    packages/evolution-sharp/trunk/debian/links
Removed:
    packages/evolution-sharp/trunk/debian/dirs
Modified:
    packages/evolution-sharp/trunk/debian/changelog
    packages/evolution-sharp/trunk/debian/compat
    packages/evolution-sharp/trunk/debian/control
    packages/evolution-sharp/trunk/debian/copyright
    packages/evolution-sharp/trunk/debian/install
    packages/evolution-sharp/trunk/debian/patches/evolution-sharp.pc.dpatch
    packages/evolution-sharp/trunk/debian/patches/fix-dllmappings.dpatch
    packages/evolution-sharp/trunk/debian/rules

Modified: packages/evolution-sharp/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/evolution-sharp/trunk/debian/changelog?rev=3604&op=diff
==============================================================================
--- packages/evolution-sharp/trunk/debian/changelog (original)
+++ packages/evolution-sharp/trunk/debian/changelog Sun Feb 24 20:28:56 2008
@@ -1,3 +1,25 @@
+evolution-sharp (0.14.0.1-2~pre1) unstable; urgency=low
+
+  * debian/control:
+    + Updated evolution-data-server-dev build-dependency to >= 1.8.
+      (Closes: #425396)
+    + Updated debhelper build-dependency to >= 5.
+    + Updated cli-common-dev build-dependency to >= 0.5.4
+      (needed for dh_clistrip).
+    + Bumped Standards-Version to 3.7.3 (no changes needed).
+    + Added Vcs-Browser field.
+    + Renamed XS-X-Vcs-Svn to Vcs-Svn.
+  * debian/patches/fix-dllmappings.dpatch:
+    + Added mappings for glibsharpglue-2 and gobject-2.0.    
+  * debian/rules:
+    + Replaced debug symbol removal code with dh_clistrip.
+    + Handle ABI and API versions here now instead of hardcoding the versions
+      everywhere (install, installcligac, links, dpatches).
+  * debian/compat:
+    + Updated to 5.
+
+ -- Mirco Bauer <meebey at debian.org>  Sun, 13 Jan 2008 12:53:27 +0100
+
 evolution-sharp (0.14.0.1-1) unstable; urgency=medium
 
   * New upstream release

Modified: packages/evolution-sharp/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/evolution-sharp/trunk/debian/compat?rev=3604&op=diff
==============================================================================
--- packages/evolution-sharp/trunk/debian/compat (original)
+++ packages/evolution-sharp/trunk/debian/compat Sun Feb 24 20:28:56 2008
@@ -1,1 +1,1 @@
-4
+5

Modified: packages/evolution-sharp/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/evolution-sharp/trunk/debian/control?rev=3604&op=diff
==============================================================================
--- packages/evolution-sharp/trunk/debian/control (original)
+++ packages/evolution-sharp/trunk/debian/control Sun Feb 24 20:28:56 2008
@@ -3,9 +3,10 @@
 Priority: optional
 Maintainer: Debian CLI Libraries Team <pkg-cli-libs-team at lists.alioth.debian.org>
 Uploaders: Jose Carlos Garcia Sogo <jsogo at debian.org>, Mirco Bauer <meebey at debian.org>
-Build-Depends: debhelper (>= 4.0.0), dpatch, libgtk2.0-dev (>= 2.0.0), libgnome2.0-cil, gtk-sharp2-gapi, evolution-dev (>= 2.6.0), evolution-data-server-dev (>= 1.6.1), libecal1.2-dev, libebook1.2-dev, cli-common-dev (>= 0.4.4), mono-mcs | c-sharp-compiler, libmono-dev (>= 1.0)
-Standards-Version: 3.7.2
-XS-X-Vcs-Svn: svn://svn.debian.org/svn/pkg-mono/evolution-sharp/trunk
+Build-Depends: debhelper (>= 5), dpatch, cli-common-dev (>= 0.5.4), libgtk2.0-dev (>= 2.0.0), libgnome2.0-cil, gtk-sharp2-gapi, evolution-dev (>= 2.6.0), evolution-data-server-dev (>= 1.8), libecal1.2-dev, libebook1.2-dev, mono-mcs | c-sharp-compiler, libmono-dev (>= 1.0)
+Standards-Version: 3.7.3
+Vcs-Svn: svn://svn.debian.org/svn/pkg-cli-libs/packages/evolution-sharp/trunk
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-cli-libs/packages/evolution-sharp/trunk/
 
 Package: libevolution3.0-cil
 Architecture: any

Modified: packages/evolution-sharp/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/evolution-sharp/trunk/debian/copyright?rev=3604&op=diff
==============================================================================
--- packages/evolution-sharp/trunk/debian/copyright (original)
+++ packages/evolution-sharp/trunk/debian/copyright Sun Feb 24 20:28:56 2008
@@ -5,10 +5,28 @@
 
 It was downloaded from http://ftp.gnome.org/pub/GNOME/sources/evolution-sharp/
 
-Copyright: Mike Kestner <mkestner at ximian.com>
+Copyright:
+Copyright (C) 2003-2006 Novell, Inc.
 
-Upstream Author: Mike Kestner <mkestner at ximian.com>
+Upstream Authors:
+Mike Kestner            <mkestner at ximian.com>
+Joe Shaw                <joeshaw at novell.com>
+Veerapuram Varadhan     <vvaradhan at novell.com>
 
 License:
-This package is licensed under GPL v2 or later.
-See /usr/share/common-licenses/GPL on your Debian system.
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of version 2 of the GNU General Public
+ License as published by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public
+ License along with this program; if not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+
+Full text of the GPL-2 license may be found at
+/usr/share/common-licenses/GPL-2.

Modified: packages/evolution-sharp/trunk/debian/install
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/evolution-sharp/trunk/debian/install?rev=3604&op=diff
==============================================================================
--- packages/evolution-sharp/trunk/debian/install (original)
+++ packages/evolution-sharp/trunk/debian/install Sun Feb 24 20:28:56 2008
@@ -1,4 +1,4 @@
-usr/lib/mono/gac/evolution-sharp/3.0.0.*/* /usr/lib/cli/evolution-sharp-3.0
-usr/lib/pkgconfig/evolution-sharp.pc
-usr/lib/*.so /usr/lib/cli/evolution-sharp-3.0
-usr/share/gapi-2.0 /usr/share
+usr/lib/mono/gac/evolution-sharp/#DEB_CLI_ABI_VERSION#.*/*	/usr/lib/cli/evolution-sharp-#DEB_CLI_ABI_VERSION#/
+usr/lib/*.so							/usr/lib/cli/evolution-sharp-#DEB_CLI_ABI_VERSION#/
+usr/lib/pkgconfig/
+usr/share/gapi-2.0/

Added: packages/evolution-sharp/trunk/debian/links
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/evolution-sharp/trunk/debian/links?rev=3604&op=file
==============================================================================
--- packages/evolution-sharp/trunk/debian/links (added)
+++ packages/evolution-sharp/trunk/debian/links Sun Feb 24 20:28:56 2008
@@ -1,0 +1,1 @@
+usr/lib/pkgconfig/evolution-sharp-#DEB_CLI_ABI_VERSION#.pc	/usr/lib/pkgconfig/evolution-sharp.pc

Modified: packages/evolution-sharp/trunk/debian/patches/evolution-sharp.pc.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/evolution-sharp/trunk/debian/patches/evolution-sharp.pc.dpatch?rev=3604&op=diff
==============================================================================
--- packages/evolution-sharp/trunk/debian/patches/evolution-sharp.pc.dpatch (original)
+++ packages/evolution-sharp/trunk/debian/patches/evolution-sharp.pc.dpatch Sun Feb 24 20:28:56 2008
@@ -13,4 +13,4 @@
  Description: Evolution# - Evolution .NET Binding
  Version: @VERSION@
 -Libs: -r:${libdir}/mono/evolution-sharp/evolution-sharp.dll
-+Libs: -r:${libdir}/cli/evolution-sharp-3.0/evolution-sharp.dll
++Libs: -r:${libdir}/cli/evolution-sharp-#DEB_CLI_ABI_VERSION#/evolution-sharp.dll

Modified: packages/evolution-sharp/trunk/debian/patches/fix-dllmappings.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/evolution-sharp/trunk/debian/patches/fix-dllmappings.dpatch?rev=3604&op=diff
==============================================================================
--- packages/evolution-sharp/trunk/debian/patches/fix-dllmappings.dpatch (original)
+++ packages/evolution-sharp/trunk/debian/patches/fix-dllmappings.dpatch Sun Feb 24 20:28:56 2008
@@ -5,12 +5,14 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad evolution-sharp-0.11.1~/evolution/evolution-sharp.dll.config.in evolution-sharp-0.11.1/evolution/evolution-sharp.dll.config.in
---- evolution-sharp-0.11.1~/evolution/evolution-sharp.dll.config.in	2005-07-20 18:52:55.000000000 +0200
-+++ evolution-sharp-0.11.1/evolution/evolution-sharp.dll.config.in	2006-11-04 10:27:53.000000000 +0100
-@@ -2,4 +2,5 @@
+diff -urNad evolution-sharp-0.14.0.1~/evolution/evolution-sharp.dll.config.in evolution-sharp-0.14.0.1/evolution/evolution-sharp.dll.config.in
+--- evolution-sharp-0.14.0.1~/evolution/evolution-sharp.dll.config.in	2008-01-13 13:39:21.000000000 +0100
++++ evolution-sharp-0.14.0.1/evolution/evolution-sharp.dll.config.in	2008-01-13 13:42:02.000000000 +0100
+@@ -2,4 +2,7 @@
    <dllmap dll="ebook" target="libebook at EDS_VERSION@@LIB_PREFIX at .@EBOOK_SOVERSION@@LIB_SUFFIX@"/>
    <dllmap dll="ecal" target="libecal at EDS_VERSION@@LIB_PREFIX at .@ECAL_SOVERSION@@LIB_SUFFIX@"/>
    <dllmap dll="edataserver" target="libedataserver at EDS_VERSION@@LIB_PREFIX at .@EDS_SOVERSION@@LIB_SUFFIX@"/>
-+  <dllmap dll="evolutionglue" target="/usr/lib/cli/evolution-sharp-3.0/libevolutionglue.so"/>
++  <dllmap dll="evolutionglue" target="/usr/lib/cli/evolution-sharp-#DEB_CLI_ABI_VERSION#/libevolutionglue.so"/>
++  <dllmap dll="glibsharpglue-2" target="/usr/lib/mono/gtk-sharp-2.0/libglibsharpglue-2.so"/>
++  <dllmap dll="gobject-2.0" target="libgobject-2.0.so.0"/>
  </configuration>

Modified: packages/evolution-sharp/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/evolution-sharp/trunk/debian/rules?rev=3604&op=diff
==============================================================================
--- packages/evolution-sharp/trunk/debian/rules (original)
+++ packages/evolution-sharp/trunk/debian/rules Sun Feb 24 20:28:56 2008
@@ -1,14 +1,16 @@
 #!/usr/bin/make -f
 
-# Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
+
+DEB_CLI_ABI_VERSION = 3.0
+DEB_CLI_API_VERSION = 0.14.0.1
+
 export MONO_SHARED_DIR=$(CURDIR)
-EVO_LIB_PATH = usr/lib/cli/evolution-sharp-3.0
 
 include /usr/share/dpatch/dpatch.make
 
 configure: configure-stamp
-configure-stamp: patch
+configure-stamp: patch-stamp
 	dh_testdir
 	./configure --prefix=/usr
 	touch configure-stamp
@@ -34,30 +36,36 @@
 	dh_clean -k 
 	dh_installdirs
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+	mv $(CURDIR)/debian/tmp/usr/lib/pkgconfig/evolution-sharp.pc \
+	   $(CURDIR)/debian/tmp/usr/lib/pkgconfig/evolution-sharp-$(DEB_CLI_ABI_VERSION).pc
+	perl -pe 's/#DEB_CLI_ABI_VERSION#/$(DEB_CLI_ABI_VERSION)/' -i \
+	  $(CURDIR)/debian/links \
+	  $(CURDIR)/debian/install \
+	  $(CURDIR)/debian/installcligac \
+	  $(CURDIR)/debian/tmp/usr/lib/pkgconfig/evolution-sharp-$(DEB_CLI_ABI_VERSION).pc \
+	  $(CURDIR)/debian/tmp/usr/lib/mono/gac/evolution-sharp/*/evolution-sharp.dll.config
 
 binary-arch: build install
 	dh_testdir
 	dh_testroot
-	dh_install --sourcedir=debian/tmp
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	find debian/ -type f -name "*.mdb" -delete
-endif
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-	dh_installman
-	dh_installcligac
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_clifixperms
-	dh_makeclilibs -V
-	dh_installdeb
-	dh_shlibdeps
-	dh_clideps -d
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+	dh_install -s --sourcedir=debian/tmp
+	dh_installchangelogs -s ChangeLog
+	dh_installdocs -s
+	dh_installman -s
+	dh_installcligac -s
+	dh_link -s
+	dh_strip -s
+	dh_clistrip -s
+	dh_compress -s
+	dh_fixperms -s
+	dh_clifixperms -s
+	dh_makeclilibs -s -m $(DEB_CLI_API_VERSION)
+	dh_installdeb -s
+	dh_shlibdeps -s
+	dh_clideps -s -d
+	dh_gencontrol -s
+	dh_md5sums -s
+	dh_builddebs -s
 
 binary: binary-arch
 .PHONY: build clean binary-arch binary install configure

More information about the Pkg-cli-libs-commits mailing list