Introduce "libkohana2-modules-php" package shipping the modules.

diff --git a/debian/changelog b/debian/changelog
index a62111c0649d09d096fef295a154c9855553c6a2..02551356b2d114d8ffaea7a253f8ca396f33da10 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,12 +2,13 @@ libkohana2-php (2.3.4-1) unstable; urgency=low
 
   [ Sven Velt ]
   * Initial release (Closes: #611240).
-    - Strip out DejaVu-Font and depend on ttf-dejavu-core
+    - Strip out DejaVu-Font and depend on ttf-dejavu-core.
 
   [ Sebastian Harl ]
   * debian/patches:
     - Added 01-font-path.diff -- let 'fontpath' point to the DejaVu fonts in
       '/usr/share/fonts'.
   * Do not ship a local copy of DejaVuSerif.ttf.
+  * Symlink and depend on libjs-jquery rather than shipping a private copy.
 
  -- Sebastian Harl <tokkee@debian.org>  Mon, 31 Jan 2011 15:39:40 +0100

diff --git a/debian/control b/debian/control
index f6eb1f3e3a0ff5d30fe4ecb50c522c357fd08e17..54137f68590904c277e2625e6593dfd57da0ce88 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -10,8 +10,30 @@ Homepage: http://kohanaframework.org/
 Package: libkohana2-php
 Architecture: all
 Depends: php5 | php5-cli, ttf-dejavu-core, ${misc:Depends}
+Suggests: libkohana2-modules-php
 Description: lightweight PHP5 MVC framework
  Kohana is an object-oriented PHP 5 framework for developing applications using
  PHP. It uses the Model View Controller (MVC) design pattern and aims to be
  secure, lightweight, and easy to use.
+ .
+ This package contains the core system of the framework.
 
+Package: libkohana2-modules-php
+Architecture: all
+Depends: libkohana2-php, php5 | php5-cli, libjs-jquery, ${misc:Depends}
+Description: lightweight PHP5 MVC framework (extension modules)
+ Kohana is an object-oriented PHP 5 framework for developing applications using
+ PHP. It uses the Model View Controller (MVC) design pattern and aims to be
+ secure, lightweight, and easy to use.
+ .
+ This package contains the following modules:
+ .
+   * archive: compressed archive creation (zip, tar, gzip, bzip)
+   * auth: simple authentication and user management
+   * flot: Flot (jQuery plotting plugin) integration
+   * gmaps: Google Maps integration (geolocation and API support)
+   * kodocs: dynamic self-generated documentation
+   * payment: merchant and payment gateway wrappers (authorize.net, PayPal,
+         Trident, Trust Commerce, YourPay)
+   * smarty: Smarty (PHP template engine) integration
+   * unit_test: unit test library

diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644 (file)
index dee1ba6..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/php/kohana2

diff --git a/debian/libkohana2-modules-php.dirs b/debian/libkohana2-modules-php.dirs
new file mode 100644 (file)
index 0000000..dee1ba6
--- /dev/null
+++ b/debian/libkohana2-modules-php.dirs
@@ -0,0 +1 @@
+usr/share/php/kohana2

diff --git a/debian/libkohana2-php.dirs b/debian/libkohana2-php.dirs
new file mode 100644 (file)
index 0000000..dee1ba6
--- /dev/null
+++ b/debian/libkohana2-php.dirs
@@ -0,0 +1 @@
+usr/share/php/kohana2

diff --git a/debian/rules b/debian/rules
index ceec4cc4fa721d627018d48c31a5db6d79f56435..a7b64f63ff02f6d106c95adcf58ef358f252cf5b 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -33,8 +33,13 @@ install: build
        # remove DejaVu-Fonts and create symlink
        rm -rf $(CURDIR)/debian/libkohana2-php/usr/share/php/kohana2/system/fonts
 
+       cp -a modules $(CURDIR)/debian/libkohana2-modules-php/usr/share/php/kohana2/
+       rm -f $(CURDIR)/debian/libkohana2-modules-php/usr/share/php/kohana2/modules/kodoc/views/kodoc/media/js/jquery.js
+       ln -s /usr/share/javascript/jquery/jquery.js \
+               $(CURDIR)/debian/libkohana2-modules-php/usr/share/php/kohana2/modules/kodoc/views/kodoc/media/js/jquery.js
+
        # fix permissions
-       for file in `find $(CURDIR)/debian/libkohana2-php -name '*.php'`; do \
+       for file in `find $(CURDIR)/debian/libkohana2-* -name '*.php'`; do \
                chmod 644 $$file; \
        done
 
@@ -42,6 +47,14 @@ install: build
        rmdir debian/libkohana2-php/usr/share/php/kohana2/system/i18n/el_GR/
        rmdir debian/libkohana2-php/usr/share/php/kohana2/system/tests/
 
+       rmdir debian/libkohana2-modules-php/usr/share/php/kohana2/modules/archive/i18n/el_GR/
+       rmdir debian/libkohana2-modules-php/usr/share/php/kohana2/modules/auth/controllers/
+       rmdir debian/libkohana2-modules-php/usr/share/php/kohana2/modules/auth/views/
+       rmdir debian/libkohana2-modules-php/usr/share/php/kohana2/modules/kodoc/views/kodoc/media/css/
+       rmdir debian/libkohana2-modules-php/usr/share/php/kohana2/modules/payment/i18n/el_GR/
+       rmdir debian/libkohana2-modules-php/usr/share/php/kohana2/modules/payment/i18n/es_AR/
+       rmdir debian/libkohana2-modules-php/usr/share/php/kohana2/modules/payment/i18n/zh_CN/
+
 binary-indep: install
        dh_testdir
        dh_testroot