Réactivation de l'extension "auf-reflets-tse.oxt" pour OpenOffice.org.

diff --git a/auf-poste-client-reflets/Makefile b/auf-poste-client-reflets/Makefile
index d142bfe..81657fd 100644 (file)
--- a/auf-poste-client-reflets/Makefile
+++ b/auf-poste-client-reflets/Makefile
@@ -11,7 +11,6 @@ install:
        install -m 0755 auf-reflets-tse $(DESTDIR)/usr/bin/
        install -m 0644 auf-reflets-tse.desktop $(DESTDIR)/usr/share/applications/
        install -m 0644 auf-reflets-tse.png $(DESTDIR)/usr/share/pixmaps/
-       install -m 0755 auf-reflets-config-openoffice $(DESTDIR)/usr/bin/
        install -m 0644 auf-reflets-tse.oxt $(DESTDIR)/usr/lib/openoffice/share/extension/install/
 
 clean:

diff --git a/auf-poste-client-reflets/auf-reflets-config-openoffice b/auf-poste-client-reflets/auf-reflets-config-openoffice
deleted file mode 100755 (executable)
index 4851377..0000000
--- a/auf-poste-client-reflets/auf-reflets-config-openoffice
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/sh
-# Script auf-reflets-config-openoffice de configuration de OpenOffice
-# Copyright © 2008  Agence universitaire de la Francophonie
-# Autheur : Progfou <jean-christophe.andre@auf.org>
-# Date de création : octobre 2008
-
-EXTENSION="auf-reflets-tse.oxt"
-
-OOODIR="/usr/lib/openoffice"
-UNOPKG="$OOODIR/program/unopkg"
-EXTDIR="$OOODIR/share/extension/install"
-
-"$UNOPKG" add "$EXTDIR/$EXTENSION" \
-  "-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1"
-
-"$UNOPKG" remove "$EXTENSION" \
-  "-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1"
-
-"$UNOPKG" list > /dev/null 2>&1
-
-exit 0

diff --git a/auf-poste-client-reflets/auf-reflets-tse b/auf-poste-client-reflets/auf-reflets-tse
index 13e0649..8454918 100755 (executable)
--- a/auf-poste-client-reflets/auf-reflets-tse
+++ b/auf-poste-client-reflets/auf-reflets-tse
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Script auf-reflets-tse de lancement de connexion Reflets-TSE (Coda)
-# Copyright © 2007-2008  Agence universitaire de la Francophonie
+# Copyright © 2007-2009  Agence universitaire de la Francophonie
 # Autheur : Progfou <jean-christophe.andre@auf.org>
 # Date de création : juillet 2007
 

diff --git a/auf-poste-client-reflets/debian/changelog b/auf-poste-client-reflets/debian/changelog
index 8196c1b..1095c41 100644 (file)
--- a/auf-poste-client-reflets/debian/changelog
+++ b/auf-poste-client-reflets/debian/changelog
@@ -1,3 +1,9 @@
+auf-poste-client-reflets (1.8) jaunty; urgency=low
+
+  * Réactivation de l'extension "auf-reflets-tse.oxt" pour OpenOffice.org.
+
+ -- Progfou <jean-christophe.andre@auf.org>  Thu, 16 Jul 2009 00:55:20 +0700
+
 auf-poste-client-reflets (1.7) hardy; urgency=low
 
   * Bogue sur le test d'existence d'une ancienne licence.

diff --git a/auf-poste-client-reflets/debian/control b/auf-poste-client-reflets/debian/control
index 77e9877..fc20f4a 100644 (file)
--- a/auf-poste-client-reflets/debian/control
+++ b/auf-poste-client-reflets/debian/control
@@ -10,8 +10,8 @@ Architecture: all
 Depends: rdesktop, openoffice.org-common
 Recommends: zenity, cups-pdf, openoffice.org-calc
 Provides: auf-reflets-tse
-Replaces: auf-reflets-tse (<< 1.3)
-Conflicts: auf-reflets-tse (<< 1.3)
+Replaces: auf-reflets-tse
+Conflicts: auf-reflets-tse
 Description: configuration d'un environnement conforme au projet Reflets
  Ce paquet fournit une application "auf-reflets-tse" qui lance une
  connexion TSE pour utiliser CODA (reflets-tse.auf), ainsi qu'une extension

diff --git a/auf-poste-client-reflets/debian/dirs b/auf-poste-client-reflets/debian/dirs
new file mode 100644 (file)
index 0000000..3403f86
--- /dev/null
+++ b/auf-poste-client-reflets/debian/dirs
@@ -0,0 +1,4 @@
+usr/bin
+usr/share/applications
+usr/share/pixmaps
+usr/lib/openoffice/share/extension/install

diff --git a/auf-poste-client-reflets/debian/lintian-overrides b/auf-poste-client-reflets/debian/lintian-overrides
new file mode 100644 (file)
index 0000000..df6d681
--- /dev/null
+++ b/auf-poste-client-reflets/debian/lintian-overrides
@@ -0,0 +1,2 @@
+auf-poste-client-reflets source: maintainer-not-full-name Progfou
+auf-poste-client-reflets: maintainer-not-full-name Progfou

diff --git a/auf-poste-client-reflets/debian/postinst b/auf-poste-client-reflets/debian/postinst
index 483c8e0..7ba7b36 100644 (file)
--- a/auf-poste-client-reflets/debian/postinst
+++ b/auf-poste-client-reflets/debian/postinst
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-exit 0
-
 set -e
 
 add_extension() {
@@ -9,7 +7,7 @@ add_extension() {
   INSTDIR=`mktemp -d`
   /usr/lib/openoffice/program/unopkg add --shared $1 \
     "-env:UserInstallation=file:///$INSTDIR" \
-    '-env:UNO_JAVA_JFW_INSTALL_DATA=$ORIGIN/../share/config/javasettingsunopkginstall.xml' \
+    '-env:UNO_JAVA_JFW_INSTALL_DATA=$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' \
     "-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1"
   if [ -n $INSTDIR ]; then rm -rf $INSTDIR; fi
   echo " done."

diff --git a/auf-poste-client-reflets/debian/preinst b/auf-poste-client-reflets/debian/preinst
index ecd844f..9eeef3c 100644 (file)
--- a/auf-poste-client-reflets/debian/preinst
+++ b/auf-poste-client-reflets/debian/preinst
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-exit 0
-
 set -e
 
 flush_unopkg_cache() {
@@ -14,7 +12,7 @@ remove_extension() {
     INSTDIR=`mktemp -d`
     /usr/lib/openoffice/program/unopkg remove --shared $1 \
       "-env:UserInstallation=file://$INSTDIR" \
-      '-env:UNO_JAVA_JFW_INSTALL_DATA=$ORIGIN/../share/config/javasettingsunopkginstall.xml' \
+      '-env:UNO_JAVA_JFW_INSTALL_DATA=$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' \
       "-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1"
     if [ -n $INSTDIR ]; then rm -rf $INSTDIR; fi
     echo " done."

diff --git a/auf-poste-client-reflets/debian/prerm b/auf-poste-client-reflets/debian/prerm
index e37db89..5752d83 100644 (file)
--- a/auf-poste-client-reflets/debian/prerm
+++ b/auf-poste-client-reflets/debian/prerm
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-exit 0
-
 set -e
 
 flush_unopkg_cache() {
@@ -14,7 +12,7 @@ remove_extension() {
     INSTDIR=`mktemp -d`
     /usr/lib/openoffice/program/unopkg remove --shared $1 \
       "-env:UserInstallation=file://$INSTDIR" \
-      '-env:UNO_JAVA_JFW_INSTALL_DATA=$ORIGIN/../share/config/javasettingsunopkginstall.xml' \
+      '-env:UNO_JAVA_JFW_INSTALL_DATA=$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' \
       "-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1"
     if [ -n $INSTDIR ]; then rm -rf $INSTDIR; fi
     echo " done."