diff -u writer2latex-1.0.2/debian/rules writer2latex-1.0.2/debian/rules --- writer2latex-1.0.2/debian/rules +++ writer2latex-1.0.2/debian/rules @@ -18,7 +18,7 @@ include /usr/share/dpatch/dpatch.make -export JAVA_HOME=/usr/lib/jvm/java-gcj +export JAVA_HOME=/usr/lib/jvm/default-java configure: configure-stamp configure-stamp: patch-stamp diff -u writer2latex-1.0.2/debian/changelog writer2latex-1.0.2/debian/changelog --- writer2latex-1.0.2/debian/changelog +++ writer2latex-1.0.2/debian/changelog @@ -1,3 +1,12 @@ +writer2latex (1.0.2-1ubuntu1) natty; urgency=low + + * Merge from debian unstable (LP: #683893). Remaining changes: + - (Build-)depend on default-jre/-jdk. + - debian/rules: Change the path of JAVA_HOME to suit with the + gcj-jdk -> default-jdk transition. + + -- Angel Abad Wed, 01 Dec 2010 22:41:23 +0100 + writer2latex (1.0.2-1) unstable; urgency=low * new upstream release @@ -5,6 +14,13 @@ -- Rene Engelhard Mon, 22 Nov 2010 00:44:13 +0100 +writer2latex (1.0-12ubuntu1) maverick; urgency=low + + * Merge from debian unstable. Remaining changes: + - (Build-)depend on default-jre/-jdk. + + -- Chris Cheney Sat, 05 Jun 2010 21:15:00 -0500 + writer2latex (1.0-12) unstable; urgency=medium * hack: remove Pre-Depends on openoffice.org-java-common again, add @@ -20,6 +36,13 @@ -- Rene Engelhard Tue, 16 Mar 2010 01:03:04 +0100 +writer2latex (1.0-10ubuntu1) lucid; urgency=low + + * Merge from debian testing. Remaining changes: + - (Build-)depend on default-jre/-jdk. + + -- Chris Cheney Wed, 31 Mar 2010 14:30:00 -0500 + writer2latex (1.0-10) unstable; urgency=low * build-depend on ant1.7 | ant (<< 1.8.0~) (closes: #571397) @@ -116,6 +139,13 @@ -- Rene Engelhard Wed, 15 Apr 2009 18:39:20 +0200 +writer2latex (0.5.0.2-4ubuntu1) karmic; urgency=low + + * Merge with Debian; remaining changes: + - (Build-)depend on default-jre/-jdk. + + -- Matthias Klose Sun, 17 May 2009 13:41:41 +0200 + writer2latex (0.5.0.2-4) unstable; urgency=low * add missing Build-Depends: on ure (closes: #521945) @@ -150,6 +180,13 @@ -- Rene Engelhard Tue, 29 Jul 2008 16:22:15 +0200 +writer2latex (0.5-8ubuntu1) intrepid; urgency=low + + * Merge from Debian unstable (LP: #244098), remaining Ubuntu changes: + - (Build-)depend on default-jre/-jdk. + + -- Luca Falavigna Mon, 04 Aug 2008 02:19:03 +0200 + writer2latex (0.5-8) unstable; urgency=high * add missing Depends: on ${misc:Depends} for writer2latex @@ -163,6 +200,13 @@ -- Rene Engelhard Wed, 09 Jul 2008 15:40:16 +0200 +writer2latex (0.5-6ubuntu1) intrepid; urgency=low + + * (Build-)depend on default-jre/-jdk. + * Set Ubuntu maintainer address. + + -- Matthias Klose Thu, 31 Jul 2008 08:17:33 +0000 + writer2latex (0.5-6) unstable; urgency=low * add missing -env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1 to the prerm diff -u writer2latex-1.0.2/debian/control writer2latex-1.0.2/debian/control --- writer2latex-1.0.2/debian/control +++ writer2latex-1.0.2/debian/control @@ -1,16 +1,17 @@ Source: writer2latex Section: text Priority: optional -Maintainer: Debian OpenOffice Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian OpenOffice Team Uploaders: Rene Engelhard , Chris Halls -Build-Depends: debhelper (>= 6.0.7~), ant, libxerces2-java, libxalan2-java, gcj-jdk, openoffice.org-java-common (>= 1:3.1.0~), ure (>= 1.4.1~), dpatch, tex-common +Build-Depends: debhelper (>= 6.0.7~), ant, libxerces2-java, libxalan2-java, default-jdk, openoffice.org-java-common (>= 1:3.1.0~), ure (>= 1.4.1~), dpatch, tex-common Build-Conflicts: openoffice.org-java-common (>= 1:3.3.0~), ant (= 1.8.0-1), ant (= 1.8.0-2), ant (= 1.8.0-3) Standards-Version: 3.7.2 Homepage: http://writer2latex.sourceforge.net Package: writer2latex Architecture: all -Depends: gij | java2-runtime, libwriter2latex-java, ${misc:Depends} +Depends: default-jre-headless | java2-runtime-headless, libwriter2latex-java, ${misc:Depends} Recommends: www-browser | x-www-browser | pdf-viewer | openoffice.org-writer Description: OpenOffice.org Writer/Calc to LaTeX/XHTML converter Writer2LaTeX is a utility written in java. It converts OpenOffice.org