Package: pcalendar
Version: 3.3.0-2
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu trusty ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * Merge from Debian unstable.  Remaining changes:
    - d/ant.properties,rules: Specify source/target = 1.5 to ensure
      backwards compatible bytecode is built.

Thanks for considering the patch.


-- System Information:
Debian Release: wheezy/sid
  APT prefers trusty-updates
  APT policy: (500, 'trusty-updates'), (500, 'trusty-security'), (500, 
'trusty'), (100, 'trusty-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.12.0-2-generic (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru pcalendar-3.3.0/debian/ant.properties pcalendar-3.3.0/debian/ant.properties
--- pcalendar-3.3.0/debian/ant.properties	1970-01-01 01:00:00.000000000 +0100
+++ pcalendar-3.3.0/debian/ant.properties	2013-11-12 11:19:07.000000000 +0000
@@ -0,0 +1,4 @@
+# Ensure that source and target are 1.5
+# For backwards compat on Java 7
+ant.build.javac.source=1.5
+ant.build.javac.target=1.5
diff -Nru pcalendar-3.3.0/debian/rules pcalendar-3.3.0/debian/rules
--- pcalendar-3.3.0/debian/rules	2012-10-16 12:27:02.000000000 +0100
+++ pcalendar-3.3.0/debian/rules	2013-11-12 11:24:44.000000000 +0000
@@ -9,3 +9,6 @@
 
 override_dh_installchangelogs:
 	dh_installchangelogs PeriodicCalendar/net/sf/linuxorg/pcal/docs/ChangeLog
+
+override_dh_auto_build:
+	ant -propertyfile debian/ant.properties

Reply via email to