[pkg-java] r17238 - in trunk/cortado/debian: . patches
Markus Koschany
apo-guest at alioth.debian.org
Sun Sep 22 16:23:18 UTC 2013
Author: apo-guest
Date: 2013-09-22 16:23:17 +0000 (Sun, 22 Sep 2013)
New Revision: 17238
Added:
trunk/cortado/debian/cortado.conf
trunk/cortado/debian/cortado.install
trunk/cortado/debian/cortado.maintscript
Removed:
trunk/cortado/debian/apache2
trunk/cortado/debian/patches/destdir.diff
Modified:
trunk/cortado/debian/README.Debian
trunk/cortado/debian/changelog
trunk/cortado/debian/compat
trunk/cortado/debian/control
trunk/cortado/debian/copyright
trunk/cortado/debian/cortado.postinst
trunk/cortado/debian/cortado.postrm
trunk/cortado/debian/examples
trunk/cortado/debian/patches/01_fix_build.diff
Log:
Debian release 0.6.0-2
- Adjust packaging for apache2.4 server.
- Fix RC bug #710263
- See changelog for further information.
Modified: trunk/cortado/debian/README.Debian
===================================================================
--- trunk/cortado/debian/README.Debian 2013-09-19 08:16:21 UTC (rev 17237)
+++ trunk/cortado/debian/README.Debian 2013-09-22 16:23:17 UTC (rev 17238)
@@ -2,13 +2,12 @@
-------------------------
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 @@
For your convenience there is a symlink cortado.jar that links to the 1.
version.
-
-Torsten Werner <twerner at debian.org> Wed Jan 3 17:41:26 CET 2007
-
+Markus Koschany <apo at gambaru.de> Sun Sep 22 15:19:16 CET 2013
Deleted: trunk/cortado/debian/apache2
===================================================================
--- trunk/cortado/debian/apache2 2013-09-19 08:16:21 UTC (rev 17237)
+++ trunk/cortado/debian/apache2 2013-09-22 16:23:17 UTC (rev 17238)
@@ -1,8 +0,0 @@
-# configuration file for cortado and apache2
-
-Alias /cortado /usr/share/cortado
-
-<Directory /usr/share/cortado>
- Options FollowSymlinks
-</Directory>
-
Modified: trunk/cortado/debian/changelog
===================================================================
--- trunk/cortado/debian/changelog 2013-09-19 08:16:21 UTC (rev 17237)
+++ trunk/cortado/debian/changelog 2013-09-22 16:23:17 UTC (rev 17238)
@@ -1,3 +1,34 @@
+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 at gambaru.de> Sun, 22 Sep 2013 17:38:39 +0200
+
cortado (0.6.0-1) unstable; urgency=low
* New upstream release
Modified: trunk/cortado/debian/compat
===================================================================
--- trunk/cortado/debian/compat 2013-09-19 08:16:21 UTC (rev 17237)
+++ trunk/cortado/debian/compat 2013-09-22 16:23:17 UTC (rev 17238)
@@ -1 +1 @@
-7
+9
Modified: trunk/cortado/debian/control
===================================================================
--- trunk/cortado/debian/control 2013-09-19 08:16:21 UTC (rev 17237)
+++ trunk/cortado/debian/control 2013-09-22 16:23:17 UTC (rev 17238)
@@ -2,17 +2,29 @@
Section: utils
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Varun Hiremath <varun at debian.org>, Torsten Werner <twerner at debian.org>, Onkar Shinde <onkarshinde at 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 at debian.org>,
+ Torsten Werner <twerner at debian.org>,
+ Onkar Shinde <onkarshinde at 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 @@
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
Modified: trunk/cortado/debian/copyright
===================================================================
--- trunk/cortado/debian/copyright 2013-09-19 08:16:21 UTC (rev 17237)
+++ trunk/cortado/debian/copyright 2013-09-22 16:23:17 UTC (rev 17238)
@@ -3,11 +3,11 @@
It was downloaded from http://theora.org/cortado/
-Upstream Authors:
+Upstream Authors:
Wim Taymans <wim at fluendo.com>,
Thomas Vander Stichele <thomas at apestaart.org>
-Copyright:
+Copyright:
© 2004 Fluendo S.L.
© 2004 Wim Taymans <wim at fluendo.com>
© 2000 ymnk, JCraft,Inc.
@@ -26,8 +26,8 @@
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 @@
------
The Debian packaging is © 2007, Varun Hiremath <varunhiremath at 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'.
Added: trunk/cortado/debian/cortado.conf
===================================================================
--- trunk/cortado/debian/cortado.conf (rev 0)
+++ trunk/cortado/debian/cortado.conf 2013-09-22 16:23:17 UTC (rev 17238)
@@ -0,0 +1,8 @@
+# configuration file for cortado and apache2
+
+Alias /cortado /usr/share/cortado
+
+<Directory /usr/share/cortado>
+ Options FollowSymlinks
+</Directory>
+
Added: trunk/cortado/debian/cortado.install
===================================================================
--- trunk/cortado/debian/cortado.install (rev 0)
+++ trunk/cortado/debian/cortado.install 2013-09-22 16:23:17 UTC (rev 17238)
@@ -0,0 +1 @@
+debian/cortado.conf etc/apache2/conf-available
Added: trunk/cortado/debian/cortado.maintscript
===================================================================
--- trunk/cortado/debian/cortado.maintscript (rev 0)
+++ trunk/cortado/debian/cortado.maintscript 2013-09-22 16:23:17 UTC (rev 17238)
@@ -0,0 +1 @@
+mv_conffile /etc/apache2/conf.d/cortado /etc/apache2/conf-available/cortado.conf
Modified: trunk/cortado/debian/cortado.postinst
===================================================================
--- trunk/cortado/debian/cortado.postinst 2013-09-19 08:16:21 UTC (rev 17237)
+++ trunk/cortado/debian/cortado.postinst 2013-09-22 16:23:17 UTC (rev 17238)
@@ -2,27 +2,13 @@
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
+ configure)
+ if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
+ . /usr/share/apache2/apache2-maintscript-helper
+ apache2_invoke enconf cortado.conf || exit $?
+ fi
;;
- *)
- echo "postinst called with unknown argument \`$1'" 1>&2
- exit 1
- ;;
esac
#DEBHELPER#
Modified: trunk/cortado/debian/cortado.postrm
===================================================================
--- trunk/cortado/debian/cortado.postrm 2013-09-19 08:16:21 UTC (rev 17237)
+++ trunk/cortado/debian/cortado.postrm 2013-09-22 16:23:17 UTC (rev 17238)
@@ -2,24 +2,14 @@
set -e
-CONFIGFILE=/etc/apache2/conf.d/cortado
+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
-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
-
#DEBHELPER#
Modified: trunk/cortado/debian/examples
===================================================================
--- trunk/cortado/debian/examples 2013-09-19 08:16:21 UTC (rev 17237)
+++ trunk/cortado/debian/examples 2013-09-22 16:23:17 UTC (rev 17238)
@@ -1,2 +1 @@
-debian/apache2
debian/*.html
Modified: trunk/cortado/debian/patches/01_fix_build.diff
===================================================================
--- trunk/cortado/debian/patches/01_fix_build.diff 2013-09-19 08:16:21 UTC (rev 17237)
+++ trunk/cortado/debian/patches/01_fix_build.diff 2013-09-22 16:23:17 UTC (rev 17238)
@@ -1,3 +1,5 @@
+Description: Fix various build issues.
+Author: Onkar Shinde <onkarshinde at ubuntu.com>
Index: cortado-0.5.1/build.xml
===================================================================
--- cortado-0.5.1.orig/build.xml 2009-11-10 22:07:40.000000000 +0530
Deleted: trunk/cortado/debian/patches/destdir.diff
===================================================================
--- trunk/cortado/debian/patches/destdir.diff 2013-09-19 08:16:21 UTC (rev 17237)
+++ trunk/cortado/debian/patches/destdir.diff 2013-09-22 16:23:17 UTC (rev 17238)
@@ -1,24 +0,0 @@
-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>
More information about the pkg-java-commits
mailing list