[Pkg-mono-svn-commits] rev 1570 - monodoc/trunk/debian

Mirco Bauer meebey-guest@costa.debian.org
Sun, 10 Apr 2005 08:41:00 +0000


Author: meebey-guest
Date: 2005-04-10 08:40:59 +0000 (Sun, 10 Apr 2005)
New Revision: 1570

Removed:
   monodoc/trunk/debian/monodoc-base.dirs
   monodoc/trunk/debian/monodoc-base.files
   monodoc/trunk/debian/monodoc-base.links
   monodoc/trunk/debian/monodoc-http.links
Modified:
   monodoc/trunk/debian/10_monodochttp
   monodoc/trunk/debian/changelog
   monodoc/trunk/debian/control
   monodoc/trunk/debian/monodoc-base.install
   monodoc/trunk/debian/monodoc-browser.install
   monodoc/trunk/debian/monodoc-browser.postrm
   monodoc/trunk/debian/monodoc-http-script
   monodoc/trunk/debian/monodoc-http.dirs
   monodoc/trunk/debian/monodoc-http.hostxsp
   monodoc/trunk/debian/monodoc-http.install
   monodoc/trunk/debian/monodoc-manual.install
   monodoc/trunk/debian/rules
Log:
- /usr/share/dotnet to /usr/lib transition.



Modified: monodoc/trunk/debian/10_monodochttp
===================================================================
--- monodoc/trunk/debian/10_monodochttp	2005-04-09 22:50:56 UTC (rev 1569)
+++ monodoc/trunk/debian/10_monodochttp	2005-04-10 08:40:59 UTC (rev 1570)
@@ -1,4 +1,4 @@
 # This is the configuration file
 # for the monodoc-http
-path = /usr/share/dotnet/monodoc/web
+path = /usr/lib/monodoc/web
 alias = /monodoc

Modified: monodoc/trunk/debian/changelog
===================================================================
--- monodoc/trunk/debian/changelog	2005-04-09 22:50:56 UTC (rev 1569)
+++ monodoc/trunk/debian/changelog	2005-04-10 08:40:59 UTC (rev 1570)
@@ -1,3 +1,13 @@
+monodoc (1.0.6-0pre1) experimental; urgency=low
+
+  * New upstream release
+  * Mirco 'meebey' Bauer
+    + transition from /usr/share/dotnet to /usr/lib
+    + removed old conflicts.
+    + removed hacks in debian/rules which are not required anymore.
+
+ -- Debian Mono Group <pkg-mono-group@lists.alioth.debian.org>  Sun, 10 Apr 2005 10:21:44 +0200
+
 monodoc (1.0.4-1) unstable; urgency=low
 
   * New upstream release

Modified: monodoc/trunk/debian/control
===================================================================
--- monodoc/trunk/debian/control	2005-04-09 22:50:56 UTC (rev 1569)
+++ monodoc/trunk/debian/control	2005-04-10 08:40:59 UTC (rev 1570)
@@ -10,22 +10,21 @@
 Architecture: all
 Suggests: monodoc-http
 Depends: monodoc-browser (>= ${Source-Version}), monodoc-manual
-Description: The Mono documentation viewer
+Description: Mono documentation viewer
  The MonoDoc Project is the documentation framework of the Mono project which
- provides detailed API documentation for all Mono components and the Mono .NET
- Framework.
+ provides detailed API documentation for all Mono components and the Mono CLI
+ implementation.
  .
  This is a meta package containing dependencies for the main components of
  monodoc.
 
 Package: monodoc-base
 Architecture: all
-Depends: ${net:Depends}
-Conflicts: monodoc-browser (<< 0.15)
+Depends: ${cli:Depends}
 Description: shared MonoDoc binaries
  The MonoDoc Project is the documentation framework of the Mono project which
- provides detailed API documentation for all Mono components and the Mono .NET
- Framework.
+ provides detailed API documentation for all Mono components and the Mono CLI
+ implementation.
  .
  This packages contains the shared binaries which are used by the monodoc
  programs like the documentation file compiler (assembler.exe aka "monodoc").
@@ -35,8 +34,8 @@
 Depends: monodoc-browser | monodoc-http | monodoc-viewer
 Description: compiled XML documentation from the Mono project
  The MonoDoc Project is the documentation framework of the Mono project which
- provides detailed API documentation for all Mono components and the Mono .NET
- Framework.
+ provides detailed API documentation for all Mono components and the Mono CLI
+ implementation.
  .
  This packages contains the compiled XML documentation of MonoDoc. 
 
@@ -44,22 +43,22 @@
 Provides: monodoc-viewer
 Architecture: all
 Recommends: lynx
-Depends: monodoc-manual, ${net:Depends}
+Depends: monodoc-manual, ${cli:Depends}
 Description: MonoDoc GTK+ based viewer
  The MonoDoc Project is the documentation framework of the Mono project which
- provides detailed API documentation for all Mono components and the Mono .NET
- Framework.
+ provides detailed API documentation for all Mono components and the Mono CLI
+ implementation.
  .
  This package contains the GTK+ based viewer of the MONO documentation.
 
 Package: monodoc-http
 Provides: monodoc-viewer
 Architecture: all
-Depends:  ${net:Depends}, ${net:XspServer}, monodoc-manual
+Depends:  monodoc-manual, ${cli:Depends}, ${cli:XspServer}
 Description: MonoDoc http based viewer
  The MonoDoc Project is the documentation framework of the Mono project which
- provides detailed API documentation for all Mono components and the Mono .NET
- Framework.
+ provides detailed API documentation for all Mono components and the Mono CLI
+ implementation.
  .
  This package contains ASP.NET scripts which allow viewing the Mono
  documentation via an ASP.NET enabled webserver with a standard http

Deleted: monodoc/trunk/debian/monodoc-base.dirs
===================================================================
--- monodoc/trunk/debian/monodoc-base.dirs	2005-04-09 22:50:56 UTC (rev 1569)
+++ monodoc/trunk/debian/monodoc-base.dirs	2005-04-10 08:40:59 UTC (rev 1570)
@@ -1,2 +0,0 @@
-usr/share/dotnet/mono/gtk-sharp
-usr/share/dotnet/mono/monodoc

Deleted: monodoc/trunk/debian/monodoc-base.files
===================================================================
--- monodoc/trunk/debian/monodoc-base.files	2005-04-09 22:50:56 UTC (rev 1569)
+++ monodoc/trunk/debian/monodoc-base.files	2005-04-10 08:40:59 UTC (rev 1570)
@@ -1,2 +0,0 @@
-usr/lib/pkgconfig/monodoc.pc
-usr/share/pixmaps/monodoc.png

Modified: monodoc/trunk/debian/monodoc-base.install
===================================================================
--- monodoc/trunk/debian/monodoc-base.install	2005-04-09 22:50:56 UTC (rev 1569)
+++ monodoc/trunk/debian/monodoc-base.install	2005-04-10 08:40:59 UTC (rev 1570)
@@ -1,7 +1,9 @@
-debian/tmp/usr/lib/mono/gac			usr/share/dotnet/mono
-debian/tmp/usr/bin/mod				usr/share/dotnet/monodoc
-debian/tmp/usr/bin/monodoc			usr/share/dotnet/monodoc
-debian/tmp/usr/lib/monodoc/assembler.exe	usr/share/dotnet/monodoc
-debian/tmp/usr/lib/monodoc/updater.exe		usr/share/dotnet/monodoc
-debian/tmp/usr/lib/monodoc/mod.exe		usr/share/dotnet/monodoc
-debian/tmp/usr/lib/monodoc/normalize.exe	usr/share/dotnet/monodoc
+debian/tmp/usr/bin/mod
+debian/tmp/usr/bin/monodoc
+debian/tmp/usr/lib/mono/gac
+debian/tmp/usr/lib/monodoc/assembler.exe
+debian/tmp/usr/lib/monodoc/updater.exe
+debian/tmp/usr/lib/monodoc/mod.exe
+debian/tmp/usr/lib/monodoc/normalize.exe
+debian/tmp/usr/lib/pkgconfig/monodoc.pc
+debian/tmp/usr/share/pixmaps/monodoc.png

Deleted: monodoc/trunk/debian/monodoc-base.links
===================================================================
--- monodoc/trunk/debian/monodoc-base.links	2005-04-09 22:50:56 UTC (rev 1569)
+++ monodoc/trunk/debian/monodoc-base.links	2005-04-10 08:40:59 UTC (rev 1570)
@@ -1,2 +0,0 @@
-usr/share/dotnet/monodoc/mod		usr/bin/mod 
-usr/share/dotnet/monodoc/monodoc	usr/bin/monodoc

Modified: monodoc/trunk/debian/monodoc-browser.install
===================================================================
--- monodoc/trunk/debian/monodoc-browser.install	2005-04-09 22:50:56 UTC (rev 1569)
+++ monodoc/trunk/debian/monodoc-browser.install	2005-04-10 08:40:59 UTC (rev 1570)
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/monodoc/browser.exe usr/share/dotnet/monodoc
-monodoc.desktop usr/share/gnome/apps/Development
+debian/tmp/usr/lib/monodoc/browser.exe
+monodoc.desktop				/usr/share/gnome/apps/Development

Modified: monodoc/trunk/debian/monodoc-browser.postrm
===================================================================
--- monodoc/trunk/debian/monodoc-browser.postrm	2005-04-09 22:50:56 UTC (rev 1569)
+++ monodoc/trunk/debian/monodoc-browser.postrm	2005-04-10 08:40:59 UTC (rev 1570)
@@ -1,10 +1,10 @@
-#!/bin/sh
+#!/bin/sh -e
 
 if test -x /usr/bin/update-menus; then update-menus; fi
 
-if [ -f /usr/share/dotnet/monodoc/monodoc.index ]; then
-	rm /usr/share/dotnet/monodoc/monodoc.index
-	rmdir /usr/share/dotnet/monodoc 2> /dev/null || true
+if [ -f /usr/lib/monodoc/monodoc.index ]; then
+	rm /usr/lib/monodoc/monodoc.index
+	rmdir /usr/lib/monodoc 2> /dev/null || true
 fi
 
 #DEBHELPER#

Modified: monodoc/trunk/debian/monodoc-http-script
===================================================================
--- monodoc/trunk/debian/monodoc-http-script	2005-04-09 22:50:56 UTC (rev 1569)
+++ monodoc/trunk/debian/monodoc-http-script	2005-04-10 08:40:59 UTC (rev 1570)
@@ -13,6 +13,6 @@
 echo -e "\n\nThe XSP web server is starting now. To view the monodoc pages, your"
 echo -e "web browser will open http://localhost:$port/ now.\n\n"
 
-(sleep 5 ; sensible-browser http://localhost:$port/ ) &
+(sleep 5; sensible-browser http://localhost:$port/) &
 
-exec xsp --root /usr/share/dotnet/monodoc/web --port $port
+exec xsp --root /usr/lib/monodoc/web --port $port

Modified: monodoc/trunk/debian/monodoc-http.dirs
===================================================================
--- monodoc/trunk/debian/monodoc-http.dirs	2005-04-09 22:50:56 UTC (rev 1569)
+++ monodoc/trunk/debian/monodoc-http.dirs	2005-04-10 08:40:59 UTC (rev 1570)
@@ -1,3 +1,3 @@
 usr/bin
 usr/share/gnome/apps/Development
-usr/share/dotnet/monodoc/web
+usr/lib/monodoc/web

Modified: monodoc/trunk/debian/monodoc-http.hostxsp
===================================================================
--- monodoc/trunk/debian/monodoc-http.hostxsp	2005-04-09 22:50:56 UTC (rev 1569)
+++ monodoc/trunk/debian/monodoc-http.hostxsp	2005-04-10 08:40:59 UTC (rev 1570)
@@ -1,4 +1,4 @@
 # This is the configuration file
 # for the monodoc-http
-path = /usr/share/dotnet/monodoc/web
+path = /usr/lib/monodoc/web
 alias = /monodoc

Modified: monodoc/trunk/debian/monodoc-http.install
===================================================================
--- monodoc/trunk/debian/monodoc-http.install	2005-04-09 22:50:56 UTC (rev 1569)
+++ monodoc/trunk/debian/monodoc-http.install	2005-04-10 08:40:59 UTC (rev 1570)
@@ -1 +1 @@
-browser/web/* usr/share/dotnet/monodoc/web
+browser/web/*	/usr/lib/monodoc/web/

Deleted: monodoc/trunk/debian/monodoc-http.links
===================================================================
--- monodoc/trunk/debian/monodoc-http.links	2005-04-09 22:50:56 UTC (rev 1569)
+++ monodoc/trunk/debian/monodoc-http.links	2005-04-10 08:40:59 UTC (rev 1570)
@@ -1,3 +0,0 @@
-usr/share/dotnet/monodoc/monodoc.xml usr/share/dotnet/monodoc/web/monodoc.xml
-usr/share/dotnet/monodoc/sources usr/share/dotnet/monodoc/web/sources
-usr/share/dotnet/mono/monodoc/monodoc.dll usr/share/dotnet/monodoc/web/monodoc.dll

Modified: monodoc/trunk/debian/monodoc-manual.install
===================================================================
--- monodoc/trunk/debian/monodoc-manual.install	2005-04-09 22:50:56 UTC (rev 1569)
+++ monodoc/trunk/debian/monodoc-manual.install	2005-04-10 08:40:59 UTC (rev 1570)
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/monodoc/monodoc.xml usr/share/dotnet/monodoc
-debian/tmp/usr/lib/monodoc/sources/* usr/share/dotnet/monodoc/sources
+debian/tmp/usr/lib/monodoc/monodoc.xml	usr/lib/monodoc/
+debian/tmp/usr/lib/monodoc/sources/

Modified: monodoc/trunk/debian/rules
===================================================================
--- monodoc/trunk/debian/rules	2005-04-09 22:50:56 UTC (rev 1569)
+++ monodoc/trunk/debian/rules	2005-04-10 08:40:59 UTC (rev 1570)
@@ -27,7 +27,6 @@
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 	-cd $(CURDIR)/debian/tmp && find -type f -name "*.dll" -exec chmod -x {} \;
 
-ALIAS_PATHS = usr/share/dotnet/mono/monodoc usr/share/dotnet/mono/gtk-sharp
 binary-indep: build install
 	dh_testdir -i
 	dh_testroot -i
@@ -35,7 +34,7 @@
 	dh_link -i
 	install -m644 -D debian/lintian debian/monodoc-base/usr/share/lintian/overrides/monodoc
 	dh_install -i
-	ln -sf monodoc debian/monodoc-base/usr/share/dotnet/monodoc/mod
+	ln -sf monodoc debian/monodoc-base/usr/lib/monodoc/mod
 	cp $(CURDIR)/debian/monodoc-http-script $(CURDIR)/debian/monodoc-http/usr/bin/monodoc-http
 	cp $(CURDIR)/monodoc.desktop $(CURDIR)/debian/monodoc-http/usr/share/gnome/apps/Development/monodoc-http.desktop
 	perl -pe ' \
@@ -44,15 +43,8 @@
 	  s,Terminal=false,Terminal=true,; \
 	  ' -i $(CURDIR)/debian/monodoc-http/usr/share/gnome/apps/Development/monodoc-http.desktop
 	# fix upstream file permissions
-	find $(CURDIR)/debian/monodoc-http/usr/share/dotnet/monodoc/web -type f -exec chmod 644 {} \;
-	find $(CURDIR)/debian/monodoc-http/usr/share/dotnet/monodoc/web -type d -exec chmod 755 {} \;
-	perl -pe 's,/usr/lib/monodoc,/usr/share/dotnet/monodoc,;' \
-	  -i $(CURDIR)/debian/monodoc-base/usr/share/dotnet/mono/gac/monodoc/*/monodoc.dll.config
-	perl -pe 's,^prefix=.*,prefix=/usr/share/dotnet\n,;s,^monodocdir=.*,monodocdir=/usr/share/dotnet/monodoc\n,;s,mono --debug,/usr/bin/cli,; s,/usr/lib/monodoc,/usr/share/dotnet/monodoc,; s,mono ,/usr/bin/cli ,;' \
-	  -i $(CURDIR)/debian/monodoc-base/usr/share/dotnet/monodoc/monodoc
-	perl -pe 's,\$${exec_prefix}/lib,/usr/share/dotnet,;' \
-	  -i $(CURDIR)/debian/monodoc-base/usr/lib/pkgconfig/monodoc.pc
-	for x in $(ALIAS_PATHS) ; do cd $(CURDIR)/debian/monodoc-base/$$x && ln -sf `find ../gac -name "*.dll"` .; done
+	find $(CURDIR)/debian/monodoc-http/usr/lib/monodoc/web -type f -exec chmod 644 {} \;
+	find $(CURDIR)/debian/monodoc-http/usr/lib/monodoc/web -type d -exec chmod 755 {} \;
 	dh_installchangelogs -i ChangeLog
 	dh_installdocs -i
 	dh_installmenu -i
@@ -64,8 +56,8 @@
 	dh_fixperms -i
 	dh_installdeb -i
 	dh_installxsp
-	dh_makenetlibs -i -r
-	dh_netdeps -i
+	dh_makeclilibs -i -r
+	dh_clideps -i
 	dh_gencontrol -i
 	dh_md5sums -i
 	dh_builddeb -i