[SCM] UNNAMED PROJECT branch, master, updated. cd2bac2bbcfa5968afe62cc235d05224361bbaf2

[Lionel Elie Mamane]

The following commit has been merged in the master branch:
commit cd2bac2bbcfa5968afe62cc235d05224361bbaf2
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Wed Aug 13 00:17:29 2008 +0200

    install heaps into /usr/lib

diff --git a/debian/changelog b/debian/changelog
index 08e47f6..320d8ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ isabelle (2008-4) UNRELEASED; urgency=low
   * remove obsolete /usr/share/application-registry and /usr/share/mime-info/
   * convert isabelle MIME database file to the right format
   * isabelle package now architecture: all
+  * install heaps into /usr/lib
 
  --
 
diff --git a/debian/rules b/debian/rules
index 518a7c4..151dc48 100755
--- a/debian/rules
+++ b/debian/rules
@@ -72,9 +72,9 @@ install: build
           local pkgname=isabelle-thy-"$$2"; \
 	  \
 	  mkdir -p debian/$${pkgname}/usr/share/menu; \
-	  mkdir -p debian/$${pkgname}/usr/share/isabelle/$(HEAPS)/log; \
+	  mkdir -p debian/$${pkgname}/usr/lib/isabelle/$(HEAPS)/log; \
 	  mkdir -p debian/$${pkgname}/usr/share/lintian/overrides; \
-	  cp $(HEAPS)/$${isaname} debian/$${pkgname}/usr/share/isabelle/$(HEAPS)/; \
+	  cp $(HEAPS)/$${isaname} debian/$${pkgname}/usr/lib/isabelle/$(HEAPS)/; \
 	  cp $(HEAPS)/log/$${isaname}.gz debian/$${pkgname}/usr/share/isabelle/$(HEAPS)/log/; \
 	  echo -e "$${pkgname}: menu-icon-missing /usr/share/pixmaps/isabelle.xpm\n$${pkgname}: menu-command-not-in-package" > debian/$${pkgname}/usr/share/lintian/overrides/$${pkgname}; \
 	  echo -e "?package($${pkgname}):needs=\"X11\" section=\"Applications/Science/Mathematics\" title=\"Isabelle ($${isaname})\" command=\"/usr/bin/Isabelle -l $${isaname}\" icon=\"/usr/share/pixmaps/isabelle.xpm\"" >> debian/$${pkgname}.menu; \
@@ -93,12 +93,14 @@ install: build
 	  t=$$(basename $${t}); \
 	  do_theory $${t}	misc; \
 	done
+	rmdir heaps/TODO
 
 	# isabelle
 	dh_install
 
 	mv debian/isabelle/usr/share/isabelle/etc/settings debian/isabelle/etc/isabelle.conf
 	echo "/etc/isabelle.conf /usr/share/isabelle/etc/settings" > debian/isabelle.links
+	echo "/usr/lib/isabelle/heaps /usr/share/isabelle/heaps" >> debian/isabelle.links
 
 	chmod 755 debian/isabelle/usr/share/isabelle/lib/scripts/*.pl
 

-- 
UNNAMED PROJECT