[Pkg-scala-commits] [scala] 01/02: Add files from the 2.9.2+dfsg-2 upload
Frank S. Thomas
fst at moszumanska.debian.org
Mon Jan 20 17:52:03 UTC 2014
This is an automated email from the git hooks/post-receive script.
fst pushed a commit to branch master
in repository scala.
commit ba4758592390ac98bd7d136daa6da92e3cb0f4f3
Author: Frank S. Thomas <fst at debian.org>
Date: Mon Jan 20 18:37:08 2014 +0100
Add files from the 2.9.2+dfsg-2 upload
---
debian/changelog | 14 ++
debian/control | 9 +-
..._HOME-and-TOOL_CLASSPATH-to-the-package-l.patch | 7 +-
debian/patches/0005-java7-compilation.patch | 259 +++++++++++++++++++++
debian/patches/remove-non-ascii-ftbfs.patch | 54 +++++
debian/patches/series | 2 +
debian/scala.lintian-overrides | 1 +
7 files changed, 336 insertions(+), 10 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 6194923..594f059 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+scala (2.9.2+dfsg-2) unstable; urgency=low
+
+ * Team upload.
+ * Add patch to remove non-ASCII characters from source file
+ * Build-dep on default-jdk instead of openjdk-6-jdk
+ Add patch to build with JDK7.
+ For scala and scala-library, update openjdk-6-jre dependency to 7.
+ (Closes: #720569)
+ * Bump Standards-Version to 3.9.5.
+ * Remove deprecated DMUA flag.
+ * Add lintian override for scala package description.
+
+ -- tony mancill <tmancill at debian.org> Thu, 26 Dec 2013 20:04:39 -0800
+
scala (2.9.2+dfsg-1) unstable; urgency=low
[ Frank S. Thomas ]
diff --git a/debian/control b/debian/control
index 510e236..d363de5 100644
--- a/debian/control
+++ b/debian/control
@@ -6,10 +6,9 @@ Uploaders:
Mehdi Dogguy <mehdi at debian.org>,
Min Huang <min.huang at alumni.usc.edu>,
Frank S. Thomas <fst at debian.org>
-DM-Upload-Allowed: yes
-Standards-Version: 3.9.3
+Standards-Version: 3.9.5
Build-Depends:
- openjdk-6-jdk | java-compiler,
+ default-jdk | java6-sdk,
ant,
ant-contrib,
ant-optional,
@@ -27,7 +26,7 @@ Package: scala
Architecture: all
Depends:
scala-library (= ${source:Version}),
- openjdk-6-jre | java6-runtime,
+ openjdk-7-jre | java7-runtime | java6-runtime,
libjansi-java,
${misc:Depends}
Suggests: scala-doc (>= ${source:Version})
@@ -48,7 +47,7 @@ Description: Scala programming language
Package: scala-library
Architecture: all
Depends:
- openjdk-6-jre | java6-runtime,
+ openjdk-7-jre | java7-runtime | java6-runtime,
${misc:Depends}
Description: Scala standard library
This run-time library is needed to run Scala programs. It also
diff --git a/debian/patches/0003-Adapt-SCALA_HOME-and-TOOL_CLASSPATH-to-the-package-l.patch b/debian/patches/0003-Adapt-SCALA_HOME-and-TOOL_CLASSPATH-to-the-package-l.patch
index e73fc93..e7d80d2 100644
--- a/debian/patches/0003-Adapt-SCALA_HOME-and-TOOL_CLASSPATH-to-the-package-l.patch
+++ b/debian/patches/0003-Adapt-SCALA_HOME-and-TOOL_CLASSPATH-to-the-package-l.patch
@@ -6,11 +6,9 @@ Subject: Adapt SCALA_HOME and TOOL_CLASSPATH to the package layout
.../scala/tools/ant/templates/tool-unix.tmpl | 29 +------------------
1 files changed, 2 insertions(+), 27 deletions(-)
-diff --git a/src/compiler/scala/tools/ant/templates/tool-unix.tmpl b/src/compiler/scala/tools/ant/templates/tool-unix.tmpl
-index a3dc582..c9a9c7b 100644
--- a/src/compiler/scala/tools/ant/templates/tool-unix.tmpl
+++ b/src/compiler/scala/tools/ant/templates/tool-unix.tmpl
-@@ -48,23 +48,7 @@ case "`uname`" in
+@@ -48,23 +48,7 @@
esac
# Finding the root folder for this Scala distribution
@@ -35,7 +33,7 @@ index a3dc582..c9a9c7b 100644
# Remove spaces from SCALA_HOME on windows
if $cygwin; then
-@@ -73,16 +57,7 @@ if $cygwin; then
+@@ -73,16 +57,7 @@
fi
# Constructing the extension classpath
@@ -53,4 +51,3 @@ index a3dc582..c9a9c7b 100644
CYGWIN_JLINE_TERMINAL=
if $cygwin; then
---
diff --git a/debian/patches/0005-java7-compilation.patch b/debian/patches/0005-java7-compilation.patch
new file mode 100644
index 0000000..70fb437
--- /dev/null
+++ b/debian/patches/0005-java7-compilation.patch
@@ -0,0 +1,259 @@
+Subject: update ComboBox.scala and ListView.scala to address FTBFS
+ with java7
+Origin: https://github.com/scala/scala/tree/java7
+Forwarded: not-needed
+
+--- a/src/swing/scala/swing/ComboBox.scala
++++ b/src/swing/scala/swing/ComboBox.scala
+@@ -1,17 +1,15 @@
+ /* __ *\
+ ** ________ ___ / / ___ Scala API **
+-** / __/ __// _ | / / / _ | (c) 2007-2011, LAMP/EPFL **
++** / __/ __// _ | / / / _ | (c) 2007-2013, LAMP/EPFL **
+ ** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
+ ** /____/\___/_/ |_/____/_/ | | **
+ ** |/ **
+ \* */
+
+-
+-
+ package scala.swing
+
+ import event._
+-import javax.swing.{JList, JComponent, JComboBox, JTextField, ComboBoxModel, AbstractListModel, ListCellRenderer}
++import javax.swing.{ JComponent, JComboBox, JTextField, ComboBoxModel, AbstractListModel, ListCellRenderer }
+ import java.awt.event.ActionListener
+
+ object ComboBox {
+@@ -120,10 +118,10 @@
+ implicit def floatEditor(c: ComboBox[Float]): Editor[Float] = new BuiltInEditor(c)(s => s.toFloat, s => s.toString)
+ implicit def doubleEditor(c: ComboBox[Double]): Editor[Double] = new BuiltInEditor(c)(s => s.toDouble, s => s.toString)
+
+- def newConstantModel[A](items: Seq[A]): ComboBoxModel = {
+- new AbstractListModel with ComboBoxModel {
++ def newConstantModel[A](items: Seq[A]): ComboBoxModel[A] = {
++ new AbstractListModel[A] with ComboBoxModel[A] {
+ private var selected: A = if (items.isEmpty) null.asInstanceOf[A] else items(0)
+- def getSelectedItem: AnyRef = selected.asInstanceOf[AnyRef]
++ def getSelectedItem = selected.asInstanceOf[AnyRef]
+ def setSelectedItem(a: Any) {
+ if ((selected != null && selected != a) ||
+ selected == null && a != null) {
+@@ -131,7 +129,7 @@
+ fireContentsChanged(this, -1, -1)
+ }
+ }
+- def getElementAt(n: Int) = items(n).asInstanceOf[AnyRef]
++ def getElementAt(n: Int) = items(n).asInstanceOf[A]
+ def getSize = items.size
+ }
+ }
+@@ -159,7 +157,7 @@
+ * @see javax.swing.JComboBox
+ */
+ class ComboBox[A](items: Seq[A]) extends Component with Publisher {
+- override lazy val peer: JComboBox = new JComboBox(ComboBox.newConstantModel(items)) with SuperMixin
++ override lazy val peer: JComboBox[A] = new JComboBox(ComboBox.newConstantModel(items)) with SuperMixin
+
+ object selection extends Publisher {
+ def index: Int = peer.getSelectedIndex
+@@ -184,7 +182,8 @@
+ * of the component to its own defaults _after_ the renderer has been
+ * configured. That's Swing's principle of most suprise.
+ */
+- def renderer: ListView.Renderer[A] = ListView.Renderer.wrap(peer.getRenderer)
++ def renderer: ListView.Renderer[A] = ListView.Renderer.wrap[A](peer.getRenderer.asInstanceOf[ListCellRenderer[A]])
++ // def renderer: ListView.Renderer[A] = ListView.Renderer.wrap[A](peer.getRenderer)
+ def renderer_=(r: ListView.Renderer[A]) { peer.setRenderer(r.peer) }
+
+ /* XXX: currently not safe to expose:
+@@ -203,8 +202,8 @@
+ peer.setEditor(editor(this).comboBoxPeer)
+ }
+
+- def prototypeDisplayValue: Option[A] = toOption[A](peer.getPrototypeDisplayValue)
++ def prototypeDisplayValue: Option[A] = Option(peer.getPrototypeDisplayValue)
+ def prototypeDisplayValue_=(v: Option[A]) {
+- peer.setPrototypeDisplayValue(v map toAnyRef orNull)
++ peer.setPrototypeDisplayValue((v map toAnyRef).orNull.asInstanceOf[A])
+ }
+ }
+--- a/src/swing/scala/swing/ListView.scala
++++ b/src/swing/scala/swing/ListView.scala
+@@ -1,6 +1,6 @@
+ /* __ *\
+ ** ________ ___ / / ___ Scala API **
+-** / __/ __// _ | / / / _ | (c) 2007-2011, LAMP/EPFL **
++** / __/ __// _ | / / / _ | (c) 2007-2013, LAMP/EPFL **
+ ** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
+ ** /____/\___/_/ |_/____/_/ | | **
+ ** |/ **
+@@ -24,21 +24,21 @@
+ val MultiInterval = Value(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION)
+ }
+
+- def wrap[A](c: JList) = new ListView[A] {
++ def wrap[A](c: JList[A]) = new ListView[A] {
+ override lazy val peer = c
+ }
+
+ object Renderer {
+- def wrap[A](r: ListCellRenderer): Renderer[A] = new Wrapped[A](r)
++ def wrap[A](r: ListCellRenderer[A]): Renderer[A] = new Wrapped[A](r)
+
+ /**
+ * Wrapper for <code>javax.swing.ListCellRenderer<code>s
+ */
+- class Wrapped[A](override val peer: ListCellRenderer) extends Renderer[A] {
+- def componentFor(list: ListView[_], isSelected: Boolean, focused: Boolean, a: A, index: Int) = {
++ class Wrapped[A](override val peer: ListCellRenderer[A]) extends Renderer[A] {
++ def componentFor(list: ListView[_ <: A], isSelected: Boolean, focused: Boolean, a: A, index: Int) = {
+ Component.wrap(peer.getListCellRendererComponent(list.peer, a, index, isSelected, focused).asInstanceOf[JComponent])
+ }
+- }
++ }
+
+ /**
+ * Returns a renderer for items of type <code>A</code>. The given function
+@@ -55,8 +55,8 @@
+ * </code>
+ */
+ def apply[A,B](f: A => B)(implicit renderer: Renderer[B]): Renderer[A] = new Renderer[A] {
+- def componentFor(list: ListView[_], isSelected: Boolean, focused: Boolean, a: A, index: Int): Component =
+- renderer.componentFor(list, isSelected, focused, f(a), index)
++ def componentFor(list: ListView[_ <: A], isSelected: Boolean, focused: Boolean, a: A, index: Int): Component =
++ renderer.componentFor(list.asInstanceOf[ListView[_ <: B]], isSelected, focused, f(a), index)
+ }
+ }
+
+@@ -69,11 +69,11 @@
+ * @see javax.swing.ListCellRenderer
+ */
+ abstract class Renderer[-A] {
+- def peer: ListCellRenderer = new ListCellRenderer {
+- def getListCellRendererComponent(list: JList, a: Any, index: Int, isSelected: Boolean, focused: Boolean) =
+- componentFor(ListView.wrap[A](list), isSelected, focused, a.asInstanceOf[A], index).peer
++ def peer: ListCellRenderer[_ >: A] = new ListCellRenderer[A] {
++ def getListCellRendererComponent(list: JList[_ <: A], a: A, index: Int, isSelected: Boolean, focused: Boolean) =
++ componentFor(ListView.wrap[A](list.asInstanceOf[JList[A]]), isSelected, focused, a, index).peer
+ }
+- def componentFor(list: ListView[_], isSelected: Boolean, focused: Boolean, a: A, index: Int): Component
++ def componentFor(list: ListView[_ <: A], isSelected: Boolean, focused: Boolean, a: A, index: Int): Component
+ }
+
+ /**
+@@ -110,7 +110,7 @@
+ /**
+ * Configures the component before returning it.
+ */
+- def componentFor(list: ListView[_], isSelected: Boolean, focused: Boolean, a: A, index: Int): Component = {
++ def componentFor(list: ListView[_ <: A], isSelected: Boolean, focused: Boolean, a: A, index: Int): Component = {
+ preConfigure(list, isSelected, focused, a, index)
+ configure(list, isSelected, focused, a, index)
+ component
+@@ -123,10 +123,10 @@
+ * that renders the string returned from an item's <code>toString</code>.
+ */
+ implicit object GenericRenderer extends Renderer[Any] {
+- override lazy val peer: ListCellRenderer = new DefaultListCellRenderer
+- def componentFor(list: ListView[_], isSelected: Boolean, focused: Boolean, a: Any, index: Int): Component = {
+- val c = peer.getListCellRendererComponent(list.peer, a, index, isSelected, focused).asInstanceOf[JComponent]
+- Component.wrap(c)
++ override lazy val peer: ListCellRenderer[Any] = (new DefaultListCellRenderer).asInstanceOf[ListCellRenderer[Any]]
++ def componentFor(list: ListView[_ <: Any], isSelected: Boolean, focused: Boolean, a: Any, index: Int): Component = {
++ val c = peer.getListCellRendererComponent(list.peer, a, index, isSelected, focused)
++ Component.wrap(c.asInstanceOf[JComponent])
+ }
+ }
+ }
+@@ -142,34 +142,34 @@
+ */
+ class ListView[A] extends Component {
+ import ListView._
+- override lazy val peer: JList = new JList with SuperMixin
++ override lazy val peer: JList[A] = new JList[A] with SuperMixin
+
+ def this(items: Seq[A]) = {
+ this()
+ listData = items
+ }
+
+- protected class ModelWrapper(val items: Seq[A]) extends AbstractListModel {
+- def getElementAt(n: Int) = items(n).asInstanceOf[AnyRef]
++ protected class ModelWrapper[A](val items: Seq[A]) extends AbstractListModel[A] {
++ def getElementAt(n: Int) = items(n)
+ def getSize = items.size
+ }
+
+ def listData: Seq[A] = peer.getModel match {
+- case model: ModelWrapper => model.items
+- case model @ _ => new Seq[A] { selfSeq =>
++ case model: ModelWrapper[a] => model.items
++ case model => new Seq[A] { selfSeq =>
+ def length = model.getSize
+ def iterator = new Iterator[A] {
+ var idx = 0
+ def next = { idx += 1; apply(idx-1) }
+ def hasNext = idx < selfSeq.length
+ }
+- def apply(n: Int) = model.getElementAt(n).asInstanceOf[A]
++ def apply(n: Int): A = model.getElementAt(n)
+ }
+ }
+
+ def listData_=(items: Seq[A]) {
+- peer.setModel(new AbstractListModel {
+- def getElementAt(n: Int) = items(n).asInstanceOf[AnyRef]
++ peer.setModel(new AbstractListModel[A] {
++ def getElementAt(n: Int) = items(n)
+ def getSize = items.size
+ })
+ }
+@@ -195,25 +195,12 @@
+ object indices extends Indices(peer.getSelectedIndices) {
+ def -=(n: Int): this.type = { peer.removeSelectionInterval(n,n); this }
+ def +=(n: Int): this.type = { peer.addSelectionInterval(n,n); this }
+- @deprecated("Use ListView.selection.leadIndex", "2.8.0")
+- def leadIndex: Int = peer.getSelectionModel.getLeadSelectionIndex
+- @deprecated("Use ListView.selection.anchorIndex", "2.8.0")
+- def anchorIndex: Int = peer.getSelectionModel.getAnchorSelectionIndex
+ }
+
+- @deprecated("Use ListView.selectIndices", "2.8.0")
+- def selectIndices(ind: Int*) = peer.setSelectedIndices(ind.toArray)
+-
+ /**
+ * The currently selected items.
+ */
+- object items extends scala.collection.SeqProxy[A] {
+- def self = peer.getSelectedValues.map(_.asInstanceOf[A])
+- @deprecated("Use ListView.selection.leadIndex", "2.8.0")
+- def leadIndex: Int = peer.getSelectionModel.getLeadSelectionIndex
+- @deprecated("Use ListView.selection.anchorIndex", "2.8.0")
+- def anchorIndex: Int = peer.getSelectionModel.getAnchorSelectionIndex
+- }
++ lazy val items = peer.getSelectedValues.map(_.asInstanceOf[A])
+
+ def intervalMode: IntervalMode.Value = IntervalMode(peer.getSelectionModel.getSelectionMode)
+ def intervalMode_=(m: IntervalMode.Value) { peer.getSelectionModel.setSelectionMode(m.id) }
+@@ -227,7 +214,7 @@
+ def adjusting = peer.getSelectionModel.getValueIsAdjusting
+ }
+
+- def renderer: ListView.Renderer[A] = ListView.Renderer.wrap(peer.getCellRenderer)
++ def renderer: ListView.Renderer[A] = ListView.Renderer.wrap[A](peer.getCellRenderer.asInstanceOf[ListCellRenderer[A]])
+ def renderer_=(r: ListView.Renderer[A]) { peer.setCellRenderer(r.peer) }
+
+ def fixedCellWidth = peer.getFixedCellWidth
+@@ -239,6 +226,11 @@
+ def prototypeCellValue: A = peer.getPrototypeCellValue.asInstanceOf[A]
+ def prototypeCellValue_=(a: A) { peer.setPrototypeCellValue(a) }
+
++ def visibleRowCount = peer.getVisibleRowCount
++ def visibleRowCount_=(n: Int) = peer.setVisibleRowCount(n)
++
++ def ensureIndexIsVisible(idx: Int) = peer.ensureIndexIsVisible(idx)
++
+ def selectionForeground: Color = peer.getSelectionForeground
+ def selectionForeground_=(c: Color) = peer.setSelectionForeground(c)
+ def selectionBackground: Color = peer.getSelectionBackground
diff --git a/debian/patches/remove-non-ascii-ftbfs.patch b/debian/patches/remove-non-ascii-ftbfs.patch
new file mode 100644
index 0000000..7f4ef77
--- /dev/null
+++ b/debian/patches/remove-non-ascii-ftbfs.patch
@@ -0,0 +1,54 @@
+--- a/src/jline/src/main/java/scala/tools/jline/UnixTerminal.java
++++ b/src/jline/src/main/java/scala/tools/jline/UnixTerminal.java
+@@ -33,7 +33,7 @@
+ * @author <a href="mailto:mwp1 at cornell.edu">Marc Prud'hommeaux</a>
+ * @author <a href="mailto:dwkemp at gmail.com">Dale Kemp</a>
+ * @author <a href="mailto:jason at planet57.com">Jason Dillon</a>
+- * @author <a href="mailto:jbonofre at apache.org">Jean-Baptiste Onofré</a>
++ * @author <a href="mailto:jbonofre at apache.org">Jean-Baptiste Onofre</a>
+ * @since 2.0
+ */
+ public class UnixTerminal
+@@ -245,4 +245,4 @@
+ return codes.get((short) code);
+ }
+ }
+-}
+\ No newline at end of file
++}
+--- a/src/jline/src/main/java/scala/tools/jline/internal/TerminalLineSettings.java
++++ b/src/jline/src/main/java/scala/tools/jline/internal/TerminalLineSettings.java
+@@ -22,7 +22,7 @@
+ * @author <a href="mailto:mwp1 at cornell.edu">Marc Prud'hommeaux</a>
+ * @author <a href="mailto:dwkemp at gmail.com">Dale Kemp</a>
+ * @author <a href="mailto:jason at planet57.com">Jason Dillon</a>
+- * @author <a href="mailto:jbonofre at apache.org">Jean-Baptiste Onofré</a>
++ * @author <a href="mailto:jbonofre at apache.org">Jean-Baptiste Onofre</a>
+ * @since 2.0
+ */
+ public final class TerminalLineSettings
+@@ -214,4 +214,4 @@
+ }
+ }
+ }
+-}
+\ No newline at end of file
++}
+--- a/src/jline/src/test/java/scala/tools/jline/internal/TerminalLineSettingsTest.java
++++ b/src/jline/src/test/java/scala/tools/jline/internal/TerminalLineSettingsTest.java
+@@ -8,7 +8,7 @@
+ /**
+ * Tests for the {@link TerminalLineSettings}.
+ *
+- * @author <a href="mailto:jbonofre at apache.org">Jean-Baptiste Onofré</a>
++ * @author <a href="mailto:jbonofre at apache.org">Jean-Baptiste Onofre</a>
+ */
+ public class TerminalLineSettingsTest
+ {
+@@ -143,4 +143,4 @@
+ assertEquals(32, settings.getProperty("rows", freeBsdSttySample));
+ }
+
+-}
+\ No newline at end of file
++}
diff --git a/debian/patches/series b/debian/patches/series
index 47fbde1..a2e8847 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,5 @@
+remove-non-ascii-ftbfs.patch
0001-Define-system-locations.patch
0002-Use-system-ant-contrib.jar.patch
0003-Adapt-SCALA_HOME-and-TOOL_CLASSPATH-to-the-package-l.patch
+0005-java7-compilation.patch
diff --git a/debian/scala.lintian-overrides b/debian/scala.lintian-overrides
new file mode 100644
index 0000000..a79fc95
--- /dev/null
+++ b/debian/scala.lintian-overrides
@@ -0,0 +1 @@
+scala: description-starts-with-package-name
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-scala/packages/scala.git
More information about the Pkg-scala-commits
mailing list