[felix-bundlerepository] 04/08: wrap-and-sort -sa

Markus Koschany apo-guest at moszumanska.debian.org
Sat Feb 7 21:57:29 UTC 2015


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

apo-guest pushed a commit to branch experimental
in repository felix-bundlerepository.

commit f14db0adc543baad7405e9502a2461962f8aa4fd
Author: Markus Koschany <apo at gambaru.de>
Date:   Sat Feb 7 19:02:10 2015 +0100

    wrap-and-sort -sa
---
 debian/control                                    | 42 +++++++++++++++++------
 debian/copyright                                  |  2 --
 debian/libfelix-bundlerepository-java-doc.install |  2 +-
 3 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/debian/control b/debian/control
index 3e5df88..c0c7dce 100644
--- a/debian/control
+++ b/debian/control
@@ -2,11 +2,23 @@ Source: felix-bundlerepository
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Damien Raude-Morvan <drazzib at debian.org>
-Build-Depends: debhelper (>= 9), cdbs, default-jdk, maven-debian-helper (>= 1.4),
- libfelix-utils-java, libfelix-shell-java, libkxml2-java, libosgi-core-java,
- libosgi-compendium-java, libfelix-osgi-obr-java, libmaven-bundle-plugin-java,
- libeasymock-java, default-jdk-doc, libmaven-javadoc-plugin-java
+Uploaders:
+ Damien Raude-Morvan <drazzib at debian.org>
+Build-Depends:
+ cdbs,
+ debhelper (>= 9),
+ default-jdk,
+ default-jdk-doc,
+ libeasymock-java,
+ libfelix-osgi-obr-java,
+ libfelix-shell-java,
+ libfelix-utils-java,
+ libkxml2-java,
+ libmaven-bundle-plugin-java,
+ libmaven-javadoc-plugin-java,
+ libosgi-compendium-java,
+ libosgi-core-java,
+ maven-debian-helper (>= 1.4)
 Standards-Version: 3.9.5
 Homepage: http://felix.apache.org/site/apache-felix-osgi-bundle-repository.html
 Vcs-Git: git://anonscm.debian.org/pkg-java/felix-bundlerepository.git
@@ -14,9 +26,13 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/felix-bundlerepository
 
 Package: libfelix-bundlerepository-java
 Architecture: all
-Depends: ${misc:Depends}, ${maven:Depends}
-Recommends: ${maven:OptionalDepends}
-Suggests: libfelix-bundlerepository-java-doc
+Depends:
+ ${maven:Depends},
+ ${misc:Depends}
+Recommends:
+ ${maven:OptionalDepends}
+Suggests:
+ libfelix-bundlerepository-java-doc
 Description: Felix OSGi bundle repository service
  The Felix project is an implementation
  of the OSGi R4.2 core framework specification.
@@ -31,9 +47,13 @@ Description: Felix OSGi bundle repository service
 Package: libfelix-bundlerepository-java-doc
 Architecture: all
 Section: doc
-Depends: ${misc:Depends}, ${maven:DocDepends}
-Recommends: ${maven:DocOptionalDepends}
-Suggests: libfelix-bundlerepository-java
+Depends:
+ ${maven:DocDepends},
+ ${misc:Depends}
+Recommends:
+ ${maven:DocOptionalDepends}
+Suggests:
+ libfelix-bundlerepository-java
 Description: Documentation for Felix OSGi bundle repository service
  The Felix project is an implementation
  of the OSGi R4.2 core framework specification.
diff --git a/debian/copyright b/debian/copyright
index 8ffe689..c07518f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -15,5 +15,3 @@ License: Apache-2.0
 License: Apache-2.0
   On Debian GNU/Linux system you can find the complete text of the
   Apache-2.0 license in '/usr/share/common-licenses/Apache-2.0'
-
-
diff --git a/debian/libfelix-bundlerepository-java-doc.install b/debian/libfelix-bundlerepository-java-doc.install
index f0df879..424c22a 100644
--- a/debian/libfelix-bundlerepository-java-doc.install
+++ b/debian/libfelix-bundlerepository-java-doc.install
@@ -1,2 +1,2 @@
-target/apidocs/* /usr/share/doc/libfelix-bundlerepository-java/api/
 doc/apache-* /usr/share/doc/libfelix-bundlerepository-java/
+target/apidocs/* /usr/share/doc/libfelix-bundlerepository-java/api/

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



More information about the pkg-java-commits mailing list