Hi David, Hi Raphaël,
Le 14/03/2015 14:23, David Prévot a écrit :
>>> Do you think, in between, it's worth to make a package which remove the
>>> upstream embedded ZendDB and embed a proper (let says 2.3.6) version of
>>> it.
>
> That would be fine: you may just copy a recent ZendDB in place of the
> existing one, and keep the diff in debian/patches.
As I've no experience on that sort of thing, would you mind to have a
look at attached patch and tell me if :
- it does the trick ?
- it is a good way of doing it ?
(upstream corrected the bug in git tree but does not intend to release
the fix before a while).
Thanks for your help.
--
François-Régis
diff --git a/debian/changelog b/debian/changelog
index 5d6fd03..ddc5f6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+galette (0.8+dfsg-2) unstable; urgency=medium
+
+ * Upgrading to Zend 2.3.7 (Closes: #780424)
+
+ -- François-Régis Vuillemin <frv-deb...@miradou.com> Mon, 16 Mar 2015 13:06:57 +0100
+
galette (0.8+dfsg-1) unstable; urgency=medium
* Generalized Files-Excluded in prevision of upstream/0.8
diff --git a/debian/patches/series b/debian/patches/series
index 9e3c0ed..93eb4f6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
# Enable this patch for a Squeeze backport
# update-php-minversion
dont_rely_on_class.phpmailer.php_to_act_as_an_autoloader
+update_ZendDb_version.patch
diff --git a/debian/patches/update_ZendDb_version.patch b/debian/patches/update_ZendDb_version.patch
new file mode 100644
index 0000000..4ee0f91
--- /dev/null
+++ b/debian/patches/update_ZendDb_version.patch
@@ -0,0 +1,11 @@
+--- a/galette/config/versions.inc.php
++++ b/galette/config/versions.inc.php
+@@ -36,7 +36,7 @@
+ * @since Available since 0.7dev - 2009-03-13
+ */
+ define('SMARTY_VERSION', '3.1.19');
+-define('ZEND_VERSION', '2.3.1');
++define('ZEND_VERSION', '2.3.7');
+ define('ANALOG_VERSION', '1.0.0.git876d8a3bb');
+ define('TCPDF_VERSION', '6.0.089');
+ define('JQUERY_VERSION', '1.10.2');
diff --git a/debian/rules b/debian/rules
index 299f55c..d571daf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,10 +15,14 @@ override_dh_install:
# Drop documentation installed in /usr/share/doc
rm -rf debian/galette/usr/share/galette/docs
# Drop embedded libraries that we don't need
+ rm -rf debian/galette/usr/share/galette/includes/Zend-2.3.1
rm -rf debian/galette/usr/share/galette/includes/phpMailer-*
rm -rf debian/galette/usr/share/galette/includes/Smarty-*
rm -rf debian/galette/usr/share/galette/includes/tcpdf_*
rm -rf debian/galette/usr/share/galette/includes/Analog-*
+ # Update to ZendDB 2.3.7
+ wget "http://download.tuxfamily.org/galette/dev/galette_dev_includes.tar.bz2"; -O - | \
+ tar -j --directory debian/galette/usr/share/galette/includes/ -x ./Zend-2.3.7/
# Cleanup useless stuff
rm -rf debian/galette/usr/share/galette/lang/*.py
