[SCM] felix-main packaging branch, master, updated. debian/2.0.5-2-13-gb29eee4

[Damien Raude-Morvan]

The following commit has been merged in the master branch:
commit 168521a23e725dc74e3a13c36f554a493840b93b
Author: Damien Raude-Morvan <drazzib at debian.org>
Date:   Sun Nov 6 20:24:23 2011 +0100

    New felix-main package:
    
    * New felix-main package:
      - d/control: Depends on libfelix-gogo-*-java.
      - d/felix-main.*: Install and links to /usr/share/felix-main/.

diff --git a/debian/changelog b/debian/changelog
index 9994c9b..7e9d3bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,8 +9,11 @@ felix-main (4.0.1-1) UNRELEASED; urgency=low
   * d/patches/default_version.diff: Drop, not needed anymore.
   * Add Depends on libfelix-gogo-runtime-java, libfelix-gogo-shell-java
     and libfelix-gogo-command-java.
+  * New felix-main package:
+    - d/control: Depends on libfelix-gogo-*-java.
+    - d/felix-main.*: Install and links to /usr/share/felix-main/.
 
- -- Damien Raude-Morvan <drazzib at debian.org>  Sun, 06 Nov 2011 19:38:02 +0100
+ -- Damien Raude-Morvan <drazzib at debian.org>  Sun, 06 Nov 2011 20:23:29 +0100
 
 felix-main (2.0.5-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 7a28da2..42999a1 100644
--- a/debian/control
+++ b/debian/control
@@ -34,7 +34,7 @@ Architecture: all
 Depends: ${maven:Depends}, ${misc:Depends}
 Recommends: ${maven:OptionalDepends}
 Suggests: libfelix-main-java-doc
-Description: Classes to instatiate and execute the Felix Framework
+Description: Librairies to instatiate and execute the Felix Framework
  The Felix Framework subproject is an implementation
  of the OSGi R4.2 core framework specification.
 
@@ -46,6 +46,7 @@ Recommends: ${maven:DocOptionalDepends}
 Description: Javadoc API for classes to instatiate and execute the Felix Framework
  The Felix Framework subproject is an implementation
  of the OSGi R4.2 core framework specification.
+ .
  This package contains Javadoc API documentation.
 
 Package: felix-main
@@ -54,10 +55,11 @@ Depends: libfelix-bundlerepository-java,
          libfelix-gogo-command-java,
          libfelix-gogo-runtime-java,
          libfelix-gogo-shell-java,
-         ${maven:Depends},
+         libfelix-main-java (= ${Source-Version}),
          ${misc:Depends}
-Recommends: ${maven:OptionalDepends}
 Suggests: libfelix-main-java-doc
-Description: Classes to instatiate and execute the Felix Framework
+Description: Execution environnement for Felix Framework
  The Felix Framework subproject is an implementation
  of the OSGi R4.2 core framework specification.
+ .
+ This package contains bootstrap tools to run Felix Framework.
diff --git a/debian/felix-main.dirs b/debian/felix-main.dirs
new file mode 100644
index 0000000..f66f2c8
--- /dev/null
+++ b/debian/felix-main.dirs
@@ -0,0 +1,5 @@
+/etc/felix-framework/
+/usr/share/felix-framework/bin/
+/usr/share/felix-framework/bundle/
+/usr/share/felix-framework/conf/
+/var/cache/felix-framework/
diff --git a/debian/felix-main.install b/debian/felix-main.install
new file mode 100644
index 0000000..cf0084e
--- /dev/null
+++ b/debian/felix-main.install
@@ -0,0 +1 @@
+conf/config.properties /etc/felix-framework/
diff --git a/debian/felix-main.links b/debian/felix-main.links
new file mode 100644
index 0000000..51dfbcf
--- /dev/null
+++ b/debian/felix-main.links
@@ -0,0 +1,10 @@
+/usr/share/java/org.apache.felix.main.jar /usr/share/felix-framework/bin/felix.jar
+
+/usr/share/java/org.apache.felix.gogo.command.jar /usr/share/felix-framework/bundle/org.apache.felix.gogo.command.jar
+/usr/share/java/org.apache.felix.gogo.runtime.jar /usr/share/felix-framework/bundle/org.apache.felix.gogo.runtime.jar
+/usr/share/java/org.apache.felix.gogo.shell.jar /usr/share/felix-framework/bundle/org.apache.felix.gogo.shell.jar
+/usr/share/java/org.apache.felix.bundlerepository.jar /usr/share/felix-framework/bundle/org.apache.felix.bundlerepository.jar
+
+/etc/felix-main/config.properties /usr/share/felix-framework/conf/config.properties
+
+/var/cache/felix-framework /usr/share/felix-framework/felix-cache

-- 
felix-main packaging