Author: onkarshinde-guest Date: 2010-02-21 05:45:50 +0000 (Sun, 21 Feb 2010) New Revision: 11662
Added: trunk/cortado/debian/cortado.postinst trunk/cortado/debian/cortado.postrm trunk/cortado/debian/libcortado-java.links Removed: trunk/cortado/debian/links trunk/cortado/debian/postinst trunk/cortado/debian/postrm Modified: trunk/cortado/debian/changelog trunk/cortado/debian/control trunk/cortado/debian/rules Log: Prepare cortado 0.5.2 Modified: trunk/cortado/debian/changelog =================================================================== --- trunk/cortado/debian/changelog 2010-02-20 23:50:52 UTC (rev 11661) +++ trunk/cortado/debian/changelog 2010-02-21 05:45:50 UTC (rev 11662) @@ -1,3 +1,18 @@ +cortado (0.5.2-1) unstable; urgency=low + + * New upstream release. + * debian/control + - Add a new package libcortado-java which other packages can use as + dependency without pulling apache. (Closes: 564621) + - Add appropriate depends/replaces for new package. + - Update standards version to 3.8.4. + * debian/rules, debian/libcortado-java.links + - Install jar files and symlinks in libcortado-java package. + * debian/cortado.postinst, debian/cortado.postrm + - Rename old files so that they belong to cortado package only. + + -- Onkar Shinde <onkarshi...@ubuntu.com> Fri, 19 Feb 2010 00:16:25 +0530 + cortado (0.5.1-1) unstable; urgency=low * New upstream release. (Closes: #553148) Modified: trunk/cortado/debian/control =================================================================== --- trunk/cortado/debian/control 2010-02-20 23:50:52 UTC (rev 11661) +++ trunk/cortado/debian/control 2010-02-21 05:45:50 UTC (rev 11662) @@ -4,7 +4,7 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: Varun Hiremath <va...@debian.org>, Torsten Werner <twer...@debian.org>, Onkar Shinde <onkarshi...@ubuntu.com> Build-Depends: debhelper (>= 5), cdbs, default-jdk, ant, junit, quilt -Standards-Version: 3.8.3 +Standards-Version: 3.8.4 Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/cortado/ Vcs-Browser: http://svn.debian.org/viewsvn/pkg-java/trunk/cortado/ Homepage: http://theora.org/cortado/ @@ -12,7 +12,7 @@ Package: cortado Architecture: all Depends: ${misc:Depends}, apache2-mpm-worker | apache2 | httpd, - ucf + ucf, libcortado-java (= ${binary:Version}) 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 @@ -24,3 +24,19 @@ The package will automatically be configured for apache2 but can be used with any other HTTP server. Some HTML files are included as examples of how to use the applet. + +Package: libcortado-java +Section: java +Architecture: all +Depends: ${misc:Depends} +Replaces: cortado (<< 0.5.2) +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 + providing multimedia files without the need for a locally installed media + player supporting the correct formats on the visitor's computer. Cortado + currently include Java decoders for Ogg Theora, Ogg Vorbis (the JOrbis + library), Mulaw audio, MJPEG and Flumotion's Smoke codec. + . + The package cotains the actual jar files that can be used by other programs to + provide Theora playback capability. Copied: trunk/cortado/debian/cortado.postinst (from rev 11648, trunk/cortado/debian/postinst) =================================================================== --- trunk/cortado/debian/cortado.postinst (rev 0) +++ trunk/cortado/debian/cortado.postinst 2010-02-21 05:45:50 UTC (rev 11662) @@ -0,0 +1,29 @@ +#!/bin/sh + +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 + ;; +esac + +#DEBHELPER# + Copied: trunk/cortado/debian/cortado.postrm (from rev 11648, trunk/cortado/debian/postrm) =================================================================== --- trunk/cortado/debian/cortado.postrm (rev 0) +++ trunk/cortado/debian/cortado.postrm 2010-02-21 05:45:50 UTC (rev 11662) @@ -0,0 +1,25 @@ +#!/bin/sh + +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 + +#DEBHELPER# + Copied: trunk/cortado/debian/libcortado-java.links (from rev 11648, trunk/cortado/debian/links) =================================================================== --- trunk/cortado/debian/libcortado-java.links (rev 0) +++ trunk/cortado/debian/libcortado-java.links 2010-02-21 05:45:50 UTC (rev 11662) @@ -0,0 +1,2 @@ +/usr/share/cortado/cortado.jar /usr/share/java/cortado.jar + Deleted: trunk/cortado/debian/links =================================================================== --- trunk/cortado/debian/links 2010-02-20 23:50:52 UTC (rev 11661) +++ trunk/cortado/debian/links 2010-02-21 05:45:50 UTC (rev 11662) @@ -1,2 +0,0 @@ -/usr/share/cortado/cortado.jar /usr/share/java/cortado.jar - Deleted: trunk/cortado/debian/postinst =================================================================== --- trunk/cortado/debian/postinst 2010-02-20 23:50:52 UTC (rev 11661) +++ trunk/cortado/debian/postinst 2010-02-21 05:45:50 UTC (rev 11662) @@ -1,29 +0,0 @@ -#!/bin/sh - -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 - ;; -esac - -#DEBHELPER# - Deleted: trunk/cortado/debian/postrm =================================================================== --- trunk/cortado/debian/postrm 2010-02-20 23:50:52 UTC (rev 11661) +++ trunk/cortado/debian/postrm 2010-02-21 05:45:50 UTC (rev 11662) @@ -1,25 +0,0 @@ -#!/bin/sh - -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 - -#DEBHELPER# - Modified: trunk/cortado/debian/rules =================================================================== --- trunk/cortado/debian/rules 2010-02-20 23:50:52 UTC (rev 11661) +++ trunk/cortado/debian/rules 2010-02-21 05:45:50 UTC (rev 11662) @@ -7,16 +7,16 @@ DEB_ANT_INSTALL_TARGET = install_applet DEB_ANT_CLEAN_TARGET = distclean -DEB_ANT_ARGS += -Dprefix=$(CURDIR)/debian/cortado/usr -Dbuild.type=stripped -Dreal_version=$(DEB_UPSTREAM_VERSION) +DEB_ANT_ARGS += -Dprefix=$(CURDIR)/debian/libcortado-java/usr -Dbuild.type=stripped -Dreal_version=$(DEB_UPSTREAM_VERSION) SHAREDIR := /usr/share/cortado -install/cortado:: +install/libcortado-java:: for type in ov ovt mmjs; do \ - dh_link $(SHAREDIR)/cortado-$${type}-stripped-$(DEB_UPSTREAM_VERSION).jar \ - $(SHAREDIR)/cortado-$${type}.jar; \ + ln -s $(SHAREDIR)/cortado-$${type}-stripped-$(DEB_UPSTREAM_VERSION).jar \ + $(CURDIR)/debian/libcortado-java/$(SHAREDIR)/cortado-$${type}.jar; \ done - dh_link $(SHAREDIR)/cortado-ovt-stripped-$(DEB_UPSTREAM_VERSION).jar \ - $(SHAREDIR)/cortado.jar + ln -s $(SHAREDIR)/cortado-ovt-stripped-$(DEB_UPSTREAM_VERSION).jar \ + $(CURDIR)/debian/libcortado-java/$(SHAREDIR)/cortado.jar get-orig-source:: uscan --force-download --rename _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
