[pkg-java] r12398 - in trunk/java-common/debian: . lintian

[Niels Thykier]

Author: nthykier-guest
Date: 2010-05-13 13:31:47 +0000 (Thu, 13 May 2010)
New Revision: 12398

Added:
   trunk/java-common/debian/lintian/default-jdk-builddep
Removed:
   trunk/java-common/debian/lintian/gcj-native-helper
Modified:
   trunk/java-common/debian/changelog
   trunk/java-common/debian/control
   trunk/java-common/debian/default-jdk-builddep.install
   trunk/java-common/debian/rules
Log:
Undo the d-jdk-builddep rename patch.

Modified: trunk/java-common/debian/changelog
===================================================================
--- trunk/java-common/debian/changelog	2010-05-12 23:10:13 UTC (rev 12397)
+++ trunk/java-common/debian/changelog	2010-05-13 13:31:47 UTC (rev 12398)
@@ -1,9 +1,3 @@
-java-common (0.37) UNRELEASED; urgency=low
-
-  * Renamed default-jdk-builddep to gcj-native-helper.
-
- -- Niels Thykier <niels at thykier.net>  Thu, 06 May 2010 17:59:01 +0200
-
 java-common (0.36) unstable; urgency=low
 
   * Correct a ${jdk} that should have been a ${jre} in the decription

Modified: trunk/java-common/debian/control
===================================================================
--- trunk/java-common/debian/control	2010-05-12 23:10:13 UTC (rev 12397)
+++ trunk/java-common/debian/control	2010-05-13 13:31:47 UTC (rev 12398)
@@ -70,10 +70,9 @@
  or Java compatible development kit recommended for Debian, which is
  ${doc}.
 
-Package: gcj-native-helper
+Package: default-jdk-builddep
 Architecture: any
 Depends: default-jdk (= ${binary:Version}), ${jdk:builddep}, ${misc:Depends}
-Provides: default-jdk-builddep
 Description: Standard Java or Java compatible build dependencies
  This package points to the build dependencies used to build
  packages requiring a Java or Java compatible Development Kit.

Modified: trunk/java-common/debian/default-jdk-builddep.install
===================================================================
--- trunk/java-common/debian/default-jdk-builddep.install	2010-05-12 23:10:13 UTC (rev 12397)
+++ trunk/java-common/debian/default-jdk-builddep.install	2010-05-13 13:31:47 UTC (rev 12398)
@@ -1 +1 @@
-debian/lintian/gcj-native-helper /usr/share/lintian/overrides
+debian/lintian/default-jdk-builddep /usr/share/lintian/overrides

Added: trunk/java-common/debian/lintian/default-jdk-builddep
===================================================================
--- trunk/java-common/debian/lintian/default-jdk-builddep	                        (rev 0)
+++ trunk/java-common/debian/lintian/default-jdk-builddep	2010-05-13 13:31:47 UTC (rev 12398)
@@ -0,0 +1 @@
+default-jdk-builddep: cannot-check-whether-usr-share-doc-symlink-points-to-foreign-package

Deleted: trunk/java-common/debian/lintian/gcj-native-helper
===================================================================
--- trunk/java-common/debian/lintian/gcj-native-helper	2010-05-12 23:10:13 UTC (rev 12397)
+++ trunk/java-common/debian/lintian/gcj-native-helper	2010-05-13 13:31:47 UTC (rev 12398)
@@ -1 +0,0 @@
-gcj-native-helper: cannot-check-whether-usr-share-doc-symlink-points-to-foreign-package

Modified: trunk/java-common/debian/rules
===================================================================
--- trunk/java-common/debian/rules	2010-05-12 23:10:13 UTC (rev 12397)
+++ trunk/java-common/debian/rules	2010-05-13 13:31:47 UTC (rev 12398)
@@ -85,7 +85,7 @@
 	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 gcj-native-helper; do \
+	for p in default-jre-headless default-jre default-jdk default-jdk-builddep; do \
 	  [ -z "$$t" ] && t=$$p && continue; \
 	  mkdir -p debian/$$p/usr/share/doc; \
 	  ln -sf $$t debian/$$p/usr/share/doc/$$p; \