[Pkg-mono-svn-commits] rev 1579 - gtk-sharp2/trunk/debian

Mirco Bauer meebey-guest@costa.debian.org
Sun, 10 Apr 2005 10:48:44 +0000


Author: meebey-guest
Date: 2005-04-10 10:48:44 +0000 (Sun, 10 Apr 2005)
New Revision: 1579

Modified:
   gtk-sharp2/trunk/debian/libgconf2.0-cil.install
   gtk-sharp2/trunk/debian/libglade2.0-cil.install
   gtk-sharp2/trunk/debian/libglib2.0-cil.install
   gtk-sharp2/trunk/debian/libgnome2.0-cil.install
   gtk-sharp2/trunk/debian/libgtk2.0-cil.install
   gtk-sharp2/trunk/debian/list-examples
   gtk-sharp2/trunk/debian/rules
Log:
- sync with gtk-sharp/trunk.



Modified: gtk-sharp2/trunk/debian/libgconf2.0-cil.install
===================================================================
--- gtk-sharp2/trunk/debian/libgconf2.0-cil.install	2005-04-10 10:39:27 UTC (rev 1578)
+++ gtk-sharp2/trunk/debian/libgconf2.0-cil.install	2005-04-10 10:48:44 UTC (rev 1579)
@@ -1,3 +1,4 @@
 debian/tmp/usr/lib/mono/gac/gconf-sharp/
 debian/tmp/usr/lib/gtk-sharp-2.0/gconfsharp-schemagen.exe
 debian/tmp/usr/lib/pkgconfig/gconf-sharp-2.0.pc
+debian/tmp/usr/lib/mono/gtk-sharp/gconf-sharp.dll

Modified: gtk-sharp2/trunk/debian/libglade2.0-cil.install
===================================================================
--- gtk-sharp2/trunk/debian/libglade2.0-cil.install	2005-04-10 10:39:27 UTC (rev 1578)
+++ gtk-sharp2/trunk/debian/libglade2.0-cil.install	2005-04-10 10:48:44 UTC (rev 1579)
@@ -1,3 +1,4 @@
 debian/tmp/usr/lib/mono/gac/glade-sharp/
 debian/tmp/usr/lib/pkgconfig/glade-sharp-2.0.pc
 debian/tmp/usr/lib/libgladesharpglue-2.so
+debian/tmp/usr/lib/mono/gtk-sharp/glade-sharp.dll

Modified: gtk-sharp2/trunk/debian/libglib2.0-cil.install
===================================================================
--- gtk-sharp2/trunk/debian/libglib2.0-cil.install	2005-04-10 10:39:27 UTC (rev 1578)
+++ gtk-sharp2/trunk/debian/libglib2.0-cil.install	2005-04-10 10:48:44 UTC (rev 1579)
@@ -1,2 +1,3 @@
 debian/tmp/usr/lib/mono/gac/glib-sharp/
 debian/tmp/usr/lib/libglibsharpglue-2.so
+debian/tmp/usr/lib/mono/gtk-sharp/glib-sharp.dll

Modified: gtk-sharp2/trunk/debian/libgnome2.0-cil.install
===================================================================
--- gtk-sharp2/trunk/debian/libgnome2.0-cil.install	2005-04-10 10:39:27 UTC (rev 1578)
+++ gtk-sharp2/trunk/debian/libgnome2.0-cil.install	2005-04-10 10:48:44 UTC (rev 1579)
@@ -14,3 +14,10 @@
 debian/tmp/usr/lib/pkgconfig/rsvg-sharp-2.0.pc
 debian/tmp/usr/lib/pkgconfig/gnomedb-sharp-2.0.pc
 debian/tmp/usr/lib/pkgconfig/gtkhtml-sharp-2.0.pc
+debian/tmp/usr/lib/mono/gtk-sharp/gnome-sharp.dll
+debian/tmp/usr/lib/mono/gtk-sharp/art-sharp.dll
+debian/tmp/usr/lib/mono/gtk-sharp/gtkhtml-sharp.dll
+debian/tmp/usr/lib/mono/gtk-sharp/gda-sharp.dll
+debian/tmp/usr/lib/mono/gtk-sharp/gnomedb-sharp.dll
+debian/tmp/usr/lib/mono/gtk-sharp/rsvg-sharp.dll
+debian/tmp/usr/lib/mono/gtk-sharp/gconf-sharp-peditors.dll

Modified: gtk-sharp2/trunk/debian/libgtk2.0-cil.install
===================================================================
--- gtk-sharp2/trunk/debian/libgtk2.0-cil.install	2005-04-10 10:39:27 UTC (rev 1578)
+++ gtk-sharp2/trunk/debian/libgtk2.0-cil.install	2005-04-10 10:48:44 UTC (rev 1579)
@@ -5,3 +5,8 @@
 debian/tmp/usr/lib/libgtksharpglue-2.so
 debian/tmp/usr/lib/libgdksharpglue-2.so
 debian/tmp/usr/lib/pkgconfig/gtk-sharp-2.0.pc
+debian/tmp/usr/lib/mono/gtk-sharp/gtk-sharp.dll
+debian/tmp/usr/lib/mono/gtk-sharp/gdk-sharp.dll
+debian/tmp/usr/lib/mono/gtk-sharp/atk-sharp.dll
+debian/tmp/usr/lib/mono/gtk-sharp/pango-sharp.dll
+debian/tmp/usr/lib/mono/gtk-sharp/vte-sharp.dll

Modified: gtk-sharp2/trunk/debian/list-examples
===================================================================
--- gtk-sharp2/trunk/debian/list-examples	2005-04-10 10:39:27 UTC (rev 1578)
+++ gtk-sharp2/trunk/debian/list-examples	2005-04-10 10:48:44 UTC (rev 1579)
@@ -1,4 +1,4 @@
 #!/bin/sh
 echo 'The following Gtk# examples (with source) are available:'
 echo
-ls /usr/lib/gtk-sharp2-unstable-examples/*.exe
+ls /usr/share/gtk-sharp2-unstable-examples/*.exe

Modified: gtk-sharp2/trunk/debian/rules
===================================================================
--- gtk-sharp2/trunk/debian/rules	2005-04-10 10:39:27 UTC (rev 1578)
+++ gtk-sharp2/trunk/debian/rules	2005-04-10 10:48:44 UTC (rev 1579)
@@ -1,7 +1,6 @@
 #!/usr/bin/make -f
 
 #export DH_VERBOSE=1
-export DH_COMPAT=4
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 export MONO_SHARED_DIR=$(CURDIR)
 export MONO_GAC_PREFIX=$(CURDIR)/debian/tmp/usr
@@ -12,8 +11,6 @@
 config-stamp:
 	dh_testdir
 	mkdir -p $(MONO_SHARED_DIR)/.wapi
-	perl -pe 's,\Q../../gtk/gtk-sharp.dll ../../rsvg/rsvg-sharp.dll,../../gtk/gtk-sharp.dll ../../art/art-sharp.dll ../../rsvg/rsvg-sharp.dll,;' \
-          -i $(CURDIR)/sample/rsvg/Makefile.in
 	./configure --prefix=/usr RUNTIME=/usr/bin/cli
 	touch config-stamp
 
@@ -34,8 +31,8 @@
 	dh_testroot
 	-$(MAKE) distclean RUNTIME=/usr/bin/cli
 	# gconf clean target is less than perfect
-	-cd gconf && find -iname "*.exe" -exec rm -rf \{\} \;
-	-cd gconf && find -iname "*.dll" -exec rm -rf \{\} \;
+	-cd gconf && find -name "*.exe" -exec rm -rf \{\} \;
+	-cd gconf && find -name "*.dll" -exec rm -rf \{\} \;
 	rm -f config-stamp build-indep-stamp build-arch-stamp
 	rm -rf $(MONO_SHARED_DIR)/.wapi
 	dh_clean
@@ -46,10 +43,10 @@
 	dh_clean -k
 	dh_installdirs
 	mkdir -p $(EX_PATH)
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp RUNTIME=/usr/bin/cli GACUTIL="/usr/bin/gacutil /root $(CURDIR)/debian/tmp/usr/lib"
-	cp -r $(CURDIR)/sample/pixmaps $(CURDIR)/sample/*.exe $(CURDIR)/sample/Makefile $(CURDIR)/sample/*.cs $(EX_PATH)
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp RUNTIME=/usr/bin/cli
 	# fixing file permissions
-	cd $(CURDIR)/debian && find . -type f -name "*.dll" -or -name "*.cs" | xargs chmod -x
+	cd debian && find -type f -name "*.dll" -or -name "*.mdb" -or -name "*.cs" | xargs chmod -x
+	cd debian && find -type f -name "*.exe" | xargs chmod +x
 
 binary-indep: build-indep install
 	dh_testdir
@@ -58,25 +55,17 @@
 	dh_movefiles -i
 	dh_link -i
 	dh_install
-	# another hack, working but crude... perl -e 'for(`find debian/tmp -type l`) { chomp; $a=readlink($_); if($a =~/usr.lib.mono/) { print $a; $a=~s,.*mono/gac,../gac,; unlink $_ ; symlink($a,$_) }} '
-	# forget broken examples
-	perl -pe 's/.*gconf.*//;s/.*rsvg.*//;' -i $(EX_PATH)/Makefile
+	cd debian/gtk-sharp-examples && find -type f -name "*.cs" | xargs chmod -x
 	install -m755 $(CURDIR)/debian/list-examples $(CURDIR)/debian/gtk-sharp2-unstable-examples/usr/bin/gtk-sharp2-unstable-examples-list
-	mv $(CURDIR)/debian/libgconf2.0-cil/usr/share/dotnet/bin/gconfsharp-schemagen.exe \
-	  $(CURDIR)/debian/libgconf2.0-cil/usr/share/dotnet/bin/gconfsharp2-schemagen.exe
+	mv $(CURDIR)/debian/libgconf2.0-cil/usr/bin/gconfsharp-schemagen.exe \
+	  $(CURDIR)/debian/libgconf2.0-cil/usr/bin/gconfsharp2-schemagen.exe
 	dh_installchangelogs -i ChangeLog
 	dh_installdocs -i
-#	dh_installexamples -i
-#	dh_installmenu -i
-#	dh_installinfo -i
-#	dh_undocumented -i
-#	dh_installman -i
 	dh_compress -i
 	dh_fixperms -i
-	chmod a-x debian/gtk-sharp2-unstable-examples/usr/share/dotnet/gtk-sharp2-unstable-examples/*.cs
 	dh_installdeb -i
-	dh_makenetlibs -m $(UPVERSION)
-	dh_netdeps -i -d
+	dh_makeclilibs -m $(UPVERSION)
+	dh_clideps -i -d
 	dh_gencontrol -i
 	dh_md5sums -i
 	dh_builddeb -i
@@ -89,19 +78,12 @@
 	dh_install
 	# fix libgkthml SONAME
 	perl -pe 's,libgtkhtml-3.1.so.7,libgtkhtml-3.0.so.4,' -i $(CURDIR)/debian/libgnome2.0-cil/usr/share/dotnet/mono/gac/*/*/*.config
-	# fix broken name
-	mv $(CURDIR)/debian/gtk-sharp2-unstable-gapi/usr/share/dotnet/bin/gapi_codegen.exe \
-	  $(CURDIR)/debian/gtk-sharp2-unstable-gapi/usr/share/dotnet/bin/gapi2-codegen.exe
-	mv $(CURDIR)/debian/gtk-sharp2-unstable-gapi/usr/share/dotnet/bin/gapi-fixup.exe \
-	  $(CURDIR)/debian/gtk-sharp2-unstable-gapi/usr/share/dotnet/bin/gapi2-fixup.exe
-	#perl -pe 's!/usr/bin/m(ono|int)!exec /usr/bin/cli!' -i $(CURDIR)/debian/gtk-sharp2-unstable-gapi/usr/bin/*
+	mv $(CURDIR)/debian/gtk-sharp2-unstable-gapi/usr/bin/gapi_codegen.exe \
+	  $(CURDIR)/debian/gtk-sharp2-unstable-gapi/usr/bin/gapi2_codegen.exe
+	mv $(CURDIR)/debian/gtk-sharp2-unstable-gapi/usr/bin/gapi-fixup.exe \
+	  $(CURDIR)/debian/gtk-sharp2-unstable-gapi/usr/bin/gapi2-fixup.exe
 	dh_installchangelogs -a ChangeLog
 	dh_installdocs -a
-#	dh_installexamples -a
-#	dh_installmenu -a
-#	dh_installinfo -a
-#	dh_undocumented -a
-#	dh_installman -a
 	dh_strip -a
 	dh_compress -a
 	dh_fixperms -a