[ipe-tools] 01/02: Alexander's patch for removing obsolete figtoipe diversion.

[Steven Michael Robbins]

This is an automated email from the git hooks/post-receive script.

smr pushed a commit to branch master
in repository ipe-tools.

commit c091fe62375cccae5bfd4929d7fa8cbd45f539e1
Author: Steve M. Robbins <smr at sumost.ca>
Date:   Wed Jun 24 17:16:54 2015 -0500

    Alexander's patch for removing obsolete figtoipe diversion.
---
 debian/changelog         |  6 ++++++
 debian/control           |  2 ++
 debian/figtoipe.postinst | 16 ++++++++++++++++
 debian/figtoipe.preinst  | 11 -----------
 4 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d8d7ad1..7d74376 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ipe-tools (20150406-3) unstable; urgency=medium
+
+  * figtoipe.postinst: Remove old diversion.  Closes: #789281.
+
+ -- Alexander Bürger <acfb at users.sf.net>  Wed, 24 Jun 2015 20:40:00 +0200
+
 ipe-tools (20150406-2) unstable; urgency=medium
 
   * figtoipe.preinst: New.  Remove old diversion.  Closes: #789281.
diff --git a/debian/control b/debian/control
index 05def10..9632cd4 100644
--- a/debian/control
+++ b/debian/control
@@ -12,6 +12,8 @@ Package: figtoipe
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: ipe, netpbm
+Breaks: ipe (<<6.0pre30-1)
+Replaces: ipe (<<6.0pre30-1)
 Description: convert FIG files to XML files for ipe
  Figtoipe is a program that reads FIG files (as generated by xfig) and
  generates an XML file readable by Ipe.
diff --git a/debian/figtoipe.postinst b/debian/figtoipe.postinst
new file mode 100644
index 0000000..0367bec
--- /dev/null
+++ b/debian/figtoipe.postinst
@@ -0,0 +1,16 @@
+#!/bin/sh
+set -e
+
+# remove diversion that had been necessary for ipe <<6.0pre30-1
+if [ configure = "$1"  ]; then
+    case "$2" in
+        ( 20150406-[12] | 200* )
+        dpkg-divert --package figtoipe --remove --rename \
+                    --divert /usr/bin/figtoipe.distrib /usr/bin/figtoipe
+        dpkg-divert --package figtoipe --remove --rename \
+                    --divert /usr/share/man/man1/figtoipe.distrib.1.gz /usr/share/man/man1/figtoipe.1.gz
+        ;;
+    esac
+fi
+
+#DEBHELPER#
diff --git a/debian/figtoipe.preinst b/debian/figtoipe.preinst
deleted file mode 100644
index 4b0e044..0000000
--- a/debian/figtoipe.preinst
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-set -e
-
-if [ install = "$1"  ]; then
-    dpkg-divert --package figtoipe --remove --rename \
-        --divert /usr/bin/figtoipe.distrib /usr/bin/figtoipe
-    dpkg-divert --package figtoipe --remove --rename \
-        --divert /usr/share/man/man1/figtoipe.distrib.1.gz /usr/share/man/man1/figtoipe.1.gz
-fi
-
-#DEBHELPER#

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ipe-tools.git