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

[Jerome Marant]

Author: jerome
Date: 2004-03-17 15:25:46 -0700 (Wed, 17 Mar 2004)
New Revision: 63

Modified:
   emacs21/pkg/trunk/debian/build-binary-pkg
   emacs21/pkg/trunk/debian/control.in
   emacs21/pkg/trunk/debian/menu.in
   emacs21/pkg/trunk/debian/rules
Log:
Fixed lintian warnings

Modified: emacs21/pkg/trunk/debian/build-binary-pkg
===================================================================
--- emacs21/pkg/trunk/debian/build-binary-pkg	2004-03-17 07:24:56 UTC (rev 62)
+++ emacs21/pkg/trunk/debian/build-binary-pkg	2004-03-17 22:25:46 UTC (rev 63)
@@ -99,7 +99,7 @@
 (cd debian/${pkgdir} &&
  for dir in `ls | grep -v DEBIAN`
  do
-   find "${dir}" -type f | xargs md5sum >> DEBIAN/md5sums
+   find "${dir}" -type f | xargs -r md5sum >> DEBIAN/md5sums
  done)
 
 dpkg-gencontrol -isp -p${pkgname} -Pdebian/${pkgdir}

Modified: emacs21/pkg/trunk/debian/control.in
===================================================================
--- emacs21/pkg/trunk/debian/control.in	2004-03-17 07:24:56 UTC (rev 62)
+++ emacs21/pkg/trunk/debian/control.in	2004-03-17 22:25:46 UTC (rev 63)
@@ -34,7 +34,7 @@
 Architecture: any
 Depends: emacs@MAJOR_VERSION@-common (= ${Source-Version}), ${shlibs:Depends}
 Replaces: emacs21 (<< 21.2-4)
-Description: The GNU Emacs editor's shared, architecture dependent files.
+Description: The GNU Emacs editor's shared, architecture dependent files
  GNU Emacs is the extensible self-documenting text editor.
  This package contains the architecture dependent infrastructure
  that's shared by emacs@MAJOR_VERSION@ and emacs@MAJOR_VERSION@-nox.
@@ -47,7 +47,7 @@
 Suggests: emacs@MAJOR_VERSION@-el
 Conflicts: emacs@MAJOR_VERSION@-el (<< ${Source-Version}), w3-el
 Replaces: emacs21 (<< 21.2-4)
-Description: The GNU Emacs editor's shared, architecture independent infrastructure.
+Description: The GNU Emacs editor's shared, architecture independent infrastructure
  GNU Emacs is the extensible self-documenting text editor.
  This package contains the architecture independent infrastructure
  that's shared by emacs@MAJOR_VERSION@ and emacs@MAJOR_VERSION@-nox.

Modified: emacs21/pkg/trunk/debian/menu.in
===================================================================
--- emacs21/pkg/trunk/debian/menu.in	2004-03-17 07:24:56 UTC (rev 62)
+++ emacs21/pkg/trunk/debian/menu.in	2004-03-17 22:25:46 UTC (rev 63)
@@ -3,7 +3,7 @@
   section="Apps/Editors"\
   title="Emacs @MAJOR_VERSION@ (X11)"\
   command="/usr/bin/emacs@MAJOR_VERSION@"\
-  icon=/usr/share/emacs/@FULL_VERSION@/etc/gnu-32x32.xpm\
+  icon="/usr/share/emacs/@FULL_VERSION@/etc/gnu-32x32.xpm"\
   hints="Text"
 
 ?package(@PKGNAME@):\
@@ -11,5 +11,5 @@
   section="Apps/Editors"\
   title="Emacs @MAJOR_VERSION@ (text)"\
   command="/usr/bin/emacs@MAJOR_VERSION@ -nw"\
-  icon=/usr/share/emacs/@FULL_VERSION@/etc/gnu-32x32.xpm\
+  icon="/usr/share/emacs/@FULL_VERSION@/etc/gnu-32x32.xpm"\
   hints="Text"

Modified: emacs21/pkg/trunk/debian/rules
===================================================================
--- emacs21/pkg/trunk/debian/rules	2004-03-17 07:24:56 UTC (rev 62)
+++ emacs21/pkg/trunk/debian/rules	2004-03-17 22:25:46 UTC (rev 63)
@@ -288,7 +288,7 @@
 define expand_file_subst_vars
 	test -n "${major_ver}" && \
 	perl -p \
-	  -e "s/\@PKGNAME\@/emacs21/go;" \
+	  -e "s/\@PKGNAME\@/${pkg_name}/go;" \
 	  -e "s/\@MAJOR_VERSION\@/${major_ver}/go;" \
           -e "s/\@MINOR_VERSION\@/${minor_ver}/go;" \
           -e "s/\@FULL_VERSION\@/${runtime_ver}/go;" \
@@ -367,9 +367,11 @@
 .PHONY: debian/README
 DEB_TRASH += debian/README.tmp debian/README.00 debian/README.01
 
+debian/menu-emacs${major_ver}: pkg_name := emacs${major_ver}
 debian/menu-emacs${major_ver}: debian/menu.in
 	${expand_file_subst_vars}
 
+debian/menu-emacs${major_ver}-nox: pkg_name := emacs${major_ver}-nox
 debian/menu-emacs${major_ver}-nox: debian/menu.in
 	${expand_file_subst_vars}
 
@@ -496,7 +498,7 @@
         # 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 -r md5sum >> DEBIAN/md5sums ; \
 	done
 
 	dpkg-gencontrol -isp -pemacs${major_ver}-el -Pdebian/pkg-el
@@ -614,7 +616,7 @@
         # 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 -r md5sum >> DEBIAN/md5sums ; \
 	done
 
 	dpkg-gencontrol -isp -pemacs${major_ver}-common -Pdebian/pkg-common
@@ -753,7 +755,7 @@
         # 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 -r md5sum >> DEBIAN/md5sums ; \
 	done
 
 	dpkg-gencontrol -isp \