Debian Emacs Devel Commit: rev 65 - emacs21/pkg/trunk/debian

[Rob Browning]

Author: rlb
Date: 2004-03-18 11:56:18 -0700 (Thu, 18 Mar 2004)
New Revision: 65

Modified:
   emacs21/pkg/trunk/debian/build-binary-pkg
   emacs21/pkg/trunk/debian/changelog
Log:
* put fns*.el files back in exec-directory.  Emacs loads them explicitly.


Modified: emacs21/pkg/trunk/debian/build-binary-pkg
===================================================================
--- emacs21/pkg/trunk/debian/build-binary-pkg	2004-03-17 22:27:47 UTC (rev 64)
+++ emacs21/pkg/trunk/debian/build-binary-pkg	2004-03-18 18:56:18 UTC (rev 65)
@@ -29,16 +29,17 @@
       debian/${tmppkgdir}/usr/lib/emacs/${runver}/${target}/fns-*.el
 
 # move files to the build directory
+install -d debian/${pkgdir}/usr/lib/emacs/${runver}/${target}/
 mv debian/${tmppkgdir}/usr/lib/emacs/${runver}/${target}/fns-*.el \
    debian/${tmppkgdir}/usr/lib/emacs/${runver}/${target}/fns-*.elc \
-   debian/${pkgdir}/usr/share/emacs/${runver}/
+   debian/${pkgdir}/usr/lib/emacs/${runver}/${target}/
 
 # rename fns-*.el and elc files
-(cd debian/${pkgdir}/usr/share/emacs/${runver}/${target}/ \
+(cd debian/${pkgdir}/usr/lib/emacs/${runver}/${target}/ \
  && test `ls fns-*.el | wc -l` -eq 1 \
  && mv fns-*.el \
    `echo fns-*.el | perl -pe "s/^fns-(.*)\.el\$/fns-\\$1-${xsupport}.el/ or die;"`)
-(cd debian/${pkgdir}/usr/share/emacs/${runver}/${target}/ \
+(cd debian/${pkgdir}/usr/lib/emacs/${runver}/${target}/ \
  && test `ls fns-*.elc | wc -l` -eq 1 \
  && mv fns-*.elc \
    `echo fns-*.elc | perl -pe "s/^fns-(.*)\.elc\$/fns-\\$1-${xsupport}.elc/ or die;"`)

Modified: emacs21/pkg/trunk/debian/changelog
===================================================================
--- emacs21/pkg/trunk/debian/changelog	2004-03-17 22:27:47 UTC (rev 64)
+++ emacs21/pkg/trunk/debian/changelog	2004-03-18 18:56:18 UTC (rev 65)
@@ -86,8 +86,7 @@
     - debian/rules: generate md5sums file just before building packages.
     - debian/build-binary-pkg: likewise.
   
-  * Byte-compile fns-*.el files and move to /usr/share.
-    [Jérôme Marant] [rlb] (closes: #189277)
+  * Byte-compile fns-*.el files. [Jérôme Marant] (closes: #189277)
     - debian/build-binary-pkg
   
   * fix configure args (--build alone doesn't seem to work anymore). [rlb]