[java-policy] 122/198: Redid rename of default-jdk-builddep to gcj-native-helper.

[Emmanuel Bourg]

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

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

commit 85467af7eb71871c5dbedcd071a8c469044de3e1
Author: Niels Thykier <nthykier at debian.org>
Date:   Sun Jun 27 22:04:18 2010 +0000

    Redid rename of default-jdk-builddep to gcj-native-helper.
---
 debian/changelog                 |  2 +-
 debian/control                   | 10 +++++++---
 debian/lintian/default-jdk       |  1 +
 debian/lintian/default-jre       |  1 +
 debian/lintian/gcj-native-helper |  1 +
 debian/rules                     |  4 +---
 6 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 11c0810..5eef6d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,7 @@ java-common (0.37) UNRELEASED; urgency=low
   * Updated and synced the Java FAQ.
     - contains a example of how to link with system javadocs.
     (Closes: #577164)
-  * Removed unused lintian overrides.
+  * Renamed default-jdk-builddep to gcj-native-helper.
 
  -- Niels Thykier <niels at thykier.net>  Thu, 13 May 2010 15:46:11 +0200
 
diff --git a/debian/control b/debian/control
index 1a8c816..00ace8a 100644
--- a/debian/control
+++ b/debian/control
@@ -70,9 +70,13 @@ Description: Standard Java or Java compatible Development Kit (documentation)
  or Java compatible development kit recommended for Debian, which is
  ${doc}.
 
-Package: default-jdk-builddep
+Package: gcj-native-helper
 Architecture: any
 Depends: default-jdk (= ${binary:Version}), ${jdk:builddep}, ${misc:Depends}
-Description: Standard Java or Java compatible build dependencies
+Provides: default-jdk-builddep
+Description: Standard helper tools for creating gcj native packages
  This package points to the build dependencies used to build
- packages requiring a Java or Java compatible Development Kit.
+ gcj native packages.
+ .
+ During the transition from default-jdk-builddep to gcj-native-helper,
+ this package will also depend on default-jdk to avoid breakage.
diff --git a/debian/lintian/default-jdk b/debian/lintian/default-jdk
new file mode 100644
index 0000000..9c98068
--- /dev/null
+++ b/debian/lintian/default-jdk
@@ -0,0 +1 @@
+cannot-check-whether-usr-share-doc-symlink-points-to-foreign-package
diff --git a/debian/lintian/default-jre b/debian/lintian/default-jre
new file mode 100644
index 0000000..9c98068
--- /dev/null
+++ b/debian/lintian/default-jre
@@ -0,0 +1 @@
+cannot-check-whether-usr-share-doc-symlink-points-to-foreign-package
diff --git a/debian/lintian/gcj-native-helper b/debian/lintian/gcj-native-helper
new file mode 100644
index 0000000..9c98068
--- /dev/null
+++ b/debian/lintian/gcj-native-helper
@@ -0,0 +1 @@
+cannot-check-whether-usr-share-doc-symlink-points-to-foreign-package
diff --git a/debian/rules b/debian/rules
index a7aed43..8314b6d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -85,7 +85,7 @@ ifneq (,$(p_jre))
 	dh_installchangelogs -pdefault-jre-headless
 	dh_link -pdefault-jre-headless \
 		usr/lib/jvm/$(jvmdir) usr/lib/jvm/default-java
-	for p in default-jre-headless default-jre default-jdk default-jdk-builddep; do \
+	for p in default-jre-headless default-jre default-jdk gcj-native-helper; do \
 	  [ -z "$$t" ] && t=$$p && continue; \
 	  mkdir -p debian/$$p/usr/share/doc; \
 	  ln -sf $$t debian/$$p/usr/share/doc/$$p; \
@@ -117,8 +117,6 @@ binary-indep: build-indep install-indep
 	dh_testdir -i
 	dh_testroot -i
 	dh_install -i
-#	dh_installdebconf -i
-###	dh_installdocs -i
 	mkdir -p debian/default-jdk-doc/usr/share/doc/default-jre-headless
 	ln -sf ../$(p_doc)/api debian/default-jdk-doc/usr/share/doc/default-jre-headless/api
 	ln -sf ../$(p_doc)/api debian/default-jdk-doc/usr/share/doc/default-jdk-doc/api

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