[pkg-java] r18958 - trunk/cortado/debian

[Markus Koschany]

Author: apo-guest
Date: 2016-01-23 16:45:02 +0000 (Sat, 23 Jan 2016)
New Revision: 18958

Added:
   trunk/cortado/debian/libcortado-java.install
Modified:
   trunk/cortado/debian/README.Debian
   trunk/cortado/debian/changelog
   trunk/cortado/debian/control
   trunk/cortado/debian/libcortado-java.links
   trunk/cortado/debian/rules
Log:
Release 0.6.0-3


Modified: trunk/cortado/debian/README.Debian
===================================================================
--- trunk/cortado/debian/README.Debian	2016-01-20 14:35:12 UTC (rev 18957)
+++ trunk/cortado/debian/README.Debian	2016-01-23 16:45:02 UTC (rev 18958)
@@ -16,4 +16,3 @@
 For your convenience there is a symlink cortado.jar that links to the 1.
 version.
 
-Markus Koschany <apo at gambaru.de> Sun Sep  22 15:19:16 CET 2013

Modified: trunk/cortado/debian/changelog
===================================================================
--- trunk/cortado/debian/changelog	2016-01-20 14:35:12 UTC (rev 18957)
+++ trunk/cortado/debian/changelog	2016-01-23 16:45:02 UTC (rev 18958)
@@ -1,3 +1,16 @@
+cortado (0.6.0-3) unstable; urgency=medium
+
+  * Team upload.
+  * Vcs-Browser: Use https.
+  * Declare compliance with Debian Policy 3.9.6.
+  * Remove Onkar Shinde from Uploaders. He is not active anymore.
+  * Switch from cdbs to dh sequencer.
+  * Make the build reproducible by using SOURCE_DATE_EPOCH and the latest
+    changelog timestamp. Thanks to Dhole for the report and patch.
+    (Closes: #794248)
+
+ -- Markus Koschany <apo at debian.org>  Sat, 23 Jan 2016 17:37:58 +0100
+
 cortado (0.6.0-2) unstable; urgency=low
 
   * Team upload.

Modified: trunk/cortado/debian/control
===================================================================
--- trunk/cortado/debian/control	2016-01-20 14:35:12 UTC (rev 18957)
+++ trunk/cortado/debian/control	2016-01-23 16:45:02 UTC (rev 18958)
@@ -5,16 +5,14 @@
 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
+Standards-Version: 3.9.6
 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/cortado/
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/cortado/
+Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-java/trunk/cortado/
 Homepage: http://theora.org/cortado/
 
 Package: cortado

Added: trunk/cortado/debian/libcortado-java.install
===================================================================
--- trunk/cortado/debian/libcortado-java.install	                        (rev 0)
+++ trunk/cortado/debian/libcortado-java.install	2016-01-23 16:45:02 UTC (rev 18958)
@@ -0,0 +1 @@
+output/dist/applet/*.jar usr/share/cortado

Modified: trunk/cortado/debian/libcortado-java.links
===================================================================
--- trunk/cortado/debian/libcortado-java.links	2016-01-20 14:35:12 UTC (rev 18957)
+++ trunk/cortado/debian/libcortado-java.links	2016-01-23 16:45:02 UTC (rev 18958)
@@ -1,2 +1,6 @@
-/usr/share/cortado/cortado.jar /usr/share/java/cortado.jar
+usr/share/cortado/cortado-ovt-stripped-0.6.0.jar    usr/share/java/cortado.jar
+usr/share/cortado/cortado-mmjs-stripped-0.6.0.jar   usr/share/cortado/cortado-mmjs.jar
+usr/share/cortado/cortado-ov-stripped-0.6.0.jar     usr/share/cortado/cortado-ov.jar
+usr/share/cortado/cortado-ovt-stripped-0.6.0.jar    usr/share/cortado/cortado-ovt.jar
+usr/share/cortado/cortado-ovtk-stripped-0.6.0.jar   usr/share/cortado/cortado-ovtk.jar
 

Modified: trunk/cortado/debian/rules
===================================================================
--- trunk/cortado/debian/rules	2016-01-20 14:35:12 UTC (rev 18957)
+++ trunk/cortado/debian/rules	2016-01-23 16:45:02 UTC (rev 18958)
@@ -1,22 +1,22 @@
 #!/usr/bin/make -f
+export JAVA_HOME=/usr/lib/jvm/default-java
+export SOURCE_DATE_EPOCH = $(shell date -d "$$(dpkg-parsechangelog --count 1 -SDate)" +%s)
+PKD := $(abspath $(dir $(MAKEFILE_LIST)))
+DEB_UPSTREAM_VERSION := $(shell dpkg-parsechangelog -l$(PKD)/changelog -SVersion | cut -d- -f1)
 
-include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
+%:
+	dh $@ --parallel --buildsystem=ant
 
-JAVA_HOME = /usr/lib/jvm/default-java
+override_dh_auto_build:
+	dh_auto_build -- \
+		-Dprefix=$(CURDIR)/debian/libcortado-java/usr \
+		-Dbuild.type=stripped \
+		-Dreal_version=$(DEB_UPSTREAM_VERSION) \
+		-DDATE=$(shell date -u -d @$(SOURCE_DATE_EPOCH) +"%Y-%m-%d") \
+		install_applet
 
-DEB_ANT_INSTALL_TARGET = install_applet
-DEB_ANT_CLEAN_TARGET = distclean
-DEB_ANT_ARGS += -Dprefix=$(CURDIR)/debian/libcortado-java/usr -Dbuild.type=stripped -Dreal_version=$(DEB_UPSTREAM_VERSION)
+override_dh_auto_clean:
+	dh_auto_clean -- distclean
 
-SHAREDIR := /usr/share/cortado
-install/libcortado-java::
-	for type in ov ovt mmjs; do \
-	  ln -s $(SHAREDIR)/cortado-$${type}-stripped-$(DEB_UPSTREAM_VERSION).jar \
-	    $(CURDIR)/debian/libcortado-java/$(SHAREDIR)/cortado-$${type}.jar; \
-	done
-	ln -s $(SHAREDIR)/cortado-ovt-stripped-$(DEB_UPSTREAM_VERSION).jar \
-	  $(CURDIR)/debian/libcortado-java/$(SHAREDIR)/cortado.jar
-
 get-orig-source::
-	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
+	uscan --download-current-version --force-download --rename