debian/0000755000000000000000000000000012257205554007175 5ustar debian/scala-doc.doc-base0000644000000000000000000000044112257205500012410 0ustar Document: scala-doc Title: Scala API Documentation Author: The Scala Development Team Abstract: This manual describes the API of the programming language Scala. Section: Programming/Scala Format: HTML Index: /usr/share/doc/scala-doc/html/index.html Files: /usr/share/doc/scala-doc/html/* debian/scala.pom.xml.in0000644000000000000000000000067012257205500012173 0ustar 4.0.0 org.scala-lang scala-compiler jar @VERSION@ debian/scala-library.dirs0000644000000000000000000000001712257205500012572 0ustar usr/share/java debian/scala.jlibs0000644000000000000000000000010012257205500011263 0ustar dists/latest/lib/scala-compiler.jar dists/latest/lib/scalap.jar debian/scala-doc.install0000644000000000000000000000033712257205500012405 0ustar dists/latest/doc/scala-devel-docs/api/* usr/share/doc/scala-doc/html/ dists/latest/doc/scala-devel-docs/examples/* usr/share/doc/scala-doc/examples/ dists/latest/doc/scala-devel-docs/tools/* usr/share/doc/scala-doc/tools/ debian/clean0000644000000000000000000000006212257205500010167 0ustar debian/scala-library.pom.xml debian/scala.pom.xml debian/watch0000644000000000000000000000021512257205500010213 0ustar version=3 opts="dversionmangle=s/\+dfsg[\.\d]*$//" \ http://www.scala-lang.org/downloads \ /downloads/distrib/files/scala-sources-(.*)\.tgz debian/rules0000755000000000000000000000145312257205500010247 0ustar #!/usr/bin/make -f export DH_VERBOSE=1 include $(CURDIR)/build.number BUNDLE_VERSION="$(version.major).$(version.minor).$(version.patch)" override_dh_auto_build: # Build Jline ant -f debian/build-jline.xml -propertyfile debian/ant-jline.properties # Build Scala ANT_OPTS="-Xmx1024M -Xss64M" ant -Dversion.number=$(BUNDLE_VERSION) fastdist for file in scala scala-library; do \ sed "s/@VERSION@/$(BUNDLE_VERSION)/" debian/$${file}.pom.xml.in > debian/$${file}.pom.xml; \ done override_dh_auto_clean: rm -rf build dist override_dh_compress: dh_compress -X.js -X.scala # dh_compress is executed after mh_installpoms and mh_linkjars # ugly hack to fix #654549 find debian/scala \( -type f -or -type l \) -name "scala-library*.jar" -delete %: dh $@ --with javahelper --with jh_maven_repo_helper debian/changelog0000644000000000000000000002224712257205500011045 0ustar 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 Thu, 26 Dec 2013 20:04:39 -0800 scala (2.9.2+dfsg-1) unstable; urgency=low [ Frank S. Thomas ] * New upstream release (LP: #987205). - Use "+dfsg" as suffix for the tarball (Closes: #641249). * Update debian/copyright to version 1.0 of the copyright format. * Bump standards version from 3.9.2 to 3.9.3. * Updated debian/watch to match the new names of the source tarballs (LP: #987561). [ Mehdi Dogguy ] * Release to unstable. -- Mehdi Dogguy Mon, 14 May 2012 13:48:14 +0200 scala (2.9.1.dfsg-3) unstable; urgency=low * Do not link to scala-library.jar in scala package (Closes: #654549). * Add jansi.jar to Scala's TOOL_CLASSPATH. -- Mehdi Dogguy Wed, 04 Jan 2012 11:46:39 +0100 scala (2.9.1.dfsg-2) unstable; urgency=low [ Frank S. Thomas ] * debian/copyright: Added missing Copyright fields and a License paragraph. [ Mehdi Dogguy ] * Build and install jline.jar, instead of relying on upstream's provided jline.jar (Closes: #652072). - Add junit4 and libjansi-java to Build-Depends. - Add libjansi-java to Scala's Depends field. * Provide Maven artifacts for scala-{library,compiler}, Thanks to Thomas Koch for the patch. (Closes: #652024). * Install scalacheck.jar and scala-partest.jar. - Mention it in scala-library's long description. * Add 0001-Use-system-ant-contrib.jar.patch -- Mehdi Dogguy Wed, 28 Dec 2011 12:53:49 +0100 scala (2.9.1.dfsg-1) unstable; urgency=low [ Frank S. Thomas ] * Let scala suggest scala-doc (Closes: #632820). * Bump standards version to 3.9.2. * Add myself to Uploaders. * Use upstream's command scripts instead of the custom scripts in debian/command-scripts/. - These properly restore the terminal settings (Closes: #631771). - Added debian/patches/0002-Adapt-tool-unix.tmpl.patch to adapt the template that is used for the scripts to the layout of these packages. [ Mehdi Dogguy ] * New upstream release (Closes: #639960). * Use upstream's copy of jquery library. Scala-doc uses jQuery 1.4 and is not compatible with 1.6 (yet), which got uploaded recently. (Closes: #636870). - Remove links created to system jquery{,ui}.js files - Remove dependencies of scala-doc on libjs-jquery{,ui}. -- Frank S. Thomas Wed, 07 Sep 2011 22:41:07 +0200 scala (2.9.0.1.dfsg-1) unstable; urgency=low [ Mehdi Dogguy ] * New upstream release (Closes: #631429) (LP: #782013). * Refresh patch. * Use Scala's provided JLine 2, instead of libjline-java. * Make scala-doc depends on libjs-jquery{,ui}. * Fix package description to make lintian happy. [ Frank S. Thomas ] * Updated debian/copyright for Scala 2.9.0.1. * Lintian recommends to refer to /u/s/common-licenses/GPL. * Fix spelling error in changelog. * Remove copyright information about docs/android-examples. -- Mehdi Dogguy Fri, 24 Jun 2011 14:31:05 +0200 scala (2.8.1.dfsg-1) unstable; urgency=low [ Mehdi Dogguy ] * New upstream release (Closes: #589110, #603529) (LP: #717745). * Use upstream build system (and re-write packaging). * Set a fixed version number (The one from META-INF/MANIFEST.MF). * Remove README{,.Debian}: they used to contain useless and outdated information. * Added a dependency on libjline-java for Scala. * Add libmaven-ant-tasks-java, ant-contrib and ant-optional in Build-Depends. * Switch to source format 3.0 (quilt). * Add patch 0001-Use-system-ant-contrib.jar.patch * Bump standards version to 3.9.1 [ Frank S. Thomas ] * Update debian/copyright for the new release. -- Mehdi Dogguy Sat, 05 Mar 2011 20:41:44 +0100 scala (2.7.7.dfsg-4) unstable; urgency=low * Fix scaladoc script to use $CLASSPATH variable -- Mehdi Dogguy Tue, 23 Mar 2010 13:20:41 +0100 scala (2.7.7.dfsg-3) unstable; urgency=low * Fix scalac script (use $CLASSPATH variable), (LP: #544481) * Adjust the JRE/JVM depends (Closes: #573384) -- Mehdi Dogguy Tue, 23 Mar 2010 12:53:15 +0100 scala (2.7.7.dfsg-2) unstable; urgency=low * Fix scaladoc script (LP: #521093) -- Mehdi Dogguy Fri, 12 Feb 2010 21:15:06 +0100 scala (2.7.7.dfsg-1) unstable; urgency=low * New upstream release (Closes: #551454). -- Mehdi Dogguy Sat, 31 Oct 2009 21:16:38 +0100 scala (2.7.5.dfsg-2) unstable; urgency=low [ Min Huang ] * Do not compress script.js (Closes: #545051). [ Mehdi Dogguy ] * Use my Debian address. * Build-depend on debhelper 7.0.50 since we use overrides. -- Min Huang Sun, 06 Sep 2009 12:54:53 +0200 scala (2.7.5.dfsg-1) unstable; urgency=low * New Upstream Version * Remove Lex Spoon from uploaders (retired), closes: #527957. * Shorten debian/rules: using new features of debhelper 7 -- Mehdi Dogguy Tue, 02 Jun 2009 19:45:47 +0200 scala (2.7.4.dfsg-1) unstable; urgency=low * New Upstream Version * Add a watch file. * Add ${misc:Depends} as a dependency, thanks lintian. * Triggering doc-base. * Moving doc to /usr/share/doc/scala-doc/html/. * Bump standards version to 3.8.1. * Scala now depends on scala-library ${Source:Version} * Remove windows DLLs from upstream sources. -- Mehdi Dogguy Fri, 24 Apr 2009 17:59:12 +0200 scala (2.7.3-3) unstable; urgency=low * Adding « java-virtual-machine » as an alternative runtime dependency (Closes: #464552). * Switch arch back to « all ». -- Mehdi Dogguy Mon, 02 Feb 2009 17:36:22 +0100 scala (2.7.3-2) unstable; urgency=low * Add Homepage field in debian/control * Fix debian/rules to execute binary-arch target. * Scala and Scala-library depend now on openjdk6-jre as an alternative to the virtual package java-virtual-machine, thanks Lintian. -- Mehdi Dogguy Tue, 27 Jan 2009 11:20:34 +0100 scala (2.7.3-1) unstable; urgency=low [ Min Huang ] * New upstream release * Crash with OpenJDK installed is fixed (Closes: #505913) [ Mehdi Dogguy ] * Set Maintainer to "Debian Scala Maintainers" mailing-list and Min as Uploader. * Restrict "Architecture" field to build only where the java compiler exists (Closes: #483412). -- Lex Spoon Sat, 24 Jan 2009 20:32:34 -0500 scala (2.7.2-2) unstable; urgency=low * Recompiling to upload on Min Huang's behalf. -- Lex Spoon Sun, 30 Nov 2008 15:52:21 -0500 scala (2.7.2-1) unstable; urgency=low [ Min Huang ] * New upstream release. * Fixed out of memory error while building (Closes: #443040). * The pwd is added to the classpath when running scala. Also, any command line arguments are passed to scala (Closes: #470667). [ Mehdi Dogguy ] * Using debhelper 7 * Bump standards version to 3.8.0, no changes needed. * Relax build dependency by removing gcj from it. * Add a scala-doc package which install API html files. -- Mehdi Dogguy Sat, 15 Nov 2008 12:31:10 +0100 scala (2.7.1-1) unstable; urgency=low * New upstream release -- Min Huang Fri, 22 Aug 2008 00:57:33 -0700 scala (2.6.0-1) unstable; urgency=low * New upstream release -- Lex Spoon Fri, 14 Sep 2007 15:22:05 +0100 scala (2.5.0-1) unstable; urgency=low * New upstream release * Depend only on java-gcj-compat, not java-gcj-compat-dev -- Lex Spoon Tue, 22 May 2007 16:51:47 +0200 scala (2.4.0-1) unstable; urgency=low * New upstream version. * Deleting all mention of the Sun JVM, just because some DD's find it bothersome. * Deleted mention of JDK5-specific classes, while awaiting the Sun JVM to become open source. (Closes: #409785) * Added java-gcj-compat-dev as an install dependency. (Closes: #408353) -- Lex Spoon Sun, 25 Mar 2007 11:56:18 +0200 scala (2.3.2-1) unstable; urgency=low * New upstream version -- Lex Spoon Fri, 19 Jan 2007 14:45:51 +0100 scala (2.3.0-1) unstable; urgency=low * New upstream version * Added a Java compiler as a build-dependency -- Lex Spoon Fri, 24 Nov 2006 16:02:09 +0100 scala (2.2.0-1) unstable; urgency=low * New upstream release -- Lex Spoon Mon, 30 Oct 2006 21:35:10 -0500 scala (2.1.5-2) unstable; urgency=low * Rearranged to have three packages instead of four. -- Lex Spoon Wed, 28 Jun 2006 17:16:02 +0200 scala (2.1.5-1) unstable; urgency=low * upstream update. -- Lex Spoon Sun, 9 Jun 2006 14:45:26 +0100 scala (2.1.1-1) unstable; urgency=low * Initial Release. -- Lex Spoon Sun, 26 Mar 2006 14:45:26 +0100 debian/scala-doc.links0000644000000000000000000000025612257205500012057 0ustar #usr/share/javascript/jquery/jquery.js usr/share/doc/scala-doc/html/lib/jquery.js #usr/share/javascript/jquery-ui/jquery-ui.js usr/share/doc/scala-doc/html/lib/jquery-ui.js debian/build-jline.xml0000644000000000000000000000226112257205500012105 0ustar debian/scala.poms0000644000000000000000000000005712257205500011151 0ustar debian/scala.pom.xml --usj-name=scala-compiler debian/simpbuild.xml0000644000000000000000000005751412257205500011712 0ustar
debian/scala-library.jlibs0000644000000000000000000000031112257205500012731 0ustar dists/latest/lib/scala-library.jar dists/latest/lib/scala-dbc.jar dists/latest/lib/scala-swing.jar dists/latest/lib/scala-partest.jar dists/latest/lib/scalacheck.jar dists/latest/lib/scala-partest.jar debian/patches/0000755000000000000000000000000012257205500010613 5ustar debian/patches/remove-non-ascii-ftbfs.patch0000644000000000000000000000357212257205500016120 0ustar --- 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 Marc Prud'hommeaux * @author Dale Kemp * @author Jason Dillon - * @author Jean-Baptiste Onofré + * @author Jean-Baptiste Onofre * @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 Marc Prud'hommeaux * @author Dale Kemp * @author Jason Dillon - * @author Jean-Baptiste Onofré + * @author Jean-Baptiste Onofre * @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 Jean-Baptiste Onofré + * @author Jean-Baptiste Onofre */ public class TerminalLineSettingsTest { @@ -143,4 +143,4 @@ assertEquals(32, settings.getProperty("rows", freeBsdSttySample)); } -} \ No newline at end of file +} debian/patches/series0000644000000000000000000000030312257205500012024 0ustar 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 debian/patches/0005-java7-compilation.patch0000644000000000000000000002737012257205500015553 0ustar 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 javax.swing.ListCellRenderers */ - 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 A. The given function @@ -55,8 +55,8 @@ * */ 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 toString. */ 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 debian/patches/0001-Define-system-locations.patch0000644000000000000000000000250112257205500016715 0ustar From: Mehdi Dogguy Date: Thu, 15 Dec 2011 21:38:12 +0100 Subject: Define system locations --- build.xml | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/build.xml b/build.xml index 2281613..f77c225 100644 --- a/build.xml +++ b/build.xml @@ -141,6 +141,10 @@ PROPERTIES + + + + @@ -159,6 +163,11 @@ PROPERTIES + + + + + -- debian/patches/0003-Adapt-SCALA_HOME-and-TOOL_CLASSPATH-to-the-package-l.patch0000644000000000000000000000306212257205500022634 0ustar From: "Frank S. Thomas" Date: Wed, 7 Sep 2011 20:41:30 +0000 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(-) --- a/src/compiler/scala/tools/ant/templates/tool-unix.tmpl +++ b/src/compiler/scala/tools/ant/templates/tool-unix.tmpl @@ -48,23 +48,7 @@ esac # Finding the root folder for this Scala distribution -SOURCE=$0; -SCRIPT=`basename "$SOURCE"`; -while [ -h "$SOURCE" ]; do - SCRIPT=`basename "$SOURCE"`; - LOOKUP=`ls -ld "$SOURCE"`; - TARGET=`expr "$LOOKUP" : '.*-> \(.*\)$'`; - if expr "${TARGET:-.}/" : '/.*/$' > /dev/null; then - SOURCE=${TARGET:-.}; - else - SOURCE=`dirname "$SOURCE"`/${TARGET:-.}; - fi; -done; - -# see #2092 -SCALA_HOME=`dirname "$SOURCE"` -SCALA_HOME=`cd "$SCALA_HOME"; pwd -P` -SCALA_HOME=`cd "$SCALA_HOME"/..; pwd` +SCALA_HOME="/usr/share/java" # Remove spaces from SCALA_HOME on windows if $cygwin; then @@ -73,16 +57,7 @@ fi # Constructing the extension classpath -TOOL_CLASSPATH="@classpath@" -if [ -z "$TOOL_CLASSPATH" ] ; then - for ext in "$SCALA_HOME"/lib/* ; do - if [ -z "$TOOL_CLASSPATH" ] ; then - TOOL_CLASSPATH="$ext" - else - TOOL_CLASSPATH="$TOOL_CLASSPATH:$ext" - fi - done -fi +TOOL_CLASSPATH="$SCALA_HOME/scala-compiler.jar:$SCALA_HOME/scala-library.jar:$SCALA_HOME/scalap.jar:$SCALA_HOME/scala/jline.jar:$SCALA_HOME/jansi.jar" CYGWIN_JLINE_TERMINAL= if $cygwin; then debian/patches/0002-Use-system-ant-contrib.jar.patch0000644000000000000000000000160212257205500017261 0ustar From: Mehdi Dogguy Date: Thu, 23 Jun 2011 23:12:28 +0200 Subject: Use system ant-contrib.jar --- build.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build.xml b/build.xml index f77c225..33db14a 100644 --- a/build.xml +++ b/build.xml @@ -220,7 +220,7 @@ INITIALISATION - + -- debian/scala.lintian-overrides0000644000000000000000000000005412257205500013626 0ustar scala: description-starts-with-package-name debian/scala.dirs0000644000000000000000000000005412257205500011131 0ustar usr/bin usr/share/java usr/share/java/scala debian/scala.manpages0000644000000000000000000000007312257205500011764 0ustar dists/latest/man/man1/scala*.1 dists/latest/man/man1/fsc.1 debian/source/0000755000000000000000000000000012257205500010464 5ustar debian/source/format0000644000000000000000000000001412257205500011672 0ustar 3.0 (quilt) debian/scala-library.pom.xml.in0000644000000000000000000000066712257205500013643 0ustar 4.0.0 org.scala-lang scala-library jar @VERSION@ debian/compat0000644000000000000000000000000212257205500010362 0ustar 7 debian/scala-library.poms0000644000000000000000000000006612257205500012613 0ustar debian/scala-library.pom.xml --usj-name=scala-library debian/copyright0000644000000000000000000001472712257205500011132 0ustar Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: Scala Source: http://www.scala-lang.org/ Files: * Copyright: © 2002-2011 LAMP/EPFL, Lausanne License: BSD-3-clause SCALA LICENSE . Copyright (c) 2002-2011 EPFL, Lausanne, unless otherwise specified. All rights reserved. . This software was developed by the Programming Methods Laboratory of the Swiss Federal Institute of Technology (EPFL), Lausanne, Switzerland. Files: src/actors/scala/actors/Linked*.java Copyright: released into the public domain by Doug Lea License: public-domain Originally written by Doug Lea and released into the public domain. This may be used for any purposes whatsoever without acknowledgment. Files: src/actors/scala/actors/threadpool/* Copyright: released into the public domain by Dawid Kurzyniec et al. License: public-domain These files contain the following statements: . Written by Dawid Kurzyniec and released to the public domain, as explained at http://creativecommons.org/licenses/publicdomain . Written by Dawid Kurzyniec, based on public domain code written by Doug Lea and publicly available documentation, and released to the public domain, as explained at http://creativecommons.org/licenses/publicdomain . Written by Dawid Kurzyniec, based on code written by Doug Lea with assistance from members of JCP JSR-166 Expert Group. Released to the public domain, as explained at http://creativecommons.org/licenses/publicdomain . Originally written by Doug Lea and released into the public domain. This may be used for any purposes whatsoever without acknowledgment. . Written by Doug Lea with assistance from members of JCP JSR-166 Expert Group and released to the public domain, as explained at http://creativecommons.org/licenses/publicdomain Files: src/compiler/scala/tools/nsc/doc/html/resource/lib/jquery-ui.js Copyright: © 2010 AUTHORS.txt (http://jqueryui.com/about) License: Expat or GPL Files: src/compiler/scala/tools/nsc/doc/html/resource/lib/jquery.js Copyright: © 2010 John Resig © 2010 The Dojo Foundation License: Expat or BSD-3-clause or GPL Files: src/compiler/scala/tools/nsc/doc/html/resource/lib/jquery.layout.js Copyright: © 2010 Fabrizio Balliano (http://www.fabrizioballiano.net) Kevin Dalman (http://allpro.net) License: GPL or Expat Files: src/compiler/scala/tools/nsc/interactive/* Copyright: © 2009-2011 Scala Solutions and LAMP/EPFL, Lausanne License: BSD-3-clause Files: src/compiler/scala/tools/nsc/matching/ParallelMatching.scala Copyright: © 2005-2011 LAMP/EPFL, Lausanne © 2007 Google Inc. License: BSD-3-clause Files: src/forkjoin/* Copyright: released into the public domain by Doug Lea et al. License: public-domain Written by Doug Lea with assistance from members of JCP JSR-166 Expert Group and released to the public domain, as explained at http://creativecommons.org/licenses/publicdomain Files: src/jline/* Copyright: © 2002-2007 Marc Prud'hommeaux © 2009-2010 the original author or authors License: BSD-3-clause or Apache-2.0 On Debian systems, the complete text of the Apache License Version 2.0 can be found in `/usr/share/common-licenses/Apache-2.0'. Files: src/library/scala/util/Sorting.scala Copyright: © 2006-2009 Ross Judson License: BSD-3-clause Files: src/library/scala/xml/Xhtml.scala Copyright: © 2007 David Pollak, WorldWide Conferencing, LLC License: BSD-3-clause Files: src/scalacheck/org/scalacheck/* Copyright: © 2007-2010 Rickard Nilsson License: BSD-3-clause Files: src/scalap/scala/tools/scalap/scalax/* Copyright: © 2005-2008 The Scalax Project © 2002-2011 LAMP/EPFL, Lausanne License: BSD-3-clause Files: debian/* Copyright: © 2009-2011 Mehdi Dogguy © 2008-2009 Min Huang © 2007-2009 Lex Spoon License: BSD-3-clause License: BSD-3-clause Permission to use, copy, modify, and distribute this software in source or binary form for any purpose with or without fee is hereby granted, provided that the following conditions are met: . 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. . 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. . 3. Neither the name of the EPFL nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. . THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. License: Expat Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: . The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. . THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. License: GPL On Debian systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL'. debian/gbp.conf0000644000000000000000000000021612257205500010602 0ustar [DEFAULT] pristine-tar = True filter-pristine-tar = True filter = [ "docs/android-examples", "lib/ant", "lib/midpapi10.jar" ] debian/scala.install0000644000000000000000000000043312257205500011637 0ustar dists/latest/bin/fsc usr/bin/ dists/latest/bin/scala usr/bin/ dists/latest/bin/scalac usr/bin/ dists/latest/bin/scaladoc usr/bin/ dists/latest/bin/scalap usr/bin/ lib/jline.jar usr/share/java/scala/ debian/ant-jline.properties0000644000000000000000000000010612257205500013160 0ustar class.dir=dists/jline source.dir=src/jline/src jar.name=lib/jline.jar debian/control0000644000000000000000000000357312257205500010577 0ustar Source: scala Section: devel Priority: optional Maintainer: Debian Scala Maintainers Uploaders: Mehdi Dogguy , Min Huang , Frank S. Thomas Standards-Version: 3.9.5 Build-Depends: default-jdk | java6-sdk, ant, ant-contrib, ant-optional, libmaven-ant-tasks-java, junit4, libjansi-java, debhelper (>= 7.0.50), javahelper, maven-repo-helper (>= 1.6~) Homepage: http://www.scala-lang.org/ Vcs-Browser: http://git.debian.org/?p=pkg-scala/packages/scala.git Vcs-Git: git://git.debian.org/git/pkg-scala/packages/scala.git Package: scala Architecture: all Depends: scala-library (= ${source:Version}), openjdk-7-jre | java7-runtime | java6-runtime, libjansi-java, ${misc:Depends} Suggests: scala-doc (>= ${source:Version}) Description: Scala programming language Scala is a Java-compatible programming language with many modern language features. It is Java-compatible in that Scala and Java classes can directly reference each other and subclass each other with no glue code needed. It includes modern language features such as closures, pattern-matching, parametric types, and virtual type members. . This package includes the various tools used to develop code written in Scala. It includes a compiler (scalac), an interpreter and script runner (scala), the offline compiler (fsc), and source-scanning documentation generator (scaladoc). Package: scala-library Architecture: all Depends: 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 provides scalacheck and scala-partest. Package: scala-doc Architecture: all Depends: # libjs-jquery, # libjs-jquery-ui, ${misc:Depends} Section: doc Description: Scala API documentation This is the API documentation for Scala.