The following commit has been merged in the master branch:
commit 45790a61d8b7f84eb77f0d3ac7ce162cc82cf734
Author: Damien Raude-Morvan <draz...@debian.org>
Date: Sun Nov 6 20:00:36 2011 +0100
Wrap-and-sort
diff --git a/debian/control b/debian/control
index 437cffe..558c2cd 100644
--- a/debian/control
+++ b/debian/control
@@ -3,10 +3,16 @@ Section: java
Priority: optional
Maintainer: Debian Java Maintainers
<pkg-java-maintainers@lists.alioth.debian.org>
Uploaders: Yulia Novozhilova <yulia.novozhil...@sun.com>,
- Andres Mejia <ame...@debian.org>, Damien Raude-Morvan <draz...@debian.org>
-Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>=
1.4),
- libosgi-core-java, libosgi-compendium-java, libmaven-bundle-plugin-java,
- libmaven-javadoc-plugin-java
+ Andres Mejia <ame...@debian.org>,
+ Damien Raude-Morvan <draz...@debian.org>
+Build-Depends: cdbs,
+ debhelper (>= 7),
+ default-jdk,
+ libmaven-bundle-plugin-java,
+ libmaven-javadoc-plugin-java,
+ libosgi-compendium-java,
+ libosgi-core-java,
+ maven-debian-helper (>= 1.4)
Standards-Version: 3.9.2
Homepage: http://felix.apache.org/site/apache-felix-framework.html
Vcs-Git: git://git.debian.org/git/pkg-java/felix-framework.git
@@ -14,19 +20,19 @@ Vcs-Browser:
http://git.debian.org/?p=pkg-java/felix-framework.git
Package: libfelix-framework-java
Architecture: all
-Depends: ${misc:Depends}, ${maven:Depends}
+Depends: ${maven:Depends}, ${misc:Depends}
Recommends: ${maven:OptionalDepends}
Suggests: libfelix-framework-java-doc
-Description: The Felix Framework subproject
- The Felix Framework subproject is an implementation
+Description: The Felix Framework subproject
+ The Felix Framework subproject is an implementation
of the OSGi R4.2 core framework specification.
Package: libfelix-framework-java-doc
Architecture: all
Section: doc
-Depends: ${misc:Depends}, ${maven:DocDepends}
+Depends: ${maven:DocDepends}, ${misc:Depends}
Recommends: ${maven:DocOptionalDepends}
-Description: Javadoc API documentation for the Felix Framework subproject
- The Felix Framework subproject is an implementation
+Description: Javadoc API documentation for the Felix Framework subproject
+ The Felix Framework subproject is an implementation
of the OSGi R4.2 core framework specification.
This package contains Javadoc API documentation.
diff --git a/debian/copyright b/debian/copyright
index faaef3d..4cb30a8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -13,10 +13,9 @@ License: GPL-2
License: Apache-2.0
- On Debian systems, the complete text of the Apache License Version 2.0,
+ On Debian systems, the complete text of the Apache License Version 2.0,
can be found in /usr/share/common-licenses/Apache-2.0.
License: GPL-2
On Debian systems, the complete text of the GNU General Public
License, version 2, can be found in /usr/share/common-licenses/GPL-2.
-
--
felix-framework packaging
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
