[ecj] 07/145: Import Debian changes 3.1.1-2

[Emmanuel Bourg]

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

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

commit 07ea15fc698a67340598776b146f6909afdeb5a8
Author: Matthias Klose <doko at debian.org>
Date:   Thu Oct 20 00:11:27 2005 +0200

    Import Debian changes 3.1.1-2
    
    ecj-bootstrap (3.1.1-2) unstable; urgency=low
    
      * Add a javac alternative (priority higher than gcj).
      * ecj-bootstrap-gcj: Add slave alternative for the man page.
        Addresses #328743.
---
 debian/changelog                  | 8 ++++++++
 debian/ecj-bootstrap-gcj.postinst | 4 ++++
 debian/ecj-bootstrap-gcj.prerm    | 1 +
 debian/ecj-bootstrap.postinst     | 3 +++
 debian/ecj-bootstrap.prerm        | 1 +
 5 files changed, 17 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 664fedf..aea8aec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ecj-bootstrap (3.1.1-2) unstable; urgency=low
+
+  * Add a javac alternative (priority higher than gcj).
+  * ecj-bootstrap-gcj: Add slave alternative for the man page.
+    Addresses #328743.
+
+ -- Matthias Klose <doko at debian.org>  Thu, 20 Oct 2005 00:11:27 +0200
+
 ecj-bootstrap (3.1.1-1) unstable; urgency=low
 
   * New upstream version.
diff --git a/debian/ecj-bootstrap-gcj.postinst b/debian/ecj-bootstrap-gcj.postinst
index 83119cc..e39cab4 100644
--- a/debian/ecj-bootstrap-gcj.postinst
+++ b/debian/ecj-bootstrap-gcj.postinst
@@ -1,6 +1,10 @@
 #! /bin/sh -e
 
 update-alternatives --quiet --install /usr/bin/ecj ecj /usr/bin/ecj-bootstrap-gcj 4
+  --slave /usr/share/man/man1/ecj.1.gz ecj.1.gz /usr/share/man/man1/ecj-bootstrap.1.gz
+
+update-alternatives --quiet --install /usr/bin/javac javac /usr/bin/ecj-bootstrap-gcj 144 \
+  --slave /usr/share/man/man1/javac.1.gz javac.1.gz /usr/share/man/man1/ecj-bootstrap.1.gz
 
 find /usr/share/gcj-4.0/classmap.d -name '*.db' -print0 \
 	| /usr/bin/gcj-dbtool-4.0 -0 -m /var/lib/gcj-4.0/classmap.db.tmp || exit 1
diff --git a/debian/ecj-bootstrap-gcj.prerm b/debian/ecj-bootstrap-gcj.prerm
index 31d36e8..aac7ad3 100644
--- a/debian/ecj-bootstrap-gcj.prerm
+++ b/debian/ecj-bootstrap-gcj.prerm
@@ -1,5 +1,6 @@
 #! /bin/sh -e
 
 update-alternatives --quiet --remove ecj /usr/bin/ecj-bootstrap-gcj
+update-alternatives --quiet --remove javac /usr/bin/ecj-bootstrap-gcj
 
 #DEBHELPER#
diff --git a/debian/ecj-bootstrap.postinst b/debian/ecj-bootstrap.postinst
index db7cd26..7ce344a 100644
--- a/debian/ecj-bootstrap.postinst
+++ b/debian/ecj-bootstrap.postinst
@@ -3,4 +3,7 @@
 update-alternatives --quiet --install /usr/bin/ecj ecj /usr/bin/ecj-bootstrap 3 \
   --slave /usr/share/man/man1/ecj.1.gz ecj.1.gz /usr/share/man/man1/ecj-bootstrap.1.gz
 
+update-alternatives --quiet --install /usr/bin/javac javac /usr/bin/ecj-bootstrap 143 \
+  --slave /usr/share/man/man1/javac.1.gz javac.1.gz /usr/share/man/man1/ecj-bootstrap.1.gz
+
 #DEBHELPER#
diff --git a/debian/ecj-bootstrap.prerm b/debian/ecj-bootstrap.prerm
index f5e4bd8..589d1e5 100644
--- a/debian/ecj-bootstrap.prerm
+++ b/debian/ecj-bootstrap.prerm
@@ -1,5 +1,6 @@
 #! /bin/sh -e
 
 update-alternatives --quiet --remove ecj /usr/bin/ecj-bootstrap
+update-alternatives --quiet --remove javac /usr/bin/ecj-bootstrap
 
 #DEBHELPER#

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