[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#699166: unblock: accessodf/0.1-2



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock the package accessodf.

The application to be unblocked is a Libreoffice extension. Currently it is
installed using unopkg, the Libreoffice extension manager. Using unopkg
directly has bad side effects, see bug #679717, it leaves files behind after
purge.

The new version extract the files from the OXT-file (a zip file containing the
extension) to /usr/lib/libreoffice/share/extensions. The old version installs
the package with maintainer scripts, the new is therefore easier and more
fault-tolerant.
Just the rules and the install-file needs to be changed.

Since now the files are directly in /usr/lib, two files have to be added for the
package to be Lintian-clean: 
* First a links-file, since the jar of the extension is moved to
  /usr/share/accessodf.
* An override-file, since there are some thumbnails in the extension which the
  application expects there but are in /usr/lib/.../extensions/accessodf.

Here is the debdiff output:
===
diff -Nru accessodf-0.1/debian/accessodf.lintian-overrides accessodf-0.1/debian/accessodf.lintian-overrides
--- accessodf-0.1/debian/accessodf.lintian-overrides	1970-01-01 01:00:00.000000000 +0100
+++ accessodf-0.1/debian/accessodf.lintian-overrides	2013-01-23 17:25:54.000000000 +0100
@@ -0,0 +1 @@
+accessodf binary: image-file-in-usr-lib
diff -Nru accessodf-0.1/debian/changelog accessodf-0.1/debian/changelog
--- accessodf-0.1/debian/changelog	2012-11-02 12:33:21.000000000 +0100
+++ accessodf-0.1/debian/changelog	2013-01-23 17:25:54.000000000 +0100
@@ -1,8 +1,16 @@
+accessodf (0.1-2) unstable; urgency=low
+
+  * {pre,post}{inst|rm}: removed. The cleaner (now working) solution is to
+    just unzip the package. This method won't leave unowned files behind.
+    (Closes: #679717)
+
+ -- Sebastian Humenda <shumenda@gmx.de>  Mon, 21 Jan 2013 19:01:52 +0200
+
 accessodf (0.1-1.3) unstable; urgency=low
 
   * Non-maintainer upload.
   * oops, forgot a unopkg in preinst, thanks Andreas Beckmann
-    (closes: #679717) 
+    (closes: #679717)
 
  -- Rene Engelhard <rene@rene-engelhard.de>  Fri, 02 Nov 2012 12:32:50 +0100
 
diff -Nru accessodf-0.1/debian/control accessodf-0.1/debian/control
--- accessodf-0.1/debian/control	2012-06-30 05:23:20.000000000 +0200
+++ accessodf-0.1/debian/control	2013-01-23 17:25:54.000000000 +0100
@@ -4,7 +4,7 @@
 Maintainer: Sebastian Humenda <shumenda@gmx.de>
 Build-Depends: debhelper (>= 7.0.50~), ant (>= 1.8~), ant-optional,
 	default-jdk, openjdk-6-jre-headless | openjdk-7-jre-headless,
-	libcommons-collections3-java, libreoffice-java-common (>= 1:3.5.0~)
+	libcommons-collections3-java, libreoffice-java-common (>= 1:3.5.0~), unzip
 Standards-Version: 3.9.2
 Homepage: http://sourceforge.net/p/accessodf
 
diff -Nru accessodf-0.1/debian/install accessodf-0.1/debian/install
--- accessodf-0.1/debian/install	2012-04-10 00:36:53.000000000 +0200
+++ accessodf-0.1/debian/install	2013-01-26 19:18:03.000000000 +0100
@@ -1,2 +1,3 @@
-dist/AccessODF.oxt usr/share/accessodf
 dist/lib/accessodf.jar usr/share/java
+debian/tmp/usr/lib/libreoffice/share/extensions/accessodf/*
+debian/tmp/usr/share/accessodf/*
diff -Nru accessodf-0.1/debian/links accessodf-0.1/debian/links
--- accessodf-0.1/debian/links	1970-01-01 01:00:00.000000000 +0100
+++ accessodf-0.1/debian/links	2013-01-26 19:08:18.000000000 +0100
@@ -0,0 +1 @@
+/usr/share/accessodf/accessodf-addon.jar /usr/lib/libreoffice/share/extensions/accessodf/accessodf-addon.jar
diff -Nru accessodf-0.1/debian/postinst accessodf-0.1/debian/postinst
--- accessodf-0.1/debian/postinst	2012-10-23 19:53:33.000000000 +0200
+++ accessodf-0.1/debian/postinst	1970-01-01 01:00:00.000000000 +0100
@@ -1,25 +0,0 @@
-#!/bin/sh
-# This maintainer script was originally written by Harri Pitkänen, Teemu Likonen
-# and Timo Jyrinki and was adopted from the openoffice.org-voikko package. It
-# was modified by Sebastian Humenda to fit for the AccessODF package.
-
-PATH=/bin:/usr/bin
-
-set -e
-
-add_extension() {
-    echo -n "Adding extension $1..."
-    INSTDIR=`mktemp -d`
-    HOME=$INSTDIR unopkg add --shared $1 \
-        "-env:UserInstallation=file:///$INSTDIR" \
-        '-env:UNO_JAVA_JFW_INSTALL_DATA=$ORIGIN/../share/config/javasettingsunopkginstall.xml' \
-        "-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1"
-    if [ -n $INSTDIR ]; then rm -rf $INSTDIR; fi
-    echo " done."
-}
-
-if [ "$1" = "configure" -o "$1" = "upgrade" ]; then
-    add_extension /usr/share/accessodf/AccessODF.oxt
-fi
-
-#DEBHELPER#
diff -Nru accessodf-0.1/debian/preinst accessodf-0.1/debian/preinst
--- accessodf-0.1/debian/preinst	2012-11-02 12:32:32.000000000 +0100
+++ accessodf-0.1/debian/preinst	1970-01-01 01:00:00.000000000 +0100
@@ -1,41 +0,0 @@
-#!/bin/sh
-# This maintainer script was originally written by Harri Pitkänen, Teemu Likonen
-# and Timo Jyrinki and was adoptet from the openoffice.org-voikko package. It
-# was modified by Sebastian Humenda to fit for the accessodf package.
-
-PATH=/bin:/usr/bin
-set -e
-
-flush_unopkg_cache() {
-	INSTDIR=`mktemp -d`
-        HOME=$INSTDIR unopkg list --shared "-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1" > /dev/null 2>&1
-}
-
-remove_extension() {
-  INSTDIR=`mktemp -d`
-  if HOME=$INSTDIR unopkg list --shared $1 >/dev/null; then
-    echo -n "Removing extension $1..."
-    HOME=$INSTDIR unopkg remove --shared $1 \
-      "-env:UserInstallation=file://$INSTDIR" \
-      '-env:UNO_JAVA_JFW_INSTALL_DATA=$ORIGIN/../share/config/javasettingsunopkginstall.xml' \
-      "-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1"
-    if [ -n $INSTDIR ]; then rm -rf $INSTDIR; fi
-    echo " done."
-    flush_unopkg_cache
-  fi
-}
-
-case "$1" in
-    upgrade|install)
-	INSTDIR=`mktemp -d`
-        echo Removing old accessodf extensions.
-        id=" "
-        while [ "$id" != ""  ]; do
-            id=`HOME=$INSTDIR unopkg list --shared | egrep '^(Name|Identifier):.*accessodf' | cut -d":" -f2 | head -n 1`
-            if [ "$id" != "" ]; then remove_extension $id; fi
-        done
-    ;;
-esac
-
-
-#DEBHELPER#
diff -Nru accessodf-0.1/debian/prerm accessodf-0.1/debian/prerm
--- accessodf-0.1/debian/prerm	2012-10-23 19:48:44.000000000 +0200
+++ accessodf-0.1/debian/prerm	1970-01-01 01:00:00.000000000 +0100
@@ -1,33 +0,0 @@
-#!/bin/sh
-# This maintainer script was originally written by Harri Pitkänen, Teemu Likonen
-# and Timo Jyrinki and was adoptet from the openoffice.org-voikko package. It
-# was modified by Sebastian Humenda to fit for the accessodf package.
-
-set -e
-
-flush_unopkg_cache() {
-    HOME=$INSTDIR unopkg list --shared "-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1" > /dev/null 2>&1
-}
-
-remove_extension() {
-    INSTDIR=`mktemp -d`
-    if HOME=$INSTDIR unopkg list --shared $1 >/dev/null; then
-        echo -n "Removing extension $1..."
-        HOME=$INSTDIR unopkg remove --shared $1 \
-        "-env:UserInstallation=file://$INSTDIR" \
-        '-env:UNO_JAVA_JFW_INSTALL_DATA=$ORIGIN/../share/config/javasettingsunopkginstall.xml' \
-        "-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1"
-    if [ -n $INSTDIR ]; then rm -rf $INSTDIR; fi
-    echo " done."
-    flush_unopkg_cache
-    fi
-}
-
-case "$1" in
-    remove)
-        remove_extension be.docarch.accessodf.ooo.accessodfaddon
-    ;;
-esac
-
-
-#DEBHELPER#
diff -Nru accessodf-0.1/debian/rules accessodf-0.1/debian/rules
--- accessodf-0.1/debian/rules	2012-04-10 00:36:53.000000000 +0200
+++ accessodf-0.1/debian/rules	2013-01-26 19:15:23.000000000 +0100
@@ -19,6 +19,14 @@
 override_dh_auto_build:
 	ant -Don-debian=True uno-package
 
+override_dh_auto_install:
+	mkdir -p debian/tmp/usr/lib/libreoffice/share/extensions/accessodf
+	mkdir -p debian/tmp/usr/share/accessodf
+	unzip -d debian/tmp/usr/lib/libreoffice/share/extensions/accessodf/ dist/AccessODF.oxt 
+	-rm -rf debian/tmp/usr/lib/libreoffice/share/extensions/accessodf/lib
+	mv debian/tmp/usr/lib/libreoffice/share/extensions/accessodf/accessodf-addon.jar debian/tmp/usr/share/accessodf
+
+
 get-orig-source:
 	rm -rf get-orig-source $(TARBALL)
 	mkdir get-orig-source

unblock accessodf/0.1-2

-- System Information:
Debian Release: 7.0
Architecture: i386 (i686)

Kernel: Linux 3.4.4 (SMP w/2 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Attachment: signature.asc
Description: Digital signature


Reply to: