tags 684305 + pending
thanks

Dear maintainer,

I've prepared an NMU for umlet (versioned as 11.3-5.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.

Regards.

-- 
 .''`.  Homepage: http://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06
 : :' : Debian GNU/Linux user, admin, and developer  -  http://www.debian.org/
 `. `'  Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe
   `-   NP: Mark Knopfler: Silvertown Blues
diff -Nru umlet-11.3/debian/changelog umlet-11.3/debian/changelog
--- umlet-11.3/debian/changelog	2013-01-22 21:33:11.000000000 +0100
+++ umlet-11.3/debian/changelog	2013-06-01 15:04:55.000000000 +0200
@@ -1,3 +1,19 @@
+umlet (11.3-5.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "Transition package to use default java implementation":
+    apply patch from Ubuntu / James Page:
+
+    Transition package to use default java implementation:
+    - d/control: Switch openjdk-6-jdk -> default-jdk.
+    - d/rules: Set JAVA_HOME = /usr/lib/jvm/default-java.
+
+    (Closes: #684305)
+
+  * debian/rules: pass -encoding to javac via jh_build call.
+
+ -- gregor herrmann <gre...@debian.org>  Sat, 01 Jun 2013 15:04:24 +0200
+
 umlet (11.3-5) unstable; urgency=low
 
   * improved command line script to handle whitespaces in filenames
diff -Nru umlet-11.3/debian/control umlet-11.3/debian/control
--- umlet-11.3/debian/control	2011-10-26 21:10:55.000000000 +0200
+++ umlet-11.3/debian/control	2013-06-01 14:56:14.000000000 +0200
@@ -2,12 +2,12 @@
 Section: devel
 Priority: extra
 Maintainer: Benjamin Mesing <bensm...@gmx.net>
-Build-Depends: debhelper (>= 5), javahelper, fastjar, openjdk-6-jdk, libbatik-java, fop, libavalon-framework-java, libxerces2-java, libjlibeps-java, libgnumail-java, libitext-java, liblog4j1.2-java, libecj-java, libjsyntaxpane-java
+Build-Depends: debhelper (>= 5), javahelper, fastjar, default-jdk, libbatik-java, fop, libavalon-framework-java, libxerces2-java, libjlibeps-java, libgnumail-java, libitext-java, liblog4j1.2-java, libecj-java, libjsyntaxpane-java
 Standards-Version: 3.9.2
 
 Package: umlet
 Architecture: all
-Depends: openjdk-6-jdk | java6-sdk, jarwrapper, java-wrappers, ${misc:Depends}, ${java:Depends}
+Depends: default-jdk | java6-sdk, jarwrapper, java-wrappers, ${misc:Depends}, ${java:Depends}
 Description: simple, text driven UML drawing tool
  UMLet is a UML tool aimed at providing a fast way of drawing 
  UML diagrams. UML elements are modified using text input instead 
diff -Nru umlet-11.3/debian/rules umlet-11.3/debian/rules
--- umlet-11.3/debian/rules	2011-10-26 21:08:03.000000000 +0200
+++ umlet-11.3/debian/rules	2013-06-01 15:06:21.000000000 +0200
@@ -7,7 +7,7 @@
 
 JAVADIR=/usr/share/java
 export CLASSPATH=$(JAVADIR)/ecj.jar:$(JAVADIR)/batik-all.jar:$(JAVADIR)/fop.jar:$(JAVADIR)/log4j-1.2.jar:$(JAVADIR)/net.sourceforge.jlibeps.jar:$(JAVADIR)/gnumail.jar:$(JAVADIR)/itext.jar:$(JAVADIR)/jsyntaxpane.jar
-export JAVA_HOME=/usr/lib/jvm/java-6-openjdk-$(DEB_HOST_ARCH)
+export JAVA_HOME=/usr/lib/jvm/default-java
 
 #export DH_VERBOSE=1
 get-orig-source:
@@ -31,7 +31,7 @@
 	# move unused source code out of the way
 	mv sourcefiles/src/com/baselet/plugin/ eclipse-plugin-source/ || true
 	mv sourcefiles/src/com/baselet/gui/eclipse/ eclipse-plugin-source/ || true
-	jh_build --no-javadoc umlet.jar sourcefiles/src
+	jh_build --no-javadoc -o"-encoding utf8" umlet.jar sourcefiles/src
 
 clean:
 	dh_testdir

Attachment: signature.asc
Description: Digital signature

Reply via email to