[Pkg-mono-svn-commits] rev 1267 - libapache-mod-mono/trunk/debian
Pablo Fischer
pabl0-guest@haydn.debian.org
Wed, 04 Aug 2004 16:37:55 -0600
Author: pabl0-guest
Date: 2004-08-04 16:37:52 -0600 (Wed, 04 Aug 2004)
New Revision: 1267
Modified:
libapache-mod-mono/trunk/debian/500mod_mono.info
libapache-mod-mono/trunk/debian/README.Debian
libapache-mod-mono/trunk/debian/TODO
libapache-mod-mono/trunk/debian/changelog
libapache-mod-mono/trunk/debian/control
libapache-mod-mono/trunk/debian/docs
libapache-mod-mono/trunk/debian/libapache-mod-mono.dirs
libapache-mod-mono/trunk/debian/mono.conf
libapache-mod-mono/trunk/debian/rules
Log:
Apache 2.0 support
Modified: libapache-mod-mono/trunk/debian/500mod_mono.info
===================================================================
--- libapache-mod-mono/trunk/debian/500mod_mono.info 2004-07-31 12:05:55 UTC (rev 1266)
+++ libapache-mod-mono/trunk/debian/500mod_mono.info 2004-08-04 22:37:52 UTC (rev 1267)
@@ -1,2 +0,0 @@
-LoadModule: mono_module /usr/lib/apache/1.3/libmod_mono.so
-Description: Run ASP.NET Pages on UNIX with Apache and Mono
Modified: libapache-mod-mono/trunk/debian/README.Debian
===================================================================
--- libapache-mod-mono/trunk/debian/README.Debian 2004-07-31 12:05:55 UTC (rev 1266)
+++ libapache-mod-mono/trunk/debian/README.Debian 2004-08-04 22:37:52 UTC (rev 1267)
@@ -1,14 +1,19 @@
-libapache-mod-mono for Debian
------------------------------
+mod_mono for Debian
+--------------------
-libapache-mod-mono contains the mod_mono module for Apache that is needed to run
-asp.net applications in Apache.
+mod_mono is a module for Apache that allows you to run ASP.NET applications
+in Apache. The module is available for both Apache 1.3 and Apache 2.0.
-libapache-mod-mono depends on mono-server, cause mod_mono needs a socket to be connected, and
-mono-server (mod-mono-server) has it.
+libapache-mod-mono contains the mod_mono module for Apache 1.3.
+libapache2-mod-mono contains the mod_mono module for Apache 2.0.
-If you want use apache as your webserver to run asp.net applications and want to test your
-own application, I suggest you to add a new alias in /etc/apache/conf.d/mono.conf and read the
-README.Debian of mono-server.
+mod_mono depends on mod-mono-server, because mod_mono needs a socket to be
+connected, and mod-mono-server provides that socket.
+If you want to use Apache as your webserver to run ASP.NET applications and
+want to test your own application, I suggest you to add a new alias in
+/etc/apache/conf.d/mod_mono.conf (Apache 1.3) or
+/etc/apache2/conf.d/mod_mono.conf (Apache 2.0) and read the README.Debian
+of mod-mono-server.
+
-- Pablo Fischer <pablo@pablo.com.mx>, Sat, 28 Feb 2004 14:55:56 -0600
Modified: libapache-mod-mono/trunk/debian/TODO
===================================================================
--- libapache-mod-mono/trunk/debian/TODO 2004-07-31 12:05:55 UTC (rev 1266)
+++ libapache-mod-mono/trunk/debian/TODO 2004-08-04 22:37:52 UTC (rev 1267)
@@ -1,3 +1,22 @@
-29 feb 2004 02:52:24
+TODO for mod-mono
+-----------------
* Look for beta testers :)
+ If you are a prospective beta tester, these are some of the things
+ that should be tested:
+
+ - Install on Apache 1.3 and Apache 2.0.
+ - Systems with a single Apache host and a single mod_mono application.
+ - Systems with multiple virtual hosts and multiple mod_mono
+ applications.
+ - Userdir support -- allow people to install ASP.NET applications in
+ their public_html directory.
+ - Test with different Apache 2.0 threading models.
+ - How well does Apache 1.3/2.0 manage to reload its config with
+ mod_mono activated (for example, mod_python will sometimes result
+ in apache 2.0 freezing upon reload).
+ - Installation alongside other Apache modules (php, mod_perl,
+ mod_python, ...).
+ - Anything else you can think of, particularly related to the Debian
+ packaging. Of course, bugs in mod_mono itself are also welcome, and
+ they will be communicated upstream.
Modified: libapache-mod-mono/trunk/debian/changelog
===================================================================
--- libapache-mod-mono/trunk/debian/changelog 2004-07-31 12:05:55 UTC (rev 1266)
+++ libapache-mod-mono/trunk/debian/changelog 2004-08-04 22:37:52 UTC (rev 1267)
@@ -1,3 +1,23 @@
+mod-mono (1.0-2) unstable; urgency=low
+
+ + Fabian Fagerholm <fabbe@paniq.net>:
+ * debian/rules: Reworked the build process to be easier to understand
+ and extend. Build the libapache2-mod-mono package.
+ * debian/control: Build-depend on apache2-dev. Changed the long description
+ of libapache-mod-mono. Added the libapache2-mod-mono package.
+ * debian/docs: Remove a duplicated line.
+ * debian/TODO: Update with ideas that testers can work on.
+ * README.Debian: Cleaned up and changed wording of this text.
+ * debian/watch: Added.
+ * Rename some files:
+ - mono.conf to libapache-mod-mono.conf, installs as mod_mono.conf
+ - 500mod_mono.info to libapache-mod.mono.info, installs as 500mod_mono.info
+ * Added:
+ - libapache2-mod-mono.conf, installs as mod_mono.conf for apache2.
+ * A number of small changes in wording, spelling errors corrected, etc.
+
+ -- Debian Mono Group <pkg-mono-group@lists.alioth.debian.org> Wed, 4 Aug 2004 17:04:12 -0600
+
mod-mono (1.0-1) unstable; urgency=low
* NEW Release
Modified: libapache-mod-mono/trunk/debian/control
===================================================================
--- libapache-mod-mono/trunk/debian/control 2004-07-31 12:05:55 UTC (rev 1266)
+++ libapache-mod-mono/trunk/debian/control 2004-08-04 22:37:52 UTC (rev 1267)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Mono Group <pkg-mono-group@lists.alioth.debian.org>
Uploaders: Eduard Bloch <blade@debian.org>, Pablo Fischer <pablo@pablo.com.mx>
-Build-Depends: debhelper (>= 4.0.0), apache-dev, libmono-dev
+Build-Depends: debhelper (>= 4.0.0), apache-dev, apache2-dev, libmono-dev
Standards-Version: 3.6.0
Package: libapache-mod-mono
@@ -11,4 +11,17 @@
Section: web
Depends: ${shlibs:Depends}, apache (>= 1.3.31), mono-jit (>= 0.96), mono-apache-server (>= 0.15), wwwconfig-common
Description: Run ASP.NET Pages on UNIX with Apache and Mono
- Run ASP.NET pages on Unix with Apache and Mono!
+ mod_mono is a module for Apache that enables you to write ASP.NET web
+ applications, using the Mono .NET implementation.
+ .
+ This is the Apache 1.3 version.
+
+Package: libapache2-mod-mono
+Architecture: i386
+Section: web
+Depends: ${shlibs:Depends}, apache2 (>= 2.0.50), mono-jit (>= 0.96), mono-apache-server (>= 0.15)
+Description: Run ASP.NET Pages on UNIX with Apache 2 and Mono
+ mod_mono is a module for Apache that enables you to write ASP.NET web
+ applications, using the Mono .NET implementation.
+ .
+ This is the Apache 2.0 version.
Modified: libapache-mod-mono/trunk/debian/docs
===================================================================
--- libapache-mod-mono/trunk/debian/docs 2004-07-31 12:05:55 UTC (rev 1266)
+++ libapache-mod-mono/trunk/debian/docs 2004-08-04 22:37:52 UTC (rev 1267)
@@ -1,4 +1,3 @@
FAQ-old.txt
-FAQ-old.txt
NEWS
README
Modified: libapache-mod-mono/trunk/debian/libapache-mod-mono.dirs
===================================================================
--- libapache-mod-mono/trunk/debian/libapache-mod-mono.dirs 2004-07-31 12:05:55 UTC (rev 1266)
+++ libapache-mod-mono/trunk/debian/libapache-mod-mono.dirs 2004-08-04 22:37:52 UTC (rev 1267)
@@ -1,2 +1,5 @@
+etc
+etc/apache
+etc/apache/conf.d
usr/lib
usr/lib/apache/1.3
Modified: libapache-mod-mono/trunk/debian/mono.conf
===================================================================
--- libapache-mod-mono/trunk/debian/mono.conf 2004-07-31 12:05:55 UTC (rev 1266)
+++ libapache-mod-mono/trunk/debian/mono.conf 2004-08-04 22:37:52 UTC (rev 1267)
@@ -1,12 +0,0 @@
-#This is the config file for mod_mono
-#I suggest you to DON'T EDIT this file, you are warned
-
-<IfModule mod_mono.c>
- AddType application/x-asp-net .aspx .ashx .asmx .ascx .asax .config .ascx
- MonoUnixSocket /tmp/.mono-server/mod_mono_server
- DirectoryIndex index.aspx
- # The ASP.NET examples directory, create an Alias
- Alias /samples /usr/share/asp.net-demos/asp
- Alias /monodoc /usr/share/dotnet/monodoc/web
-</IfModule>
-
Modified: libapache-mod-mono/trunk/debian/rules
===================================================================
--- libapache-mod-mono/trunk/debian/rules 2004-07-31 12:05:55 UTC (rev 1266)
+++ libapache-mod-mono/trunk/debian/rules 2004-08-04 22:37:52 UTC (rev 1267)
@@ -12,9 +12,6 @@
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-APACHELIB = $(CURDIR)/debian/libapache-mod-mono/usr/lib/apache/1.3
-APACHEETC = $(CURDIR)/debian/libapache-mod-mono/etc/apache/conf.d
-
CFLAGS = -Wall -g
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -26,53 +23,80 @@
INSTALL_PROGRAM += -s
endif
-config.status: configure
+COMMON_CONFIG= --build=$(DEB_BUILD_GNU_TYPE) \
+ --host=$(DEB_HOST_GNU_TYPE) \
+ --prefix=/usr \
+ --mandir=\$${prefix}/share/man \
+ --infodir=\$${prefix}/share/info
+
+configure: configure-apache-stamp configure-apache2-stamp
+configure-apache-stamp:
dh_testdir
+ if [ -d apache-build ]; then rm -rf apache-build; fi
+ -mkdir apache-build
+ cd apache-build && \
+ ../configure $(COMMON_CONFIG) --with-apxs=/usr/bin/apxs
+ touch $@
+configure-apache2-stamp:
+ dh_testdir
+ if [ -d apache2-build ]; then rm -rf apache2-build; fi
+ -mkdir apache2-build
+ cd apache2-build && \
+ ../configure $(COMMON_CONFIG) --with-apxs=/usr/bin/apxs2
+ touch $@
- -$(MAKE) distclean
-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
-
- # Add here commands to configure the package.
- ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --with-apxs=/usr/bin/apxs
-
-
-build: build-stamp
-
-build-stamp: config.status
+build: configure build-apache-stamp build-apache2-stamp
+build-apache-stamp: configure-apache-stamp
dh_testdir
+ cd apache-build && $(MAKE)
+ touch $@
+build-apache2-stamp: configure-apache2-stamp
+ dh_testdir
+ cd apache2-build && $(MAKE)
+ touch $@
- # Add here commands to compile the package.
- $(MAKE)
- #/usr/bin/docbook-to-man debian/libapache-mod-mono.sgml > libapache-mod-mono.1
-
- touch build-stamp
-
clean:
dh_testdir
dh_testroot
- rm -f build-stamp
+ rm -f *-stamp *-stamp-*
+ rm -rf apache-build apache2-build
dh_clean
-install: build
+install: build install-prereq install-apache install-apache2
+install-prereq: build
dh_testdir
dh_testroot
- dh_clean -k
- dh_installdirs
+ dh_clean -k
+install-apache:
+ dh_installdirs -plibapache-mod-mono
- # Add here commands to install the package into debian/libapache-mod-mono.
- #We need APXS = /bin/true, a stupid trick or mod_mono will install everything in /usr
- # not in $(CURDIR)/debian/libapache-mod-mono
- $(MAKE) install DESTDIR=$(CURDIR)/debian/libapache-mod-mono APXS=/bin/true
+ # Install into debian/libapache-mod-mono.
+ # We need APXS = /bin/true, otherwise mod_mono will install everything
+ # in /usr instead of debian/libapache-mod-mono.
+ cd apache-build && $(MAKE) install \
+ DESTDIR=../debian/libapache-mod-mono \
+ APXS=/bin/true
+# install -m644 debian/libapache-mod-mono.conf \
+# debian/libapache-mod-mono/etc/apache/conf.d/mod_mono.conf
+ install -m755 apache-build/src/.libs/libmod_mono.so \
+ debian/libapache-mod-mono/`apxs -q LIBEXECDIR`
+ install -m644 debian/libapache-mod-mono.info \
+ debian/libapache-mod-mono/`apxs -q LIBEXECDIR`/500mod_mono.info
+install-apache2:
+ dh_installdirs -plibapache2-mod-mono
- mkdir -p $(APACHEETC)
- install -m644 $(CURDIR)/debian/500mod_mono.info $(APACHELIB)/500libmod_mono.info
-# install -m644 $(CURDIR)/debian/mono.conf $(APACHEETC)/mono.conf
- install -m755 $(CURDIR)/src/.libs/libmod_mono.so $(APACHELIB)/libmod_mono.so
+ # Install into debian/libapache2-mod-mono.
+ # We need APXS = /bin/true, otherwise mod_mono will install everything
+ # in /usr instead of debian/libapache2-mod-mono.
+ cd apache2-build && $(MAKE) install \
+ DESTDIR=../debian/libapache2-mod-mono \
+ APXS=/bin/true
+ install -m755 apache2-build/src/.libs/libmod_mono.so \
+ debian/libapache2-mod-mono/`apxs2 -q LIBEXECDIR`
+ install -m644 debian/libapache2-mod-mono.load \
+ debian/libapache2-mod-mono/etc/apache2/mods-available/mod_mono.load
+ install -m644 debian/libapache2-mod-mono.conf \
+ debian/libapache2-mod-mono/etc/apache2/mods-available/mod_mono.conf
# Build architecture-independent files here.
binary-indep: build install
@@ -85,24 +109,12 @@
dh_installchangelogs ChangeLog
dh_installdocs
dh_installexamples
-# dh_install
-# dh_installmenu
dh_installdebconf
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_installinit
-# dh_installcron
-# dh_installinfo
dh_installman
dh_link
dh_strip
dh_compress
dh_fixperms
-# dh_perl
-# dh_python
-# dh_makeshlibs
dh_installdeb
dh_shlibdeps
dh_gencontrol