Le 07. 07. 13 12:45, Joachim Breitner a écrit :
From grepping through our packages it seems that happy is doing the most
sane thing, using Setup copy to install to debian/happy. Please have a
look at that and adopt to yi.
Well, happy is only one package out of its source package, whereas yi
gives four packages. Setup copy provides no way to install only the data
or only the profiling libraries... It's all in once. You can't even ask
for the profiling and non-profiling libraries to go to different
directories, they all go in libdir, end of the story. That's likely the
reason why tmp-inst-ghc is used. The only way we can take advantage of
Setup copy is :
cp -R tmp-inst-ghc/usr/share/yi yi/usr/share
the install command cannot copy directories apparently. I've created a
patch that uses this cp invocation, but I'm not going to push it into
the repo. Instead, I'm sending it to you in attachment and I'll let you
decide later. Note that it has to be applied on top of all my other patches.
Just join the DHG via alioth and push your changes to the repo directly.
I'm ready to push and trying to join. Please accept my membership request.
Greetings,
Louis
Sun Jul 7 17:10:35 CEST 2013 Louis Bettens <[email protected]>
* Changed rules to take advantage of Setup copy
the .xpm icons were added by us, so yi.cabal isn't aware of them. They must be
added to its data-files: field. This was put in the quilt patch xpm-icons.
diff -rN -u old-debian/changelog new-debian/changelog
--- old-debian/changelog 2013-07-07 17:10:51.000000000 +0200
+++ new-debian/changelog 2013-07-07 17:10:51.000000000 +0200
@@ -13,6 +13,7 @@
* Corrected -prof dependencies
* Updated dependencies with regard to yi.cabal
* Changed incorrect datadir /usr/share/yi-<version> into /usr/share/yi
+ * Changed rules to take advantage of Setup copy
-- Louis Bettens <[email protected]> Sun, 07 Jul 2013 13:49:46 +0200
diff -rN -u old-debian/patches/xpm-icons.diff new-debian/patches/xpm-icons.diff
--- old-debian/patches/xpm-icons.diff 2013-07-07 17:10:51.000000000 +0200
+++ new-debian/patches/xpm-icons.diff 2013-07-07 17:10:51.000000000 +0200
@@ -1,5 +1,7 @@
---- /dev/null
-+++ b/art/yi+lambda-fat-16.xpm
+Index: yi-0.6.7.0/art/yi+lambda-fat-16.xpm
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ yi-0.6.7.0/art/yi+lambda-fat-16.xpm 2013-07-07 16:17:23.000000000
+0200
@@ -0,0 +1,278 @@
+/* XPM */
+static char *yi_lambda_fat_16[] = {
@@ -279,8 +281,10 @@
+"dXfXgXhXjXkXlXzXxXcXvXbXnXmXMXNX",
+"BXVXCXZXAXSXDXFXGXHXJXKXLXPXIXUX"
+};
---- /dev/null
-+++ b/art/yi+lambda-fat-32.xpm
+Index: yi-0.6.7.0/art/yi+lambda-fat-32.xpm
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ yi-0.6.7.0/art/yi+lambda-fat-32.xpm 2013-07-07 16:17:23.000000000
+0200
@@ -0,0 +1,201 @@
+/* XPM */
+static char *yi_lambda_fat_32[] = {
@@ -483,3 +487,15 @@
+"I.A.A.A.A.A.A.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.B.3.K l 4.H.A.I.I.",
+"A.A.A.A.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.H.Z.h.V.I.I.I.I."
+};
+Index: yi-0.6.7.0/yi.cabal
+===================================================================
+--- yi-0.6.7.0.orig/yi.cabal 2013-06-29 18:19:06.000000000 +0200
++++ yi-0.6.7.0/yi.cabal 2013-07-07 16:18:06.000000000 +0200
+@@ -17,6 +17,7 @@
+ data-files:
+ art/*.png
+ art/*.pdf
++ art/*.xpm
+ example-configs/*.hs
+ extra-source-files: src/library/Yi/Lexer/common.hsinc
+
diff -rN -u old-debian/rules new-debian/rules
--- old-debian/rules 2013-07-07 17:10:51.000000000 +0200
+++ new-debian/rules 2013-07-07 17:10:51.000000000 +0200
@@ -9,8 +9,4 @@
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/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
+ cp -R debian/tmp-inst-ghc/usr/share/yi debian/yi/usr/share
