[Pkg-mono-svn-commits] rev 2641 - in gsf-sharp/trunk/debian: . patches

Jose Carlos Garcia Sogo jsogo at costa.debian.org
Sun Jul 30 10:11:54 UTC 2006 

Author: jsogo
Date: 2006-07-30 10:11:53 +0000 (Sun, 30 Jul 2006)
New Revision: 2641

Added:
   gsf-sharp/trunk/debian/dirs
   gsf-sharp/trunk/debian/libgsf0.0-cil.install
   gsf-sharp/trunk/debian/libgsf0.0-cil.installcligac
   gsf-sharp/trunk/debian/patches/01_dllmap.patch
   gsf-sharp/trunk/debian/patches/02_pkgconfig.patch
Removed:
   gsf-sharp/trunk/debian/patches/01_gsf114.diff
Modified:
   gsf-sharp/trunk/debian/changelog
   gsf-sharp/trunk/debian/control
   gsf-sharp/trunk/debian/rules
Log:
Gsf-sharp 0.8-1
 + New upstream version (first in Debian)
 + Import Ubuntu packages
 + Fix debian/copyright file
 + Install stuff in /usr/lib/cli/gsf-sharp-0.0, following policy



Modified: gsf-sharp/trunk/debian/changelog
===================================================================
--- gsf-sharp/trunk/debian/changelog	2006-07-28 00:04:31 UTC (rev 2640)
+++ gsf-sharp/trunk/debian/changelog	2006-07-30 10:11:53 UTC (rev 2641)
@@ -1,3 +1,20 @@
+gsf-sharp (0.8-1) unstable; urgency=low
+
+  * Upload gsf-sharp back to Debian (Closes: #378445)
+  * Fix debian/copyright file: list actual authors, set copyright field and
+  software license is LGPL-2.1
+  * Change .NET for CLI in package description, following policy.
+  * Install .dll and other related stuff in /usr/lib/cli/gsf-sharp-0.0
+
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org>  Sun, 30 Jul 2006 12:10:21 +0200
+
+gsf-sharp (0.8-0ubuntu1) edgy; urgency=low
+
+  * New upstream release
+  * Transitioned to the new CLI Policy
+
+ -- Sebastian Dröge <slomo at ubuntu.com>  Sat, 29 Jul 2006 16:32:32 +0200
+
 gsf-sharp (0.7-0ubuntu2) edgy; urgency=low
 
   * debian/patches/01_gsf114.diff:

Modified: gsf-sharp/trunk/debian/control
===================================================================
--- gsf-sharp/trunk/debian/control	2006-07-28 00:04:31 UTC (rev 2640)
+++ gsf-sharp/trunk/debian/control	2006-07-30 10:11:53 UTC (rev 2641)
@@ -1,12 +1,11 @@
 Source: gsf-sharp
 Section: libs
 Priority: optional
-Maintainer: Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>
-Uploaders: Jose Carlos Garcia Sogo <jsogo at debian.org>
-Build-Depends: cdbs, debhelper (>= 5), mono-mcs (>= 1.0) | c-sharp-compiler, mono-jit, libmono-dev, mono-utils (>= 0.96), mono-gac, libgsf-1-dev, libgsf-gnome-1-dev, libgtk2.0-cil, libglib2.0-cil, gtk-sharp2-gapi, cli-common-dev (>= 0.4.1), pkg-config, libbonobo2-dev, libgnomevfs2-dev
+Maintainer: Chris Scheib <chris at schweeb.org>
+Build-Depends: cdbs, debhelper (>= 5), mono-mcs (>= 1.0) | c-sharp-compiler, mono-jit, libmono-dev, mono-utils (>= 0.96), mono-gac, libgsf-1-dev, libgsf-gnome-1-dev, libgtk2.0-cil, libglib2.0-cil, gtk-sharp2-gapi, cli-common-dev (>= 0.4.0), pkg-config, libbonobo2-dev, libgnomevfs2-dev
 Standards-Version: 3.7.2
 
-Package: libgsf-cil
+Package: libgsf0.0-cil
 Architecture: any
 Depends: ${shlibs:Depends}, ${cli:Depends}
 Description: CLI bindings for libgsf

Added: gsf-sharp/trunk/debian/dirs
===================================================================
--- gsf-sharp/trunk/debian/dirs	2006-07-28 00:04:31 UTC (rev 2640)
+++ gsf-sharp/trunk/debian/dirs	2006-07-30 10:11:53 UTC (rev 2641)
@@ -0,0 +1 @@
+usr/lib/cli/gsf-sharp-0.0

Added: gsf-sharp/trunk/debian/libgsf0.0-cil.install
===================================================================
--- gsf-sharp/trunk/debian/libgsf0.0-cil.install	2006-07-28 00:04:31 UTC (rev 2640)
+++ gsf-sharp/trunk/debian/libgsf0.0-cil.install	2006-07-30 10:11:53 UTC (rev 2641)
@@ -0,0 +1,5 @@
+gsf/gsf-sharp.dll /usr/lib/cli/gsf-sharp-0.0
+gsf/gsf-sharp.dll.config /usr/lib/cli/gsf-sharp-0.0
+debian/tmp/usr/lib/libgsfglue.so /usr/lib/cli/gsf-sharp-0.0
+debian/tmp/usr/lib/pkgconfig
+debian/tmp/usr/share

Added: gsf-sharp/trunk/debian/libgsf0.0-cil.installcligac
===================================================================
--- gsf-sharp/trunk/debian/libgsf0.0-cil.installcligac	2006-07-28 00:04:31 UTC (rev 2640)
+++ gsf-sharp/trunk/debian/libgsf0.0-cil.installcligac	2006-07-30 10:11:53 UTC (rev 2641)
@@ -0,0 +1 @@
+/usr/lib/cli/gsf-sharp-0.0/gsf-sharp.dll

Added: gsf-sharp/trunk/debian/patches/01_dllmap.patch
===================================================================
--- gsf-sharp/trunk/debian/patches/01_dllmap.patch	2006-07-28 00:04:31 UTC (rev 2640)
+++ gsf-sharp/trunk/debian/patches/01_dllmap.patch	2006-07-30 10:11:53 UTC (rev 2641)
@@ -0,0 +1,9 @@
+--- gsf/gsf-sharp.dll.config.in.old	2006-07-29 16:41:41.906226750 +0200
++++ gsf/gsf-sharp.dll.config.in	2006-07-29 16:43:57.298688250 +0200
+@@ -1,3 +1,5 @@
+ <configuration>
+-  <dllmap dll="libgsf-1.dll" target="libgsf-1 at LIB_PREFIX@. at GSF_SO_VERSION@@LIB_SUFFIX@"/>
++  <dllmap dll="libgsf-1.dll" target="libgsf-1 at LIB_PREFIX@. at GSF_SO_VERSION@@LIB_SUFFIX@" />
++  <dllmap dll="libgsfglue" target="/usr/lib/cli/gsf-sharp-0.0/libgsfglue.so" />
++  <dllmap dll="glibsharpglue-2" target="/usr/lib/mono/gtk-sharp-2.0/libglibsharpglue-2.so" />
+ </configuration>

Deleted: gsf-sharp/trunk/debian/patches/01_gsf114.diff
===================================================================
--- gsf-sharp/trunk/debian/patches/01_gsf114.diff	2006-07-28 00:04:31 UTC (rev 2640)
+++ gsf-sharp/trunk/debian/patches/01_gsf114.diff	2006-07-30 10:11:53 UTC (rev 2641)
@@ -1,84 +0,0 @@
---- configure.in.old	2006-07-04 22:11:37.485953000 +0200
-+++ configure.in	2006-07-04 22:13:05.359444750 +0200
-@@ -49,14 +49,14 @@
- AC_SUBST(GTK_SHARP_CFLAGS)
- AC_SUBST(GTK_SHARP_LIBS)
- 
--PKG_CHECK_MODULES(GSF, libgsf-1 >= 1.13 libgsf-1 < 1.14 libgsf-gnome-1 >= 1.13 libgsf-gnome-1 < 1.14)
-+PKG_CHECK_MODULES(GSF, libgsf-1 >= 1.14 libgsf-1 < 1.15 libgsf-gnome-1 >= 1.14 libgsf-gnome-1 < 1.15)
- AC_SUBST(GSF_CFLAGS)
- AC_SUBST(GSF_LIBS)
- gsf_prefix=`pkg-config --variable=prefix libgsf-1`
- AC_SUBST(gsf_prefix)
- 
- dnl Remember to update this when it changes!
--GSF_SO_VERSION=113
-+GSF_SO_VERSION=114
- AC_SUBST(GSF_SO_VERSION)
- 
- AC_PATH_PROG(GAPI_FIXUP, gapi2-fixup, no)
---- configure.old	2006-07-04 22:11:40.414136000 +0200
-+++ configure	2006-07-04 22:15:37.620960500 +0200
-@@ -20249,12 +20249,12 @@
- 
- if test -n "$PKG_CONFIG"; then
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgsf-1 >= 1.13 libgsf-1 < 1.14 libgsf-gnome-1 >= 1.13 libgsf-gnome-1 < 1.14\"") >&5
--  ($PKG_CONFIG --exists --print-errors "libgsf-1 >= 1.13 libgsf-1 < 1.14 libgsf-gnome-1 >= 1.13 libgsf-gnome-1 < 1.14") 2>&5
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgsf-1 >= 1.14 libgsf-1 < 1.15 libgsf-gnome-1 >= 1.14 libgsf-gnome-1 < 1.15\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "libgsf-1 >= 1.14 libgsf-1 < 1.15 libgsf-gnome-1 >= 1.14 libgsf-gnome-1 < 1.15") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--  pkg_cv_GSF_CFLAGS=`$PKG_CONFIG --cflags "libgsf-1 >= 1.13 libgsf-1 < 1.14 libgsf-gnome-1 >= 1.13 libgsf-gnome-1 < 1.14" 2>/dev/null`
-+  pkg_cv_GSF_CFLAGS=`$PKG_CONFIG --cflags "libgsf-1 >= 1.14 libgsf-1 < 1.15 libgsf-gnome-1 >= 1.14 libgsf-gnome-1 < 1.15" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -20263,12 +20263,12 @@
- fi
- if test -n "$PKG_CONFIG"; then
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgsf-1 >= 1.13 libgsf-1 < 1.14 libgsf-gnome-1 >= 1.13 libgsf-gnome-1 < 1.14\"") >&5
--  ($PKG_CONFIG --exists --print-errors "libgsf-1 >= 1.13 libgsf-1 < 1.14 libgsf-gnome-1 >= 1.13 libgsf-gnome-1 < 1.14") 2>&5
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgsf-1 >= 1.14 libgsf-1 < 1.15 libgsf-gnome-1 >= 1.14 libgsf-gnome-1 < 1.15\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "libgsf-1 >= 1.14 libgsf-1 < 1.15 libgsf-gnome-1 >= 1.14 libgsf-gnome-1 < 1.15") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--  pkg_cv_GSF_LIBS=`$PKG_CONFIG --libs "libgsf-1 >= 1.13 libgsf-1 < 1.14 libgsf-gnome-1 >= 1.13 libgsf-gnome-1 < 1.14" 2>/dev/null`
-+  pkg_cv_GSF_LIBS=`$PKG_CONFIG --libs "libgsf-1 >= 1.14 libgsf-1 < 1.15 libgsf-gnome-1 >= 1.14 libgsf-gnome-1 < 1.15" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -20277,18 +20277,18 @@
- fi
- 
- if test $pkg_failed = yes; then
--	GSF_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgsf-1 >= 1.13 libgsf-1 < 1.14 libgsf-gnome-1 >= 1.13 libgsf-gnome-1 < 1.14"`
-+	GSF_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgsf-1 >= 1.14 libgsf-1 < 1.15 libgsf-gnome-1 >= 1.14 libgsf-gnome-1 < 1.15"`
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$GSF_PKG_ERRORS" 1>&5
- 
--	{ { echo "$as_me:$LINENO: error: Package requirements (libgsf-1 >= 1.13 libgsf-1 < 1.14 libgsf-gnome-1 >= 1.13 libgsf-gnome-1 < 1.14) were not met.
-+	{ { echo "$as_me:$LINENO: error: Package requirements (libgsf-1 >= 1.14 libgsf-1 < 1.15 libgsf-gnome-1 >= 1.14 libgsf-gnome-1 < 1.15) were not met.
- Consider adjusting the PKG_CONFIG_PATH environment variable if you
- installed software in a non-standard prefix.
- 
- Alternatively you may set the GSF_CFLAGS and GSF_LIBS environment variables
- to avoid the need to call pkg-config.  See the pkg-config man page for
- more details." >&5
--echo "$as_me: error: Package requirements (libgsf-1 >= 1.13 libgsf-1 < 1.14 libgsf-gnome-1 >= 1.13 libgsf-gnome-1 < 1.14) were not met.
-+echo "$as_me: error: Package requirements (libgsf-1 >= 1.14 libgsf-1 < 1.15 libgsf-gnome-1 >= 1.14 libgsf-gnome-1 < 1.15) were not met.
- Consider adjusting the PKG_CONFIG_PATH environment variable if you
- installed software in a non-standard prefix.
- 
-@@ -20330,7 +20330,7 @@
- gsf_prefix=`pkg-config --variable=prefix libgsf-1`
- 
- 
--GSF_SO_VERSION=113
-+GSF_SO_VERSION=114
- 
- 
- # Extract the first word of "gapi2-fixup", so it can be a program name with args.

Added: gsf-sharp/trunk/debian/patches/02_pkgconfig.patch
===================================================================
--- gsf-sharp/trunk/debian/patches/02_pkgconfig.patch	2006-07-28 00:04:31 UTC (rev 2640)
+++ gsf-sharp/trunk/debian/patches/02_pkgconfig.patch	2006-07-30 10:11:53 UTC (rev 2641)
@@ -0,0 +1,8 @@
+--- gsf-sharp.pc.in.old	2006-07-29 16:57:00.379627750 +0200
++++ gsf-sharp.pc.in	2006-07-29 16:57:09.224180500 +0200
+@@ -6,4 +6,4 @@
+ Name: Gsf#
+ Description: Gsf# - libgsf .NET Binding
+ Version: @VERSION@
+-Libs: -r:${libdir}/mono/gtk-sharp/gsf-sharp.dll
++Libs: -r:${libdir}/cli/gsf-sharp-0.0/gsf-sharp.dll

Modified: gsf-sharp/trunk/debian/rules
===================================================================
--- gsf-sharp/trunk/debian/rules	2006-07-28 00:04:31 UTC (rev 2640)
+++ gsf-sharp/trunk/debian/rules	2006-07-30 10:11:53 UTC (rev 2641)
@@ -5,15 +5,20 @@
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
+DEB_DESTDIR = $(CURDIR)/debian/tmp
+
 export MONO_SHARED_DIR = $(CURDIR)
 
 clean::
 	rm -rf $(MONO_SHARED_DIR)/.wapi
 
-binary-install/libgsf-cil::
+common-binary-predeb-arch::
 	dh_makeclilibs -V
 	dh_clideps -d
 
-binary-predeb/libgsf-cil::
+binary-post-install/libgsf0.0-cil::
+	dh_installcligac -plibgsf0.0-cil
+
+binary-predeb/libgsf0.0-cil::
 	# fix permissions on DLLs for lintian 
 	cd $(CURDIR)/debian && find . -type f -name "*.dll" -or -name "*.cs" | xargs chmod -x

More information about the Pkg-mono-svn-commits mailing list