[Git][java-team/intellij-annotations][master] 3 commits: Rename to libjetbrains-annotations-java

[Andrej Shadura]

Andrej Shadura pushed to branch master at Debian Java Maintainers / intellij-annotations


Commits:
329fe082 by Andrej Shadura at 2018-09-24T09:07:47Z
Rename to libjetbrains-annotations-java

- - - - -
6a6f6b27 by Andrej Shadura at 2018-09-24T09:08:53Z
Add myself to Uploaders

- - - - -
93cc2413 by Andrej Shadura at 2018-09-24T09:10:05Z
Update the changelog

- - - - -


8 changed files:

- debian/changelog
- debian/control
- − debian/libintellij-annotations-java-doc.install
- + debian/libintellij-annotations-java-doc.links
- + debian/libjetbrains-annotations-java-doc.doc-base
- + debian/libjetbrains-annotations-java-doc.install
- debian/libintellij-annotations-java.poms → debian/libjetbrains-annotations-java.poms
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+intellij-annotations (16.0.2-4) unstable; urgency=medium
+
+  * Rename to libjetbrains-annotations-java.
+  * Provide transitional packages.
+  * Install the documentation into the correct place.
+  * Registed the documentation with doc-base.
+  * Add myself to Uploaders.
+
+ -- Andrej Shadura <andrewsh at debian.org>  Mon, 24 Sep 2018 11:09:11 +0200
+
 intellij-annotations (16.0.2-3) unstable; urgency=medium
 
   * Install new JARs as org.jetbrains.*.


=====================================
debian/control
=====================================
@@ -4,7 +4,8 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders:
  Markus Koschany <apo at debian.org>,
- Saif Abdul Cassim <saif.15 at cse.mrt.ac.lk>
+ Saif Abdul Cassim <saif.15 at cse.mrt.ac.lk>,
+ Andrej Shadura <andrewsh at debian.org>
 Build-Depends:
  debhelper (>= 9),
  gradle-debian-helper,
@@ -17,30 +18,68 @@ Vcs-Browser: https://salsa.debian.org/java-team/intellij-annotations
 Homepage: https://github.com/JetBrains/java-annotations/
 
 Package: libintellij-annotations-java
+Section: oldlibs
+Architecture: all
+Depends:
+ ${java:Depends},
+ ${misc:Depends},
+ libjetbrains-annotations-java
+Suggests:
+ libintellij-annotations-java-doc
+Description: transitional package for libjetbrains-annotations-java
+ JetBrains Annotations is a set of annotations used for code inspection
+ support and code documentation. It is part of the IntelliJ IDEA Community
+ Edition and can be used among other things to annotate String fields, local
+ variables, method parameters and methods returning Strings.
+ .
+ This package provides com.intellij.annotations.jar and Maven metadata
+ for compatibility with earlier upstream versions.
+
+Package: libjetbrains-annotations-java
 Architecture: all
 Depends:
  ${java:Depends},
  ${misc:Depends}
-Provides: libjetbrains-annotations-java
+Replaces:
+ libintellij-annotations-java
 Suggests:
  libintellij-annotations-java-doc
 Description: annotations used for code inspection support and code documentation
- IntelliJ IDEA Annotations is a set of annotations used for code inspection
+ JetBrains Annotations is a set of annotations used for code inspection
  support and code documentation. It is part of the IntelliJ IDEA Community
  Edition and can be used among other things to annotate String fields, local
  variables, method parameters and methods returning Strings.
 
 Package: libintellij-annotations-java-doc
 Architecture: all
+Section: oldlibs
+Depends:
+ ${misc:Depends},
+ libjetbrains-annotations-java-doc
+Recommends:
+ ${java:Recommends}
+Description: transitional package for libjetbrains-annotations-java-doc
+ JetBrains Annotations is a set of annotations used for code inspection
+ support and code documentation. It is part of the IntelliJ IDEA Community
+ Edition and can be used among other things to annotate String fields, local
+ variables, method parameters and methods returning Strings.
+ .
+ This package contains symlinks to the actual documentation now in
+ libjetbrains-annotations-java, and can be safely removed.
+
+Package: libjetbrains-annotations-java-doc
+Architecture: all
 Section: doc
 Depends:
  ${misc:Depends}
 Recommends:
  ${java:Recommends}
-Description: Documentation for libintellij-annotations-java
- IntelliJ IDEA Annotations is a set of annotations used for code inspection
+Replaces:
+ libintellij-annotations-java-doc
+Description: documentation for libjetbrains-annotations-java
+ JetBrains Annotations is a set of annotations used for code inspection
  support and code documentation. It is part of the IntelliJ IDEA Community
  Edition and can be used among other things to annotate String fields, local
  variables, method parameters and methods returning Strings.
  .
- This package contains documentation for libintellij-annotations-java.
+ This package contains documentation for libjetbrains-annotations-java.


=====================================
debian/libintellij-annotations-java-doc.install deleted
=====================================
@@ -1,2 +0,0 @@
-common/build/docs/javadoc/* usr/share/doc/libintellij-annotations-java-common
-java8/build/docs/javadoc/* usr/share/doc/libintellij-annotations-java-java8


=====================================
debian/libintellij-annotations-java-doc.links
=====================================
@@ -0,0 +1 @@
+/usr/share/doc/libjetbrains-annotations-java/api /usr/share/doc/libintellij-annotations-java/api


=====================================
debian/libjetbrains-annotations-java-doc.doc-base
=====================================
@@ -0,0 +1,9 @@
+Document: libjetbrains-annotations-java
+Title: API JavaDoc for libjetbrains-annotations-java
+Author: The authors of libjetbrains-annotations-java
+Abstract: This is the API JavaDoc for libjetbrains-annotations-java
+Section: Programming/Java
+
+Format: HTML
+Index: /usr/share/doc/libjetbrains-annotations-java/api/index.html
+Files: /usr/share/doc/libjetbrains-annotations-java/api/*.html


=====================================
debian/libjetbrains-annotations-java-doc.install
=====================================
@@ -0,0 +1 @@
+java8/build/docs/javadoc/* /usr/share/doc/libjetbrains-annotations-java/api


=====================================
debian/libintellij-annotations-java.poms → debian/libjetbrains-annotations-java.poms
=====================================


=====================================
debian/rules
=====================================
@@ -15,7 +15,10 @@ override_mh_install:
 	mkdir -p debian/libintellij-annotations-java/usr/share/maven-repo/com/intellij/
 	cp -al debian/*/usr/share/maven-repo/org/jetbrains/* \
 		debian/*/usr/share/maven-repo/com/intellij/
-	sed -i 's,org\.jetbrains,com.intellij,g' debian/*/usr/share/maven-repo/com/intellij/*/*/*pom
+	sed -i \
+		-e 's,org\.jetbrains,com.intellij,g' \
+		-e 's,libjetbrains-annotations,libintellij-annotations,g' \
+		debian/*/usr/share/maven-repo/com/intellij/*/*/*pom
 
 get-orig-source:
 	uscan --verbose --repack --compression xz --force-download --download-current-version



View it on GitLab: https://salsa.debian.org/java-team/intellij-annotations/compare/f68d1c0215a1bbba9e265775929661336146d912...93cc241316ea55605e820f53e1394637b99e2beb

-- 
View it on GitLab: https://salsa.debian.org/java-team/intellij-annotations/compare/f68d1c0215a1bbba9e265775929661336146d912...93cc241316ea55605e820f53e1394637b99e2beb
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20180924/a86da0a9/attachment.html>