[scala-2.10] 142/166: Renamed the package to scala-2.10

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository scala-2.10.

commit 3874810f3a2bd2ec5938e7a37dd80de4d918f57e
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Nov 14 10:38:21 2016 +0100

    Renamed the package to scala-2.10
---
 debian/changelog                                         |  5 +++--
 debian/control                                           | 16 ++++++++--------
 debian/rules                                             |  2 +-
 debian/{scala.install => scala-2.10.install}             |  0
 debian/{scala.jlibs => scala-2.10.jlibs}                 |  0
 debian/scala-2.10.lintian-overrides                      |  1 +
 debian/{scala.manpages => scala-2.10.manpages}           |  0
 debian/{scala.poms => scala-2.10.poms}                   |  0
 debian/{scala-doc.doc-base => scala-doc-2.10.doc-base}   |  0
 debian/{scala-doc.install => scala-doc-2.10.install}     |  0
 debian/{scala-doc.links => scala-doc-2.10.links}         |  0
 debian/{scala-library.jlibs => scala-library-2.10.jlibs} |  0
 debian/{scala-library.poms => scala-library-2.10.poms}   |  0
 debian/scala-library.dirs                                |  1 -
 debian/scala.dirs                                        |  3 ---
 debian/scala.lintian-overrides                           |  1 -
 16 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 069b4ae..0d51b78 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
-scala (2.10.5-2) UNRELEASED; urgency=medium
+scala-2.10 (2.10.5-2) UNRELEASED; urgency=medium
 
-  * The package has been adopted by the Java Team (Closes: #754935)
+  * Team upload.
+  * Forked the 2.10.x line of the scala package for the needs of sbt
 
  -- Emmanuel Bourg <ebourg at apache.org>  Sat, 06 Jun 2015 01:07:04 +0200
 
diff --git a/debian/control b/debian/control
index 94ee5cc..107464a 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: scala
+Source: scala-2.10
 Section: devel
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
@@ -19,18 +19,18 @@ Build-Depends:
  maven-repo-helper (>= 1.6~),
  scala (>= 2.10)
 Standards-Version: 3.9.6
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/scala.git
-Vcs-Git: git://anonscm.debian.org/pkg-java/scala.git
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/scala-2.10.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-java/scala-2.10.git
 Homepage: http://www.scala-lang.org/
 
-Package: scala
+Package: scala-2.10
 Architecture: all
 Depends:
- scala-library (= ${source:Version}),
+ scala-library-2.10 (= ${source:Version}),
  openjdk-7-jre | java7-runtime | java6-runtime,
  libjansi-java,
  ${misc:Depends}
-Suggests: scala-doc (>= ${source:Version})
+Suggests: scala-doc-2.10 (>= ${source:Version})
 Description: Scala programming language
  Scala is a Java-compatible programming language with many
  modern language features.  It is Java-compatible in that
@@ -45,7 +45,7 @@ Description: Scala programming language
  compiler (fsc), and source-scanning documentation
  generator (scaladoc).
 
-Package: scala-library
+Package: scala-library-2.10
 Architecture: all
 Depends:
  openjdk-7-jre | java7-runtime | java6-runtime,
@@ -54,7 +54,7 @@ Description: Scala standard library
  This run-time library is needed to run Scala programs. It also
  provides scalacheck and scala-partest.
 
-Package: scala-doc
+Package: scala-doc-2.10
 Architecture: all
 Depends:
 # libjs-jquery,
diff --git a/debian/rules b/debian/rules
index 33cb724..21e1848 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,7 +32,7 @@ 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
+	find debian/scala-2.10 \( -type f -or -type l \) -name "scala-library*.jar" -delete
 
 get-orig-source:
 	uscan --download-current-version --rename
diff --git a/debian/scala.install b/debian/scala-2.10.install
similarity index 100%
rename from debian/scala.install
rename to debian/scala-2.10.install
diff --git a/debian/scala.jlibs b/debian/scala-2.10.jlibs
similarity index 100%
rename from debian/scala.jlibs
rename to debian/scala-2.10.jlibs
diff --git a/debian/scala-2.10.lintian-overrides b/debian/scala-2.10.lintian-overrides
new file mode 100644
index 0000000..e844696
--- /dev/null
+++ b/debian/scala-2.10.lintian-overrides
@@ -0,0 +1 @@
+scala-2.10: description-starts-with-package-name
diff --git a/debian/scala.manpages b/debian/scala-2.10.manpages
similarity index 100%
rename from debian/scala.manpages
rename to debian/scala-2.10.manpages
diff --git a/debian/scala.poms b/debian/scala-2.10.poms
similarity index 100%
rename from debian/scala.poms
rename to debian/scala-2.10.poms
diff --git a/debian/scala-doc.doc-base b/debian/scala-doc-2.10.doc-base
similarity index 100%
rename from debian/scala-doc.doc-base
rename to debian/scala-doc-2.10.doc-base
diff --git a/debian/scala-doc.install b/debian/scala-doc-2.10.install
similarity index 100%
rename from debian/scala-doc.install
rename to debian/scala-doc-2.10.install
diff --git a/debian/scala-doc.links b/debian/scala-doc-2.10.links
similarity index 100%
rename from debian/scala-doc.links
rename to debian/scala-doc-2.10.links
diff --git a/debian/scala-library.jlibs b/debian/scala-library-2.10.jlibs
similarity index 100%
rename from debian/scala-library.jlibs
rename to debian/scala-library-2.10.jlibs
diff --git a/debian/scala-library.poms b/debian/scala-library-2.10.poms
similarity index 100%
rename from debian/scala-library.poms
rename to debian/scala-library-2.10.poms
diff --git a/debian/scala-library.dirs b/debian/scala-library.dirs
deleted file mode 100644
index 13c9f03..0000000
--- a/debian/scala-library.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/java
diff --git a/debian/scala.dirs b/debian/scala.dirs
deleted file mode 100644
index 77989b7..0000000
--- a/debian/scala.dirs
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/bin
-usr/share/java
-usr/share/java/scala
diff --git a/debian/scala.lintian-overrides b/debian/scala.lintian-overrides
deleted file mode 100644
index a79fc95..0000000
--- a/debian/scala.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-scala: description-starts-with-package-name

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/scala-2.10.git