[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. upstream/4.0.0debian-124-gb3f22ba

[Paul van Tilburg]

The following commit has been merged in the master branch:
commit b3f22baa12036b3b85894d5814a73ea0f605ff28
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Thu May 24 19:52:59 2012 +0200

    Added a depend on php-getid3; no longer install getid3 to 3rdparty

diff --git a/debian/TODO b/debian/TODO
index 619f293..6cb148f 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -3,8 +3,6 @@ ownCloud packaging TODO list
 
 * Remove the MDB2 SQLite driver installed by owncloud-sqlite and depend
   on php-mdb2-driver-sqlite (still to be packaged).
-* Bring php-getid3 up to date in Debian and use it as a depend; remove the
-  source and integrate with it (the package has a weird installation path).
 
 Low priority/later
 ------------------
diff --git a/debian/changelog b/debian/changelog
index 9bc0667..75b61c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ owncloud (4.0.0debian-1) UNRELEASED; urgency=low
   * debian/control:
     - Added owncloud-{mysql,pgsql,sqlite} dependency packages.
     - Added a depend on libphp-phpmailer.
+    - Added a depend on php-getid3.
     - Bumped the libjs-jquery depend to >= 1.7.2-1.
     - Dropped the depends on dbconfig-common, debconf, and ucf; not used yet.
     - Added a recommend for exim4 | mail-transport-agent.
@@ -26,15 +27,16 @@ owncloud (4.0.0debian-1) UNRELEASED; urgency=low
       05_adding_jquery_fancyboxbox.diff,
       06_adding_jquery.mousewheel.diff as this is handled upstream now.
     - Added 03_fix_phpmailer.diff to fix the phpmailer require.
+  * debian/rules: no longer leave phpmailer and getid3 installed.
   * debian/*.README.Debian: added to explain the database setup and virtual
     host stuff.
   * debian/README.source: added to explain the state of the source and how
-    it is processed when installing. 
+    it is processed when installing.
   * debian/config/apache/htaccess: update from upstream .htaccess and rebase
-    paths under /owncloud. 
-  * debian/watch: updated to apply repacking.
+    paths under /owncloud.
   * debian/repack.sh: added to remove unused, sourceless minified
     JavaScript files in 3rdparty/timepicker/css/include.
+  * debian/watch: updated to apply repacking.
 
  -- Thomas Mueller <thomas.mueller at tmit.eu>  Tue, 15 May 2012 00:42:12 +0200
 
diff --git a/debian/control b/debian/control
index ceb54bd..1692334 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Architecture: all
 Depends:  ${misc:Depends},
  apache2 | httpd,
  php5, php5-gd, php-pear, php-xml-parser, php-crypt-blowfish, php-sabredav,
- php-mdb2, php-mdb2-schema, libphp-phpmailer,
+ php-mdb2, php-mdb2-schema, libphp-phpmailer, php-getid3,
  owncloud-mysql (= ${source:Version}) | owncloud-pgsql (= ${source:Version}) | owncloud-sqlite (= ${source:Version}),
  libjs-jquery (>= 1.7.2-1), libjs-jquery-ui, libjs-jquery-jplayer
 Recommends: exim4 | mail-transport-agent
diff --git a/debian/rules b/debian/rules
index 4a63e9c..5b311b6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,6 +21,7 @@ override_dh_install:
 	rm -r debian/owncloud/usr/share/owncloud/3rdparty/PEAR/ # php-pear
 	rm -r debian/owncloud/usr/share/owncloud/3rdparty/Sabre # php-sabre
 	rm -r debian/owncloud/usr/share/owncloud/3rdparty/XML/ # php-xml-parser / php-xml-rpc
+	rm -r debian/owncloud/usr/share/owncloud/3rdparty/getid3 # php-getid3
 	rm -r debian/owncloud/usr/share/owncloud/3rdparty/simpletest # not used
 	rm debian/owncloud/usr/share/owncloud/3rdparty/MDB2.php # php-mdb2
 	rm debian/owncloud/usr/share/owncloud/3rdparty/PEAR*.php # php-pear
@@ -33,7 +34,6 @@ override_dh_install:
 	rm debian/owncloud/usr/share/owncloud/3rdparty/PEAR-LICENSE
 	rm debian/owncloud/usr/share/owncloud/3rdparty/js/chosen/LICENSE.md
 	rm debian/owncloud/usr/share/owncloud/3rdparty/fullcalendar/*-LICENSE.txt
-	rm debian/owncloud/usr/share/owncloud/3rdparty/getid3/license*.txt
 	rm debian/owncloud/usr/share/owncloud/3rdparty/php-cloudfiles/COPYING
 	rm debian/owncloud/usr/share/owncloud/3rdparty/timepicker/*-LICENSE.txt
 	rm debian/owncloud/usr/share/owncloud/3rdparty/when/MIT-LICENSE.txt

-- 
owncloud.git