[java-common] 02/04: Removed the old dummy control files

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Fri Sep 25 11:20:44 UTC 2015


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

ebourg-guest pushed a commit to branch master
in repository java-common.

commit 8bbf9e6c6165be1f7e40cfaf8d64aa18dc83464c
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Sep 25 12:50:00 2015 +0200

    Removed the old dummy control files
---
 Makefile                                 |  7 +------
 debian/README.Debian                     |  7 -------
 debian/changelog                         |  1 +
 debian/control                           |  4 +---
 dummy/README                             |  2 --
 dummy/java-compiler-dummy.control        | 12 ------------
 dummy/java-virtual-machine-dummy.control | 13 -------------
 dummy/java1-runtime-dummy.control        | 13 -------------
 dummy/java2-compiler-dummy.control       | 12 ------------
 dummy/java2-runtime-dummy.control        | 13 -------------
 10 files changed, 3 insertions(+), 81 deletions(-)

diff --git a/Makefile b/Makefile
index 515a599..3184283 100644
--- a/Makefile
+++ b/Makefile
@@ -53,12 +53,7 @@ policy.txt: policy.xml
 	#-rm -f dump.html
 	jw -b txt $(DSL) $<
 
-install: debian-java-policy-install debian-java-faq-install dummy-install script-install
-
-dummy-install:
-	mkdir -p $(PUBLISHDIR)/dummy-packages
-	cp dummy/README $(PUBLISHDIR)/dummy-packages
-	cp dummy/*.control $(PUBLISHDIR)/dummy-packages
+install: debian-java-policy-install debian-java-faq-install script-install
 
 script-install:
 	mkdir -p $(DESTDIR)/usr/sbin
diff --git a/debian/README.Debian b/debian/README.Debian
index 07af622..c0bd03f 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -6,10 +6,3 @@ They can be found at
 /usr/share/doc/java-common/debian-java-faq/index.html
 and
 /usr/share/doc/java-common/debian-java-policy/index.html
-
-Previously it existed a bunch of *-dummy packages. They have now been
-removed from the archive. If you need to fulfill the dependencies you have
-to make your own dummy package. The equivs package might help you with
-this.
-
- Ola Lundqvist <opal at debian.org>
diff --git a/debian/changelog b/debian/changelog
index b8adc82..4ae30d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ java-common (0.54) UNRELEASED; urgency=medium
   * Team upload.
   * Use OpenJDK 8 on mips, mipsel and mips64el.
   * Removed the unused classpath-from-jars-1 example
+  * Removed the old dummy control files
 
  -- Emmanuel Bourg <ebourg at apache.org>  Tue, 22 Sep 2015 09:23:34 +0200
 
diff --git a/debian/control b/debian/control
index 36e0bab..fba3611 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Package: java-common
 Architecture: all
 Multi-Arch: foreign
 Depends: ${misc:Depends}
-Suggests: default-jre, equivs
+Suggests: default-jre
 Description: Base of all Java packages
  This package must be installed in the system if a Java environment
  is desired. It covers useful information for Java users in
@@ -24,8 +24,6 @@ Description: Base of all Java packages
   * The Debian-Java-FAQ which provides information on the status of
     Java support in Debian, available compilers, virtual machines, Java
     programs and libraries as well as on legal issues.
-  * Information on how to create dummy packages to fulfill java2
-    requirements.
 
 Package: default-jre
 Architecture: any
diff --git a/dummy/README b/dummy/README
deleted file mode 100644
index 9f760eb..0000000
--- a/dummy/README
+++ /dev/null
@@ -1,2 +0,0 @@
-Those control files can be used to create dummy packages of needed components.
-Install "equivs" package and use "equivs-build" build needed dummy packages.
diff --git a/dummy/java-compiler-dummy.control b/dummy/java-compiler-dummy.control
deleted file mode 100644
index 8dc8e62..0000000
--- a/dummy/java-compiler-dummy.control
+++ /dev/null
@@ -1,12 +0,0 @@
-Package: java-compiler-dummy
-Architecture: all
-Section: misc
-Priority: optional
-Depends: java-common, java1-runtime | java2-runtime
-Provides: java-compiler
-Description: Dummy package providing java-compiler
- This package does NOT provide java compiler binary, it is here only to fulfill
- dependencies of other packages.
- .
- You probably will want to use this package if you have installed the compiler
- "by hand" or from package that does not provide java-compiler dependency.
diff --git a/dummy/java-virtual-machine-dummy.control b/dummy/java-virtual-machine-dummy.control
deleted file mode 100644
index 8e8938e..0000000
--- a/dummy/java-virtual-machine-dummy.control
+++ /dev/null
@@ -1,13 +0,0 @@
-Package: java-virtual-machine-dummy
-Architecture: all
-Section: misc
-Priority: optional
-Depends: java-common, java1-runtime | java2-runtime
-Provides: java-virtual-machine
-Description: Dummy package providing java-virtual-machine
- This package does NOT provide java virtual machine  binary, it is here only
- to fulfill dependencies of other packages.
- .
- You probably will want to use this package if you have installed JVM
- "by hand" or from package that does not provide java-virtual-machine
- dependency.
diff --git a/dummy/java1-runtime-dummy.control b/dummy/java1-runtime-dummy.control
deleted file mode 100644
index 73fa334..0000000
--- a/dummy/java1-runtime-dummy.control
+++ /dev/null
@@ -1,13 +0,0 @@
-Package: java1-runtime-dummy
-Architecture: all
-Section: misc
-Priority: optional
-Depends: java-common
-Provides: java1-runtime
-Description: Dummy package providing java1-runtime
- This package does NOT provide java1 runtime environment, it is here only to
- fulfill dependencies of other packages.
- .
- You probably will want to use this package if you have installed the
- environment "by hand" or from package that does not provide java1-runtime
- dependency.
diff --git a/dummy/java2-compiler-dummy.control b/dummy/java2-compiler-dummy.control
deleted file mode 100644
index c7509b8..0000000
--- a/dummy/java2-compiler-dummy.control
+++ /dev/null
@@ -1,12 +0,0 @@
-Package: java2-compiler-dummy
-Architecture: all
-Section: misc
-Priority: optional
-Depends: java-common, java2-runtime
-Provides: java2-compiler
-Description: Dummy package providing java2-compiler
- This package does NOT provide java2 compiler binary, it is here only to
- fulfill dependencies of other packages.
- .
- You probably will want to use this package if you have installed the compiler
- "by hand" or from package that does not provide java2-compiler dependency.
diff --git a/dummy/java2-runtime-dummy.control b/dummy/java2-runtime-dummy.control
deleted file mode 100644
index 3d5cdff..0000000
--- a/dummy/java2-runtime-dummy.control
+++ /dev/null
@@ -1,13 +0,0 @@
-Package: java2-runtime-dummy
-Architecture: all
-Section: misc
-Priority: optional
-Depends: java-common
-Provides: java2-runtime
-Description: Dummy package providing java2-runtime
- This package does NOT provide java2 runtime environment, it is here only to
- fulfill dependencies of other packages.
- .
- You probably will want to use this package if you have installed the
- environment "by hand" or from package that does not provide java2-runtime
- dependency.

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



More information about the pkg-java-commits mailing list