Here is a new version (again)!

I have no idea what you tried to do to fix 699644 [1] but your code in glpi.postinst seems to be no-op. There'is no reasong to remove a previously installed directory. If the directory isn't installed anymore by new versions, dpkg will remove it by itself. Moreover, this code don't create any link on new installations (not link + directory). So basically, the right way to do is to simply add the link in debian/links, see my attached patch. The old postinst code is still here because I'm not really sure to understand what it's supposed to do.

[1] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=699644

--
Adam CÉCILE
Mandriva / Linbox
1, Rue Pierre Simon de Laplace : 0 810 LINBOX
F-57070 Metz direct : +33 1 76 64 16 65
FRANCE www.mandriva.com


diff -Nur /tmp/glpi-0.83.91/debian/changelog debian/changelog
--- /tmp/glpi-0.83.91/debian/changelog	2013-07-08 11:00:55.000000000 +0200
+++ debian/changelog	2013-09-18 14:08:43.812705935 +0200
@@ -1,3 +1,14 @@
+glpi (0.83.91-3.1) UNRELEASED; urgency=low
+
+  * Non-maintainer upload.
+    - Add 00-fix-css-typo patch
+    - Add 01-upgrade-from-0.71-fix patch
+    - Add missing libjs-extjs dependency
+    - Add cron.d for scheduled/recurring tasks
+    - Fix symlinks for external dependencies
+
+ -- Adam Cécile (Le_Vert) <gand...@le-vert.net>  Wed, 18 Sep 2013 14:08:01 +0200
+
 glpi (0.83.91-3) unstable; urgency=low
 
   * Move default mysql configuration to /usr/share/glpi (Closes: #714812)
diff -Nur /tmp/glpi-0.83.91/debian/control debian/control
--- /tmp/glpi-0.83.91/debian/control	2013-07-02 10:55:59.000000000 +0200
+++ debian/control	2013-09-12 15:39:26.000000000 +0200
@@ -10,12 +10,14 @@
 Architecture: all
 Depends: apache2 | apache | apache-ssl | apache-perl | httpd,
     php5 | php5-cgi | libapache2-mod-php5,
+    php5-cli,
     php5-mysql,
     debconf (>= 0.2.26) | debconf-2.0,
     dbconfig-common,
     ttf-freefont,
     tinymce,
     libphp-phpmailer,
+    libjs-extjs,
     ${misc:Depends}
 Recommends: mysql-client,
     mysql-server
diff -Nur /tmp/glpi-0.83.91/debian/glpi.cron.d debian/glpi.cron.d
--- /tmp/glpi-0.83.91/debian/glpi.cron.d	1970-01-01 01:00:00.000000000 +0100
+++ debian/glpi.cron.d	2013-09-12 15:34:34.000000000 +0200
@@ -0,0 +1 @@
+*/1 * * * * www-data /usr/bin/php5 /usr/share/glpi/front/cron.php
diff -Nur /tmp/glpi-0.83.91/debian/links debian/links
--- /tmp/glpi-0.83.91/debian/links	1970-01-01 01:00:00.000000000 +0100
+++ debian/links	2013-09-18 14:06:12.146302844 +0200
@@ -0,0 +1,2 @@
+usr/share/javascript/extjs usr/share/glpi/lib/extjs
+usr/share/fonts/truetype/freefont/FreeSans.ttf usr/share/glpi/lib/ezcomponents/FreeSans.ttf
diff -Nur /tmp/glpi-0.83.91/debian/patches/00-fix-css-typo.patch debian/patches/00-fix-css-typo.patch
--- /tmp/glpi-0.83.91/debian/patches/00-fix-css-typo.patch	1970-01-01 01:00:00.000000000 +0100
+++ debian/patches/00-fix-css-typo.patch	2013-09-10 17:36:56.000000000 +0200
@@ -0,0 +1,11 @@
+--- glpi/inc/toolbox.class.php.new	2013-09-10 17:28:58.388712110 +0200
++++ glpi/inc/toolbox.class.php	2013-06-25 08:17:42.000000000 +0200
+@@ -491,7 +491,7 @@
+ 
+       // Display
+       if (!isCommandLine()) {
+-         echo '<div style="position:fload-left; background-color:red; z-index:10000">'.
++         echo '<div style="position:float-left; background-color:red; z-index:10000">'.
+               '<span class="b">PHP '.$type.': </span>';
+          echo $errmsg.' in '.$filename.' at line '.$linenum.'</div>';
+       } else {
diff -Nur /tmp/glpi-0.83.91/debian/patches/01-upgrade-from-0.71-fix.patch debian/patches/01-upgrade-from-0.71-fix.patch
--- /tmp/glpi-0.83.91/debian/patches/01-upgrade-from-0.71-fix.patch	1970-01-01 01:00:00.000000000 +0100
+++ debian/patches/01-upgrade-from-0.71-fix.patch	2013-09-10 17:31:10.000000000 +0200
@@ -0,0 +1,11 @@
+--- glpi/install/update_0713_072.php	2013-06-25 08:17:42.000000000 +0200
++++ glpi/install/update_0713_072.php.new	2013-09-10 17:30:35.825234998 +0200
+@@ -325,7 +325,7 @@
+                      $query_search_version = "SELECT *
+                                               FROM `glpi_softwareversions`
+                                               WHERE `sID` = '".$soft['ID']."'
+-                                                    AND `name` = '".$vers['version']."'";
++                                                    AND `name` = '".addslashes($vers['version'])."'"; 
+ 
+                      if ($result_searchvers = $DB->query($query_search_version)) {
+                         // Version already exists : update inst_software
diff -Nur /tmp/glpi-0.83.91/debian/patches/series debian/patches/series
--- /tmp/glpi-0.83.91/debian/patches/series	2013-06-26 17:08:17.000000000 +0200
+++ debian/patches/series	2013-09-10 17:36:23.000000000 +0200
@@ -1 +1,3 @@
 02-remove-code-copy-phpmailer.patch
+00-fix-css-typo.patch
+01-upgrade-from-0.71-fix.patch
diff -Nur /tmp/glpi-0.83.91/debian/rules debian/rules
--- /tmp/glpi-0.83.91/debian/rules	2013-07-08 10:55:51.000000000 +0200
+++ debian/rules	2013-09-18 14:06:35.657435143 +0200
@@ -60,9 +60,8 @@
 	rm -f $(GDIR)/lib/extjs/license.txt
 	# delete remove.txt files
 	find $(DESTDIR) -name remove.txt -exec rm -f {} \;
-	# fix duplicate-font-file
-	rm debian/glpi/usr/share/glpi/lib/ezcomponents/FreeSans.ttf; \
-	ln -s /usr/share/fonts/truetype/freefont/FreeSans.ttf debian/glpi/usr/share/glpi/lib/ezcomponents/FreeSans.ttf
+	# fix duplicate-font-file, replaced by a link (see debian/links)
+	rm debian/glpi/usr/share/glpi/lib/ezcomponents/FreeSans.ttf
 	# remove copy of libraries
 	rm -rf $(DESTDIR)/usr/share/glpi/lib/phpcas
 	rm -rf $(DESTDIR)/usr/share/glpi/lib/tiny_mce
@@ -88,6 +87,7 @@
 	dh_link
 	dh_fixperms
 	dh_compress
+	dh_installcron
 	dh_installdebconf -pglpi
 	dh_installdeb
 	dh_gencontrol

Reply via email to