Author: onkarshinde-guest Date: 2009-11-10 17:07:04 +0000 (Tue, 10 Nov 2009) New Revision: 11048
Added: trunk/cortado/debian/patches/01_fix_build.diff Modified: trunk/cortado/debian/changelog trunk/cortado/debian/control trunk/cortado/debian/patches/series trunk/cortado/debian/rules trunk/cortado/debian/watch Log: cortado 0.5.1 almost ready Modified: trunk/cortado/debian/changelog =================================================================== --- trunk/cortado/debian/changelog 2009-11-10 12:29:24 UTC (rev 11047) +++ trunk/cortado/debian/changelog 2009-11-10 17:07:04 UTC (rev 11048) @@ -1,3 +1,9 @@ +cortado (0.5.1-1) UNRELEASED; urgency=low + + * New upstream release. (Closes: #553148) + + -- Onkar Shinde <onkarshi...@ubuntu.com> Tue, 10 Nov 2009 19:07:47 +0530 + cortado (0.2.2-4) unstable; urgency=low * Change Maintainer: Debian Java Maintainers. Modified: trunk/cortado/debian/control =================================================================== --- trunk/cortado/debian/control 2009-11-10 12:29:24 UTC (rev 11047) +++ trunk/cortado/debian/control 2009-11-10 17:07:04 UTC (rev 11048) @@ -2,14 +2,16 @@ Section: utils Priority: optional Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> -Uploaders: Varun Hiremath <va...@debian.org>, Torsten Werner <twer...@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.1 -Homepage: http://www.flumotion.net/cortado/ +Standards-Version: 3.8.3 +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/ Package: cortado Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends}, apache2-mpm-worker | apache2 | httpd, +Depends: ${misc:Depends}, apache2-mpm-worker | apache2 | httpd, ucf Description: streaming applet for Ogg formats By embedding the cortado applet in your website, you can give viewers access Added: trunk/cortado/debian/patches/01_fix_build.diff =================================================================== --- trunk/cortado/debian/patches/01_fix_build.diff (rev 0) +++ trunk/cortado/debian/patches/01_fix_build.diff 2009-11-10 17:07:04 UTC (rev 11048) @@ -0,0 +1,42 @@ +Index: cortado-0.5.1/build.xml +=================================================================== +--- cortado-0.5.1.orig/build.xml 2009-11-10 22:07:40.000000000 +0530 ++++ cortado-0.5.1/build.xml 2009-11-10 22:14:49.000000000 +0530 +@@ -675,7 +675,7 @@ + <delete dir="${out.build}"/> + <delete dir="${out.dist}/${build.type}" /> + <delete file="${src}/com/fluendo/player/Configure.java" /> +- <delete file="${src}/com/fluendo/jst/SourceInfo.java" /> ++ <!--delete file="${src}/com/fluendo/jst/SourceInfo.java" /--> + <delete file="${src}/cortado.spec" /> + </target> + +Index: cortado-0.5.1/scripts/get-revision +=================================================================== +--- cortado-0.5.1.orig/scripts/get-revision 2009-11-10 22:07:41.000000000 +0530 ++++ cortado-0.5.1/scripts/get-revision 2009-11-10 22:15:46.000000000 +0530 +@@ -1,2 +1,5 @@ + #!/bin/sh +-git describe --tags ++if test -x /usr/bin/git ++then ++ git describe --tags ++fi +Index: cortado-0.5.1/scripts/update-source-info +=================================================================== +--- cortado-0.5.1.orig/scripts/update-source-info 2009-11-10 22:07:41.000000000 +0530 ++++ cortado-0.5.1/scripts/update-source-info 2009-11-10 22:14:49.000000000 +0530 +@@ -23,8 +23,11 @@ + # if the file is not newer than the .git directory, leave it alone + if test ! -d $topsrcdir/.git + then +- echo "No top-level .git directory, leaving file alone." +- exit ++ if test -e $targetfile ++ then ++ echo "No top-level .git directory, leaving file alone." ++ exit ++ fi + fi + + # don't compare with .git dir; local modifications should also trigger Modified: trunk/cortado/debian/patches/series =================================================================== --- trunk/cortado/debian/patches/series 2009-11-10 12:29:24 UTC (rev 11047) +++ trunk/cortado/debian/patches/series 2009-11-10 17:07:04 UTC (rev 11048) @@ -1 +1 @@ -destdir.diff +01_fix_build.diff Modified: trunk/cortado/debian/rules =================================================================== --- trunk/cortado/debian/rules 2009-11-10 12:29:24 UTC (rev 11047) +++ trunk/cortado/debian/rules 2009-11-10 17:07:04 UTC (rev 11048) @@ -8,7 +8,7 @@ DEB_ANT_INSTALL_TARGET = install_applet DEB_ANT_CLEAN_TARGET = distclean -DEB_ANT_ARGS += -Dprefix=/usr -Dbuild.type=stripped -Ddestdir=$(DEB_DESTDIR) +DEB_ANT_ARGS += -Dprefix=$(CURDIR)/debian/cortado/usr -Dbuild.type=stripped -Dreal_version=$(DEB_UPSTREAM_VERSION) SHAREDIR := /usr/share/cortado install/cortado:: @@ -18,3 +18,6 @@ done dh_link $(SHAREDIR)/cortado-ovt-stripped-$(DEB_UPSTREAM_VERSION).jar \ $(SHAREDIR)/cortado.jar + +get-orig-source:: + uscan --force-download --rename Modified: trunk/cortado/debian/watch =================================================================== --- trunk/cortado/debian/watch 2009-11-10 12:29:24 UTC (rev 11047) +++ trunk/cortado/debian/watch 2009-11-10 17:07:04 UTC (rev 11048) @@ -1,2 +1,2 @@ version=3 -http://www.flumotion.net/src/cortado/cortado-([\d.]+)\.tar\.gz +http://www.flumotion.net/src/cortado/cortado-([\d.]+)\.tar\.gz debian uupdate _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits