Commit 95aafd5a authored by Markus Koschany's avatar Markus Koschany

Debian release 0.6.0-2

- Adjust packaging for apache2.4 server.
- Fix RC bug #710263
- See changelog for further information.
parent 9164eded
......@@ -2,13 +2,12 @@ cortado applet for Debian
-------------------------
If you are using apache2 you will find all applets in the directory cortado in
the DocumentRoot of your webserver. The actual configuration file is
/etc/apache2/conf.d/cortado. If you are using another httpd you must configure
it for yourself but you will find the apache2 example configuration at
/usr/share/doc/cortado/examples/apache2. In the same directory you will find
some sample HTML files.
the DocumentRoot of your web server. The actual configuration file is
/etc/apache2/conf-available/cortado.conf. If you are using another httpd you
must configure it for yourself. You will find some sample HTML files in
/usr/share/doc/cortado/examples.
The package install 3 jar files:
The package installs 3 jar files:
1. cortado-ovt.jar supporting Ogg/Vorbis+Theora
2. cortado-ov.jar supporting Ogg/Vorbis
......@@ -17,6 +16,4 @@ The package install 3 jar files:
For your convenience there is a symlink cortado.jar that links to the 1.
version.
Torsten Werner <twerner@debian.org> Wed Jan 3 17:41:26 CET 2007
Markus Koschany <apo@gambaru.de> Sun Sep 22 15:19:16 CET 2013
cortado (0.6.0-2) unstable; urgency=low
* Team upload.
* Adjust the packaging for the new Apache 2.4 web server.
- Rename apache2 to cortado.conf and install the server configuration with
cortado.install to /etc/apache2/conf-available.
- Convert cortado.postinst and cortado.postrm to use
apache2-maintscript-helper. Do not rely on files in
/usr/share/doc/cortado anymore. Thanks to Andreas Beckmann for the report.
(Closes: #710263)
- Add cortado.maintscript to ensure the old web server configuration is
preserved during an upgrade from Wheezy to Jessie and moved to the
new conf-available directory.
* Bump compat level to 9 and require debhelper >= 9.
* debian/control:
- Bump Standards-Version to 3.9.4, no changes.
- Use canonical VCS-URI.
- Use a different short description for libcortado-java.
- Remove alternative apache2-mpm-worker dependency because it is obsolete.
- Downgrade dependency on apache2 | httpd to Recommends because web
applications should not depend unconditionally on apache2.
- cortado: Relax dependency on libcortado-java to (>= ${source:Version})
- Remove obsolete Replaces field for libcortado-java.
* Fix lintian warning copyright-refers-to-symlink-license.
* Remove destdir.diff patch. It was not applied anyway.
* Add DEP3 headers to 01_fix_build.diff patch.
* Update README.Debian.
* Run wrap-and-sort -sa.
-- Markus Koschany <apo@gambaru.de> Sun, 22 Sep 2013 17:38:39 +0200
cortado (0.6.0-1) unstable; urgency=low
* New upstream release
......
......@@ -2,17 +2,29 @@ Source: cortado
Section: utils
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
Uploaders: Varun Hiremath <varun@debian.org>, Torsten Werner <twerner@debian.org>, Onkar Shinde <onkarshinde@ubuntu.com>
Build-Depends: debhelper (>= 7), cdbs, default-jdk, ant, junit
Standards-Version: 3.9.1
Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/cortado/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-java/trunk/cortado/
Uploaders:
Varun Hiremath <varun@debian.org>,
Torsten Werner <twerner@debian.org>,
Onkar Shinde <onkarshinde@ubuntu.com>
Build-Depends:
ant,
cdbs,
debhelper (>= 9),
default-jdk,
junit
Standards-Version: 3.9.4
Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/cortado/
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/cortado/
Homepage: http://theora.org/cortado/
Package: cortado
Architecture: all
Depends: ${misc:Depends}, apache2-mpm-worker | apache2 | httpd,
ucf, libcortado-java (= ${binary:Version})
Depends:
libcortado-java (>= ${source:Version}),
ucf,
${misc:Depends}
Recommends:
apache2 | httpd
Description: streaming applet for Ogg formats
By embedding the cortado applet in your website, you can give viewers access
to streams from either the Flumotion streaming server or any HTTP server
......@@ -28,9 +40,9 @@ Description: streaming applet for Ogg formats
Package: libcortado-java
Section: java
Architecture: all
Depends: ${misc:Depends}
Replaces: cortado (<< 0.5.2)
Description: streaming applet for Ogg formats
Depends:
${misc:Depends}
Description: streaming applet for Ogg formats -- shared components
By embedding the cortado applet in your website, you can give viewers access
to streams from either the Flumotion streaming server or any HTTP server
providing multimedia files without the need for a locally installed media
......
......@@ -3,11 +3,11 @@ Mon, 1 Jan 2007 23:38:17 +0530.
It was downloaded from http://theora.org/cortado/
Upstream Authors:
Upstream Authors:
Wim Taymans <wim@fluendo.com>,
Thomas Vander Stichele <thomas@apestaart.org>
Copyright:
Copyright:
© 2004 Fluendo S.L.
© 2004 Wim Taymans <wim@fluendo.com>
© 2000 ymnk, JCraft,Inc.
......@@ -26,8 +26,8 @@ Cortado License:
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
On Debian systems, you can find the GPL license in:
/usr/share/common-licenses/GPL
On Debian systems, you can find the GPL license 2 in:
/usr/share/common-licenses/GPL-2
-------
......@@ -49,4 +49,4 @@ Smoke Codec and Jheora License:
------
The Debian packaging is © 2007, Varun Hiremath <varunhiremath@gmail.com> and
is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
is licensed under the GPL, see `/usr/share/common-licenses/GPL-2'.
debian/cortado.conf etc/apache2/conf-available
mv_conffile /etc/apache2/conf.d/cortado /etc/apache2/conf-available/cortado.conf
......@@ -2,26 +2,12 @@
set -e
TEMPLATE=/usr/share/doc/cortado/examples/apache2
TARGETDIR=/etc/apache2/conf.d
# install the apache2 config file only when apache2 is actually installed
install_config() {
if [ -x /etc/init.d/apache2 ]; then
ucf --three-way --debconf-ok $TEMPLATE $TARGETDIR/cortado
invoke-rc.d apache2 reload
fi
}
. /usr/share/debconf/confmodule
case "$1" in
configure|reconfigure)
install_config
;;
*)
echo "postinst called with unknown argument \`$1'" 1>&2
exit 1
configure)
if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
. /usr/share/apache2/apache2-maintscript-helper
apache2_invoke enconf cortado.conf || exit $?
fi
;;
esac
......
......@@ -2,24 +2,14 @@
set -e
CONFIGFILE=/etc/apache2/conf.d/cortado
purge_config()
{
rm -f $CONFIGFILE
if [ -x /usr/bin/ucf ]; then
ucf --purge $CONFIGFILE
fi
if [ -x /etc/init.d/apache2 ]; then
invoke-rc.d apache2 reload
fi
}
. /usr/share/debconf/confmodule
if [ "$1" = purge ]; then
purge_config
fi
case "$1" in
purge|remove)
if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
. /usr/share/apache2/apache2-maintscript-helper
apache2_invoke disconf cortado.conf || exit $?
fi
;;
esac
#DEBHELPER#
debian/apache2
debian/*.html
Description: Fix various build issues.
Author: Onkar Shinde <onkarshinde@ubuntu.com>
Index: cortado-0.5.1/build.xml
===================================================================
--- cortado-0.5.1.orig/build.xml 2009-11-10 22:07:40.000000000 +0530
......
Description: Add support for destdir.
Index: cortado-0.2.2/build.xml
===================================================================
--- cortado-0.2.2.orig/build.xml 2007-01-03 13:57:06.000000000 +0100
+++ cortado-0.2.2/build.xml 2007-01-03 13:58:18.000000000 +0100
@@ -27,6 +27,7 @@
<property name="exec_prefix" location="${prefix}" />
<property name="libdir" location="${exec_prefix}/lib" />
<property name="datadir" location="${prefix}/share" />
+ <property name="destdir" location="" />
<!-- read a file containing properties for plugins to build -->
<!--
@@ -580,8 +581,8 @@
<target name="install_applet" depends="applet"
description="install cortado applets">
<!-- Create the installation locations -->
- <mkdir dir="${datadir}/cortado"/>
- <copy todir="${datadir}/cortado">
+ <mkdir dir="${destdir}${datadir}/cortado"/>
+ <copy todir="${destdir}${datadir}/cortado">
<fileset dir="${out.dist}/applet">
<include name="cortado-*${product.version}*.jar"/>
</fileset>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment