The following commit has been merged in the master branch:
commit c73c88e00a3b48772ac807637aeffddaca481f5d
Author: Damien Raude-Morvan <draz...@debian.org>
Date:   Sun Nov 6 19:38:53 2011 +0100

    Wrap-and-sort

diff --git a/debian/control b/debian/control
index 5e5a919..7a28da2 100644
--- a/debian/control
+++ b/debian/control
@@ -3,15 +3,27 @@ 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),
- libmaven-bundle-plugin-java,
- libmaven-javadoc-plugin-java,
- libfelix-framework-java, libfelix-shell-java, libfelix-shell-tui-java, 
libfelix-bundlerepository-java,
- libmaven-dependency-plugin-java,
- libmaven-antrun-plugin-java, ant, libfelix-gogo-runtime-java, 
libfelix-gogo-runtime-java-doc,
- libfelix-gogo-shell-java, libfelix-gogo-shell-java-doc
- libfelix-gogo-command-java, libfelix-gogo-command-java-doc
+           Andres Mejia <ame...@debian.org>,
+           Damien Raude-Morvan <draz...@debian.org>
+Build-Depends: ant,
+               cdbs,
+               debhelper (>= 7),
+               default-jdk,
+               libfelix-bundlerepository-java,
+               libfelix-framework-java,
+               libfelix-gogo-command-java,
+               libfelix-gogo-command-java-doc,
+               libfelix-gogo-runtime-java,
+               libfelix-gogo-runtime-java-doc,
+               libfelix-gogo-shell-java,
+               libfelix-gogo-shell-java-doc,
+               libfelix-shell-java,
+               libfelix-shell-tui-java,
+               libmaven-antrun-plugin-java,
+               libmaven-bundle-plugin-java,
+               libmaven-dependency-plugin-java,
+               libmaven-javadoc-plugin-java,
+               maven-debian-helper (>= 1.4)
 Standards-Version: 3.9.2
 Homepage: http://felix.apache.org/site/
 Vcs-Git: git://git.debian.org/git/pkg-java/felix-main.git
@@ -19,19 +31,33 @@ Vcs-Browser: 
http://git.debian.org/?p=pkg-java/felix-main.git
 
 Package: libfelix-main-java
 Architecture: all
-Depends: ${misc:Depends}, ${maven:Depends}
+Depends: ${maven:Depends}, ${misc:Depends}
 Recommends: ${maven:OptionalDepends}
 Suggests: libfelix-main-java-doc
 Description: Classes to instatiate and execute the Felix Framework
- The Felix Framework subproject is an implementation 
+ The Felix Framework subproject is an implementation
  of the OSGi R4.2 core framework specification.
 
 Package: libfelix-main-java-doc
 Architecture: all
 Section: doc
-Depends:  ${misc:Depends}, ${maven:DocDepends}
+Depends: ${maven:DocDepends}, ${misc:Depends}
 Recommends: ${maven:DocOptionalDepends}
 Description: Javadoc API for classes to instatiate and execute the Felix 
Framework
- The Felix Framework subproject is an implementation 
+ The Felix Framework subproject is an implementation
  of the OSGi R4.2 core framework specification.
  This package contains Javadoc API documentation.
+
+Package: felix-main
+Architecture: all
+Depends: libfelix-bundlerepository-java,
+         libfelix-gogo-command-java,
+         libfelix-gogo-runtime-java,
+         libfelix-gogo-shell-java,
+         ${maven:Depends},
+         ${misc:Depends}
+Recommends: ${maven:OptionalDepends}
+Suggests: libfelix-main-java-doc
+Description: Classes to instatiate and execute the Felix Framework
+ The Felix Framework subproject is an implementation
+ of the OSGi R4.2 core framework specification.
diff --git a/debian/copyright b/debian/copyright
index 1b79ada..32ae7a7 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-main 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

Reply via email to