yi: Changed incorrect datadir /usr/share/yi-<version> into /usr/share/yi

4 files changed, 16 insertions, 15 deletions

diff --git a/p/yi/debian/changelog b/p/yi/debian/changelog
index aaed7e540..cd5ebea6d 100644
--- a/p/yi/debian/changelog
+++ b/p/yi/debian/changelog
@@ -12,6 +12,7 @@ yi (0.6.7.0-1) UNRELEASED; urgency=low
     thus deleted here
   * Corrected -prof dependencies
   * Updated dependencies with regard to yi.cabal
+  * Changed incorrect datadir /usr/share/yi-<version> into /usr/share/yi
 
  -- Louis Bettens <louis@bettens.info>  Sun, 07 Jul 2013 13:49:46 +0200
 
diff --git a/p/yi/debian/rules b/p/yi/debian/rules
index ba26139a8..b298cc270 100755
--- a/p/yi/debian/rules
+++ b/p/yi/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-DEB_SETUP_GHC_CONFIGURE_ARGS := -fpango
+DEB_SETUP_GHC_CONFIGURE_ARGS := -fpango --datasubdir=yi
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/hlibrary.mk
@@ -9,8 +9,8 @@ build/yi:: build-ghc-stamp
 binary-fixup/yi::
 	install -m 755 -s -D dist-ghc/build/yi/yi debian/yi/usr/bin/yi || true
 	install -m 755 -s -D dist-ghc/build/parserTest/parserTest debian/yi/usr/bin/parserTest || true
-	install -m 644 -D art/*.png debian/yi/usr/share/yi-0.6.7.0/art || true
-	install -m 644 -D art/*.pdf debian/yi/usr/share/yi-0.6.7.0/art || true
-	install -m 644 -D example-configs/*.hs debian/yi/usr/share/yi-0.6.7.0/example-configs || true
-	install -m 644 -D art/*.xpm debian/yi/usr/share/yi-0.6.7.0/art || true
+	install -m 644 -D art/*.png debian/yi/usr/share/yi/art || true
+	install -m 644 -D art/*.pdf debian/yi/usr/share/yi/art || true
+	install -m 644 -D example-configs/*.hs debian/yi/usr/share/yi/example-configs || true
+	install -m 644 -D art/*.xpm debian/yi/usr/share/yi/art || true
 	install -m 644 -D debian/*.desktop debian/yi/usr/share/applications || true
diff --git a/p/yi/debian/yi.dirs b/p/yi/debian/yi.dirs
index 64b49efbf..aed6b3350 100644
--- a/p/yi/debian/yi.dirs
+++ b/p/yi/debian/yi.dirs
@@ -1,5 +1,5 @@
 usr/share/applications
-usr/share/yi-0.6.7.0/art
-usr/share/yi-0.6.7.0/example-configs
+usr/share/yi/art
+usr/share/yi/example-configs
 
 
diff --git a/p/yi/debian/yi.menu b/p/yi/debian/yi.menu
index 0aa197f2d..fe32ac54c 100644
--- a/p/yi/debian/yi.menu
+++ b/p/yi/debian/yi.menu
@@ -3,8 +3,8 @@
   section="Applications/Editors"\
   title="Yi (Pango, Emacs)"\
   command="/usr/bin/yi -fpango --as=emacs"\
-  icon16x16="/usr/share/yi-0.6.7.0/art/yi+lambda-fat-16.xpm"\
-  icon32x32="/usr/share/yi-0.6.7.0/art/yi+lambda-fat-32.xpm"\
+  icon16x16="/usr/share/yi/art/yi+lambda-fat-16.xpm"\
+  icon32x32="/usr/share/yi/art/yi+lambda-fat-32.xpm"\
   hints="Text"
 
 ?package(yi):\
@@ -12,8 +12,8 @@
   section="Applications/Editors"\
   title="Yi (Pango, Vim)"\
   command="/usr/bin/yi -fpango --as=vim"\
-  icon16x16="/usr/share/yi-0.6.7.0/art/yi+lambda-fat-16.xpm"\
-  icon32x32="/usr/share/yi-0.6.7.0/art/yi+lambda-fat-32.xpm"\
+  icon16x16="/usr/share/yi/art/yi+lambda-fat-16.xpm"\
+  icon32x32="/usr/share/yi/art/yi+lambda-fat-32.xpm"\
   hints="Text"
 
 ?package(yi):\
@@ -21,8 +21,8 @@
   section="Applications/Editors"\
   title="Yi (Vty, Emacs)"\
   command="/usr/bin/yi -fvty --as=emacs"\
-  icon16x16="/usr/share/yi-0.6.7.0/art/yi+lambda-fat-16.xpm"\
-  icon32x32="/usr/share/yi-0.6.7.0/art/yi+lambda-fat-32.xpm"\
+  icon16x16="/usr/share/yi/art/yi+lambda-fat-16.xpm"\
+  icon32x32="/usr/share/yi/art/yi+lambda-fat-32.xpm"\
   hints="Text"
 
 ?package(yi):\
@@ -30,8 +30,8 @@
   section="Applications/Editors"\
   title="Yi (Vty, Vim)"\
   command="/usr/bin/yi -fvty --as=vim"\
-  icon16x16="/usr/share/yi-0.6.7.0/art/yi+lambda-fat-16.xpm"\
-  icon32x32="/usr/share/yi-0.6.7.0/art/yi+lambda-fat-32.xpm"\
+  icon16x16="/usr/share/yi/art/yi+lambda-fat-16.xpm"\
+  icon32x32="/usr/share/yi/art/yi+lambda-fat-32.xpm"\
   hints="Text"