Debian Emacs Devel Commit: rev 61 - emacs21/pkg/trunk/debian
Rob Browning
rlb@haydn.debian.org
Wed, 17 Mar 2004 00:24:06 -0700
Author: rlb
Date: 2004-03-17 00:24:02 -0700 (Wed, 17 Mar 2004)
New Revision: 61
Modified:
emacs21/pkg/trunk/debian/autofiles.diff
emacs21/pkg/trunk/debian/build-binary-pkg
emacs21/pkg/trunk/debian/changelog
emacs21/pkg/trunk/debian/rules
Log:
* fix configure args (--build alone doesn't seem to work anymore).
* install fns*.el too, and move fns* to /usr/share.
* fix problem with md5sum generation.
Modified: emacs21/pkg/trunk/debian/autofiles.diff
===================================================================
--- emacs21/pkg/trunk/debian/autofiles.diff 2004-03-14 14:47:24 UTC (rev 60)
+++ emacs21/pkg/trunk/debian/autofiles.diff 2004-03-17 07:24:02 UTC (rev 61)
@@ -1,6 +1,6 @@
diff -ruN -x autom4te.cache autodiff-old/aclocal.m4 autodiff-new/aclocal.m4
--- autodiff-old/aclocal.m4 2004-02-25 19:14:52.000000000 -0600
-+++ autodiff-new/aclocal.m4 2004-02-26 16:25:45.000000000 -0600
++++ autodiff-new/aclocal.m4 2004-03-15 00:14:19.000000000 -0600
@@ -1,532 +0,0 @@
-
-% Copyright (C) 2000, 2001 Free Software Foundation, Inc.
@@ -536,7 +536,7 @@
-) dnl ifelse
diff -ruN -x autom4te.cache autodiff-old/configure autodiff-new/configure
--- autodiff-old/configure 2004-02-25 19:14:52.000000000 -0600
-+++ autodiff-new/configure 2004-02-26 16:25:56.000000000 -0600
++++ autodiff-new/configure 2004-03-15 00:14:29.000000000 -0600
@@ -1,57 +1,326 @@
#! /bin/sh
-
Modified: emacs21/pkg/trunk/debian/build-binary-pkg
===================================================================
--- emacs21/pkg/trunk/debian/build-binary-pkg 2004-03-14 14:47:24 UTC (rev 60)
+++ emacs21/pkg/trunk/debian/build-binary-pkg 2004-03-17 07:24:02 UTC (rev 61)
@@ -1,6 +1,7 @@
#!/bin/bash
-set -e -x
+set -e
+set -x
test "${pkgname}" || (echo pkgname unset; false)
test "${pkgdir}" || (echo pkgdir unset; false)
@@ -24,17 +25,20 @@
debian/${pkgdir}/usr/share/emacs/${runver}/etc/
# Byte-compile fns-*.el
-(cd debian/${pkgdir}/usr/bin \
- && emacs${majorver} -q -batch -f batch-byte-compile \
- debian/${tmppkgdir}/usr/lib/emacs/${runver}/${target}/fns-*.el)
+debian/${pkgdir}/usr/bin/emacs${majorver} -q -batch -f batch-byte-compile \
+ debian/${tmppkgdir}/usr/lib/emacs/${runver}/${target}/fns-*.el
-# Move .elc files to the package build directory
-install -d debian/${pkgdir}/usr/lib/emacs/${runver}/${target}
-mv debian/${tmppkgdir}/usr/lib/emacs/${runver}/${target}/fns-*.elc \
- debian/${pkgdir}/usr/lib/emacs/${runver}/${target}/
+# move files to the build directory
+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}/
-# rename fns-*.elc
-(cd debian/${pkgdir}/usr/lib/emacs/${runver}/${target}/ \
+# rename fns-*.el and elc files
+(cd debian/${pkgdir}/usr/share/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}/ \
&& 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;"`)
@@ -88,14 +92,14 @@
debian/${pkgdir}/DEBIAN/prerm \
debian/${pkgdir}/DEBIAN/postrm
-dpkg-shlibdeps debian/${pkgdir}/usr/bin/* \
- `find debian/${pkgdir}/usr/lib/emacs/${runver}/${target}/ \
- -type f -perm +u=x`
+dpkg-shlibdeps debian/${pkgdir}/usr/bin/*
# Generate DEBIAN/md5sums file
-(cd debian/${pkgdir} && \
- for dir in `ls | grep -v DEBIAN` ; do \
- find "$dir" -type f | xargs md5sum >> DEBIAN/md5sums \
+test -e DEBIAN/md5sums && exit 1
+(cd debian/${pkgdir} &&
+ for dir in `ls | grep -v DEBIAN`
+ do
+ find "${dir}" -type f | xargs md5sum >> DEBIAN/md5sums
done)
dpkg-gencontrol -isp -p${pkgname} -Pdebian/${pkgdir}
Modified: emacs21/pkg/trunk/debian/changelog
===================================================================
--- emacs21/pkg/trunk/debian/changelog 2004-03-14 14:47:24 UTC (rev 60)
+++ emacs21/pkg/trunk/debian/changelog 2004-03-17 07:24:02 UTC (rev 61)
@@ -86,11 +86,14 @@
- debian/rules: generate md5sums file just before building packages.
- debian/build-binary-pkg: likewise.
- * Byte-compile fns-*.el files and install only fns-*.elc ones.
- [Jérôme Marant] (closes: #189277)
+ * Byte-compile fns-*.el files and move to /usr/share.
+ [Jérôme Marant] [rlb] (closes: #189277)
- debian/build-binary-pkg
- -- Rob Browning <rlb@defaultvalue.org> Thu, 26 Feb 2004 12:13:50 -0600
+ * fix configure args (--build alone doesn't seem to work anymore). [rlb]
+ - debian/rules
+
+ --
emacs21 (21.3+1-4) unstable; urgency=medium
Modified: emacs21/pkg/trunk/debian/rules
===================================================================
--- emacs21/pkg/trunk/debian/rules 2004-03-14 14:47:24 UTC (rev 60)
+++ emacs21/pkg/trunk/debian/rules 2004-03-17 07:24:02 UTC (rev 61)
@@ -133,20 +133,8 @@
export DEB_BUILD_GNU_TYPE
endif
-## FOR AUTOCONF 2.52 AND NEWER ONLY
-#ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
-# confflags += --build $(DEB_HOST_GNU_TYPE)
-#else
-# confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
-#endif
+confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
-# FOR AUTOCONF 2.13 ONLY
-ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
- confflags += $(DEB_HOST_GNU_TYPE)
-else
- confflags += --host $(DEB_BUILD_GNU_TYPE) --build $(DEB_HOST_GNU_TYPE)
-endif
-
# Uncomment if strip is broken
# CFLAGS := -DDEBIAN -O2
# LDFLAGS :=
@@ -505,10 +493,10 @@
\
debian/pkg-el/DEBIAN/prerm
- # Generate DEBIAN/md5sums file
+ # Generate DEBIAN/md5sums file
cd debian/pkg-el && \
for dir in `ls | grep -v DEBIAN` ; do \
- find "$dir" -type f | xargs md5sum >> DEBIAN/md5sums ; \
+ find "$${dir}" -type f | xargs md5sum >> DEBIAN/md5sums ; \
done
dpkg-gencontrol -isp -pemacs${major_ver}-el -Pdebian/pkg-el
@@ -623,10 +611,10 @@
debian/pkg-common/DEBIAN/postinst \
debian/pkg-common/DEBIAN/prerm
- # Generate DEBIAN/md5sums file
+ # Generate DEBIAN/md5sums file
cd debian/pkg-common && \
for dir in `ls | grep -v DEBIAN` ; do \
- find "$dir" -type f | xargs md5sum >> DEBIAN/md5sums ; \
+ find "$${dir}" -type f | xargs md5sum >> DEBIAN/md5sums ; \
done
dpkg-gencontrol -isp -pemacs${major_ver}-common -Pdebian/pkg-common
@@ -762,10 +750,10 @@
chgrp mail debian/pkg-bin-common/${movemail_bin}
chmod g+s debian/pkg-bin-common/${movemail_bin}
- # Generate DEBIAN/md5sums file
+ # Generate DEBIAN/md5sums file
cd debian/pkg-bin-common && \
for dir in `ls | grep -v DEBIAN` ; do \
- find "$dir" -type f | xargs md5sum >> DEBIAN/md5sums ; \
+ find "$${dir}" -type f | xargs md5sum >> DEBIAN/md5sums ; \
done
dpkg-gencontrol -isp \