[Pkg-mono-svn-commits] rev 1309 - in xsp/trunk/debian: . po
Pablo Fischer
pabl0-guest@haydn.debian.org
Sun, 08 Aug 2004 11:12:48 -0600
Author: pabl0-guest
Date: 2004-08-08 11:12:39 -0600 (Sun, 08 Aug 2004)
New Revision: 1309
Added:
xsp/trunk/debian/po/
xsp/trunk/debian/po/POTFILES.in
Modified:
xsp/trunk/debian/changelog
xsp/trunk/debian/control
xsp/trunk/debian/mono-apache-server.README.Debian
xsp/trunk/debian/mono-apache-server.links
xsp/trunk/debian/mono-apache-server.templates
xsp/trunk/debian/mono-server-update.conf
xsp/trunk/debian/mono-xsp.links
xsp/trunk/debian/mono-xsp.templates
xsp/trunk/debian/rules
Log:
* po-debconf support
* support for libapache2
Modified: xsp/trunk/debian/changelog
===================================================================
--- xsp/trunk/debian/changelog 2004-08-08 17:06:15 UTC (rev 1308)
+++ xsp/trunk/debian/changelog 2004-08-08 17:12:39 UTC (rev 1309)
@@ -1,3 +1,11 @@
+xsp (1.0-5) unstable; urgency=low
+
+ * NOT RELEASED YET
+ * xsp should create his own chroot (SHARED_DIR) (closes: #259163)
+ * use po-debconf for po template files
+
+ -- Pablo Fischer <unmada@pablo> Sat, 24 Jul 2004 14:02:42 -0500
+
xsp (1.0-4) unstable; urgency=low
* mono-xsp should use a SHARED_DIR, that will be /var/run/mono-xsp owned by www-data
Modified: xsp/trunk/debian/control
===================================================================
--- xsp/trunk/debian/control 2004-08-08 17:06:15 UTC (rev 1308)
+++ xsp/trunk/debian/control 2004-08-08 17:12:39 UTC (rev 1309)
@@ -3,11 +3,11 @@
Priority: optional
Maintainer: Debian Mono group <pkg-mono-group@lists.alioth.debian.org>
Standards-Version: 3.6.0
-Build-Depends: debhelper (>= 3), mono-mcs | c-sharp-compiler, libmono-dev, mono-utils (>> 1.0)
+Build-Depends: debhelper (>= 4.1.16), mono-mcs | c-sharp-compiler, libmono-dev, mono-utils (>> 1.0)
Package: mono-xsp
Architecture: all
-Depends: ${shlibs:Depends}, ${net:Depends}, mono-mcs (>> 1.0), debconf (>= 0.5) | debconf-2.0
+Depends: ${shlibs:Depends}, ${net:Depends}, mono-mcs (>> 1.0), debconf (>= 1.0.32) | debconf-2.0
Description: simple web server to run ASP.NET applications
XSP is a simple web server written in C# that can be used to run your
ASP.NET applications.
@@ -17,7 +17,7 @@
Package: asp.net-examples
Architecture: all
-Depends: ${shlibs:Depends}, mono-xsp | libapache-mod-mono (>> 1.0)
+Depends: ${shlibs:Depends}, mono-xsp | mono-apache-server
Description: demo pages for ASP.NET infrastructure
Sample set of .aspx pages to test the XSP server or the mod_mono Apache
module.
@@ -26,7 +26,7 @@
Architecture: all
Conflicts: mono-server
Replaces: mono-server
-Depends: ${shlibs:Depends}, ${net:Depends}, libapache-mod-mono (>> 1.0), mono-mcs (>> 1.0), debconf (>= 0.5) | debconf-2.0
+Depends: ${shlibs:Depends}, ${net:Depends}, libapache-mod-mono (>> 1.0) | libapache2-mod-mono (>> 1.0), mono-mcs (>> 1.0), debconf (>= 1.0.32) | debconf-2.0
Description: The mod-mono server
It contains the mod-mono-server, a wrapper for mod_mono that let apache
users to run ASP.NET applications, so mod_mono call mod-mono-server to
Modified: xsp/trunk/debian/mono-apache-server.README.Debian
===================================================================
--- xsp/trunk/debian/mono-apache-server.README.Debian 2004-08-08 17:06:15 UTC (rev 1308)
+++ xsp/trunk/debian/mono-apache-server.README.Debian 2004-08-08 17:12:39 UTC (rev 1309)
@@ -1,7 +1,7 @@
-mod-mono-server for Debian
+mono-apache-server for Debian
--------------
-The mono-server package creates a socket in /tmp, so that mod_mono (in Apache) can be started
+The mono-apache-server package creates a socket in /tmp, so that mod_mono (in Apache) can be started
without errors.
So, to run mod_mono you SHOULD need this packages, and viceversa.
@@ -37,7 +37,7 @@
The only 'daemon' issue that you can find is that mono-server-update.conf can start (if was running) apache,
but you can turn it off with dpkg-reconfigure mono-server.
-If you want to create your own applications using the advantages that mono-server has, you can use the
+If you want to create your own applications using the advantages that mono-apache-server has, you can use the
mono-server-admin.conf script.
ALSO, YOU SHOULD NOT EDIT mono-server-hosts.conf file, cause when mono-server-update.conf is called it
Modified: xsp/trunk/debian/mono-apache-server.links
===================================================================
--- xsp/trunk/debian/mono-apache-server.links 2004-08-08 17:06:15 UTC (rev 1308)
+++ xsp/trunk/debian/mono-apache-server.links 2004-08-08 17:12:39 UTC (rev 1309)
@@ -1,3 +1,5 @@
-/usr/share/dotnet/monoserver/mono-server-update.conf /usr/sbin/mono-server-update.conf
-/usr/share/dotnet/monoserver/mono-server-admin.conf /usr/sbin/mono-server-admin.conf
+/usr/share/dotnet/monoserver/mono-server-update.conf /usr/sbin/mono-server-update.conf
+/usr/share/dotnet/monoserver/mono-server-admin.conf /usr/sbin/mono-server-admin.conf
+/usr/share/dotnet/monoserver/mono-server-update.conf /usr/sbin/update-mono-server.conf
+
Modified: xsp/trunk/debian/mono-apache-server.templates
===================================================================
--- xsp/trunk/debian/mono-apache-server.templates 2004-08-08 17:06:15 UTC (rev 1308)
+++ xsp/trunk/debian/mono-apache-server.templates 2004-08-08 17:12:39 UTC (rev 1309)
@@ -1,8 +1,8 @@
Template: monoserver/monoserver_restartapache
Type: boolean
Default: true
-Description: Let mono-server restart Apache?
- The debian version of mono-server includes a mono-server-update.conf
+_Description: Let mono-apache-server restart Apache?
+ The debian version of mono-apache-server includes a mono-server-update.conf script
that creates a configuration file for apache to start the ASP.NET applications,
and mono-server-update.conf can restart apache if there's a new configuration file
(/etc/mono-server/mono-server-hosts.conf). Would you like to restart apache if
Modified: xsp/trunk/debian/mono-server-update.conf
===================================================================
--- xsp/trunk/debian/mono-server-update.conf 2004-08-08 17:06:15 UTC (rev 1308)
+++ xsp/trunk/debian/mono-server-update.conf 2004-08-08 17:12:39 UTC (rev 1309)
@@ -53,6 +53,8 @@
$monoserver_hostfile = "$monoserver_dir/mono-server-hosts.conf";
$daemon = "/etc/init.d/apache";
$daemon_pid = "/var/run/apache.pid";
+$daemon2 = "/etc/init.d/apache2";
+$daemon2_pid = "/var/run/apache2.pid";
$applications = "";
$default_file = "/etc/default/mono-apache-server";
$libs = "";
@@ -96,6 +98,9 @@
if(( -f $daemon ) && ( -f $daemon_pid )) {
system("$daemon restart");
}
+ if(( -f $daemon2 ) && ( -f $daemon2_pid )) {
+ system("$daemon2 restart");
+ }
}
}
Modified: xsp/trunk/debian/mono-xsp.links
===================================================================
--- xsp/trunk/debian/mono-xsp.links 2004-08-08 17:06:15 UTC (rev 1308)
+++ xsp/trunk/debian/mono-xsp.links 2004-08-08 17:12:39 UTC (rev 1309)
@@ -1,3 +1,5 @@
-/usr/share/dotnet/xsp/mono-xsp-update.conf /usr/sbin/mono-xsp-update.conf
-/usr/share/dotnet/xsp/mono-xsp-admin.conf /usr/sbin/mono-xsp-admin.conf
+/usr/share/dotnet/xsp/mono-xsp-update.conf /usr/sbin/mono-xsp-update.conf
+/usr/share/dotnet/xsp/mono-xsp-admin.conf /usr/sbin/mono-xsp-admin.conf
+/usr/share/dotnet/xsp/mono-xsp-update.conf /usr/sbin/update-mono-xsp.conf
+
Modified: xsp/trunk/debian/mono-xsp.templates
===================================================================
--- xsp/trunk/debian/mono-xsp.templates 2004-08-08 17:06:15 UTC (rev 1308)
+++ xsp/trunk/debian/mono-xsp.templates 2004-08-08 17:12:39 UTC (rev 1309)
@@ -1,4 +1,5 @@
Template: xsp/xsp_autostart
Type: boolean
Default: true
-Description: Would you like to autostart the XSP process when you start your computer?.
+_Description: Autostart XSP
+ Would you like to autostart the XSP process when you start your computer?.
Added: xsp/trunk/debian/po/POTFILES.in
===================================================================
--- xsp/trunk/debian/po/POTFILES.in 2004-08-08 17:06:15 UTC (rev 1308)
+++ xsp/trunk/debian/po/POTFILES.in 2004-08-08 17:12:39 UTC (rev 1309)
@@ -0,0 +1,3 @@
+[type: gettext/rfc822deb] mono-apache-server.templates
+[type: gettext/rfc822deb] mono-xsp.templates
+
Modified: xsp/trunk/debian/rules
===================================================================
--- xsp/trunk/debian/rules 2004-08-08 17:06:15 UTC (rev 1308)
+++ xsp/trunk/debian/rules 2004-08-08 17:12:39 UTC (rev 1309)
@@ -1,30 +1,28 @@
#!/usr/bin/make -f
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-export DH_COMPAT=3
+export DH_COMPAT=4
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
export MONO_SHARED_DIR=$(CURDIR)/.wabi
-CFLAGS = -Wall -g
+configure: configure-stamp templates.pot
+configure-stamp:
+ dh_testdir
+ mkdir -p $$MONO_SHARED_DIR
+
config.status: configure
dh_testdir
mkdir -p $$MONO_SHARED_DIR
- # Add here commands to configure the package.
- CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
+ ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
+ touch configure-stamp
-
build: build-stamp
-build-stamp: config.status
+build-stamp: configure-stamp
dh_testdir
-
# Add here commands to compile the package.
$(MAKE)
#/usr/bin/docbook-to-man debian/xsp.sgml > xsp.1
@@ -34,23 +32,22 @@
pod2man --section=8 $(CURDIR)/debian/mono-xsp-update.conf > $(CURDIR)/debian/mono-xsp-update.conf.8
touch build-stamp
+templates.pot: $(wildcard debian/*.templates)
+ @debconf-updatepo
+
clean:
dh_testdir
dh_testroot
rm -f build-stamp
-
+ rm -f configure-stamp
# Add here commands to clean up after the build process.
-$(MAKE) distclean
rm -rf $$MONO_SHARED_DIR
-#ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-# cp -f /usr/share/misc/config.sub config.sub
-#endif
-#ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-# cp -f /usr/share/misc/config.guess config.guess
-#endif
-
-
dh_clean
+ rm -rf $(CURDIR)/debian/mono-server-admin.conf.8
+ rm -rf $(CURDIR)/debian/mono-xsp-admin.conf.8
+ rm -rf $(CURDIR)/debian/mono-server-update.conf.8
+ rm -rf $(CURDIR)/debian/mono-xsp-update.conf.8
install: build
dh_testdir
@@ -74,9 +71,6 @@
mv debian/mono-apache-server/usr/bin/*.exe debian/mono-apache-server/usr/share/dotnet/bin
binary-arch: build install
-# We have nothing to do by default.
-
-binary-indep: build install
dh_testdir
dh_testroot
# dh_movefiles
@@ -93,11 +87,9 @@
chmod -x $(CURDIR)/debian/asp.net-examples/usr/share/asp.net-demos/*/*
chmod +x $(CURDIR)/debian/asp.net-examples/usr/share/asp.net-demos/asp/bin
-# cp $(CURDIR)/debian/mono-xsp-reader.conf debian/mono-xsp/usr/share/dotnet/xsp/
cp $(CURDIR)/debian/mono-xsp-update.conf debian/mono-xsp/usr/share/dotnet/xsp/
cp $(CURDIR)/debian/mono-xsp-admin.conf debian/mono-xsp/usr/share/dotnet/xsp/
-# cp $(CURDIR)/debian/mono-server-reader.conf $(CURDIR)/debian/mono-server/usr/share/dotnet/monoserver/
cp $(CURDIR)/debian/mono-server-admin.conf $(CURDIR)/debian/mono-apache-server/usr/share/dotnet/monoserver/
cp $(CURDIR)/debian/mono-server-update.conf $(CURDIR)/debian/mono-apache-server/usr/share/dotnet/monoserver/
@@ -107,16 +99,7 @@
perl -pe 's,mono.png,/samples/mono.png,; \
s,href=\\"\{0\}\\">,href=\\"/samples/\{0\}\\">,' -i $(CURDIR)/debian/asp.net-examples/usr/share/asp.net-demos/asp/index.aspx
-# cd $(CURDIR)/debian/asp.net-examples/usr/share/dotnet/lib; ln -sf `find ../../asp.net-demos/dll -name "*.dll"` .;
- #cd $(CURDIR)/debian/mono-server/usr/sbin; ln -s ../share/dotnet/monoserver/*.conf .
- #cd $(CURDIR)/debian/mono-xsp/usr/sbin; ln -s ../share/dotnet/xsp/*.conf .
-
-# ln -s $(CURDIR)/debian/mono-server/usr/share/dotnet/monoserver/*.conf $(CURDIR)/debian/mono-server/usr/bin/
-# ln -s $(CURDIR)/debian/mono-xsp/usr/share/dotnet/xsp/*.conf $(CURDIR)/debian/mono-xsp/usr/bin/
-
-# install -m755 debian/asp.net-examples-server-snapshot $(CURDIR)/debian/asp.net-examples-snapshot/usr/bin
- #cd test && cp *.dll $(CURDIR)/debian/asp.net-examples/usr/lib
# dh_install
# dh_installmenu
dh_installdebconf
@@ -143,5 +126,5 @@
dh_md5sums
dh_builddeb
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+binary: binary-arch
+.PHONY: build clean binary-arch binary install