[Pkg-erlang-commits] r1433 - erlang/trunk/debian

[sgolovan at alioth.debian.org]

Author: sgolovan
Date: 2012-05-06 18:05:40 +0000 (Sun, 06 May 2012)
New Revision: 1433

Modified:
   erlang/trunk/debian/changelog
   erlang/trunk/debian/control
   erlang/trunk/debian/erlang-mode.emacsen-install
   erlang/trunk/debian/rules
Log:
[erlang]
  * Depend on procps unconditionally since it works for all architectures now.
  * Create symlinks to erlang-mode sources when installing it to any Emacs
    flafor. This helps to use M-x describe-function for erlang mode in Emacs
    (closes: #670345).


Modified: erlang/trunk/debian/changelog
===================================================================
--- erlang/trunk/debian/changelog	2012-04-24 04:42:44 UTC (rev 1432)
+++ erlang/trunk/debian/changelog	2012-05-06 18:05:40 UTC (rev 1433)
@@ -1,8 +1,11 @@
 erlang (1:15.b.1-dfsg-2) UNRELEASED; urgency=low
 
-  * NOT RELEASED YET
+  * Depend on procps unconditionally since it works for all architectures now.
+  * Create symlinks to erlang-mode sources when installing it to any Emacs
+    flafor. This helps to use M-x describe-function for erlang mode in Emacs
+    (closes: #670345).
 
- -- Sergei Golovan <sgolovan at debian.org>  Wed, 04 Apr 2012 12:31:32 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Sun, 06 May 2012 20:06:04 +0400
 
 erlang (1:15.b.1-dfsg-1) unstable; urgency=low
 

Modified: erlang/trunk/debian/control
===================================================================
--- erlang/trunk/debian/control	2012-04-24 04:42:44 UTC (rev 1432)
+++ erlang/trunk/debian/control	2012-05-06 18:05:40 UTC (rev 1433)
@@ -18,7 +18,7 @@
 
 Package: erlang-base
 Architecture: any
-Depends: ${procps:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Depends: procps, ${shlibs:Depends}, ${misc:Depends}
 Recommends: ${libsctp:Version}, erlang-crypto (= ${binary:Version}), erlang-syntax-tools (= ${binary:Version})
 Suggests: erlang-tools (= ${binary:Version}),  erlang, erlang-manpages, erlang-doc
 Conflicts: erlang (<< ${source:Version}), erlang-base-hipe, erlang-doc (<< ${source:Upstream-Version}), erlang-doc (>> ${source:Upstream-Version}-999), erlang-manpages (<= 1:11.b.1-2), erlang-doc-html (<< 1:13.b.4)
@@ -38,7 +38,7 @@
 Package: erlang-base-hipe
 Architecture: amd64 i386 powerpc sparc solaris-i386
 Priority: extra
-Depends: ${procps:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Depends: procps, ${shlibs:Depends}, ${misc:Depends}
 Recommends: ${libsctp:Version}, erlang-crypto (= ${binary:Version}), erlang-syntax-tools (= ${binary:Version})
 Suggests: erlang-edoc (= ${binary:Version}), erlang-gs (= ${binary:Version}), erlang-tools (= ${binary:Version}), erlang, erlang-manpages, erlang-doc
 Conflicts: erlang (<< ${source:Version}), erlang-base, erlang-doc (<< ${source:Upstream-Version}), erlang-doc (>> ${source:Upstream-Version}-999), erlang-manpages (<= 1:11.b.1-2), erlang-doc-html (<< 1:13.b.4)

Modified: erlang/trunk/debian/erlang-mode.emacsen-install
===================================================================
--- erlang/trunk/debian/erlang-mode.emacsen-install	2012-04-24 04:42:44 UTC (rev 1432)
+++ erlang/trunk/debian/erlang-mode.emacsen-install	2012-05-06 18:05:40 UTC (rev 1433)
@@ -31,20 +31,17 @@
 fi
 
 install -m 755 -d ${ELCDIR}
-cd ${ELDIR}
+cd ${ELCDIR}
+ln -sf ${ELDIR}/*.el .
 if [ ${FLAVOR} = emacs21 -o ${FLAVORTEST} = xemacs ]; then
-    FILES=`echo *.el | sed s/erlang-flymake.el//`
-else
-    FILES=`echo *.el`
+    rm -f erlang-flymake.el
 fi
-cp ${FILES} ${ELCDIR}
-cd ${ELCDIR}
 
+FILES=`echo *.el`
 cat << EOF > path.el
 (setq load-path (cons "." load-path) byte-compile-warnings nil)
 EOF
 ${FLAVOR} ${FLAGS} ${FILES}
-rm -f *.el path.el
+rm -f path.el
 
 exit 0
-

Modified: erlang/trunk/debian/rules
===================================================================
--- erlang/trunk/debian/rules	2012-04-24 04:42:44 UTC (rev 1432)
+++ erlang/trunk/debian/rules	2012-05-06 18:05:40 UTC (rev 1433)
@@ -41,11 +41,6 @@
 TMPINSTALL_DIR=debian/erlang-hipe
 ERLANGBASE=erlang-base (= $${binary:Version}) | erlang-base-hipe (= $${binary:Version})
 endif
-ifneq ($(DEB_HOST_ARCH), hurd-i386)
-PROCPS=procps
-else
-PROCPS=
-endif
 
 USE_KERNEL_POLL := $(shell echo ${DEB_HOST_ARCH} | egrep -c "hurd" | sed -es/1/no/ -es/0/yes/)
 ifeq ($(USE_KERNEL_POLL), no)
@@ -477,7 +472,6 @@
 	dh_installdeb -a -Nerlang-base-hipe
 	dh_shlibdeps -a -Nerlang-base-hipe
 	dh_gencontrol -perlang-base -- \
-		-Vprocps:Depends='$(PROCPS)' \
 		-Vlibsctp:Version='$(LIBSCTPDEP)'
 	dh_gencontrol -a -Nerlang-base -Nerlang-base-hipe -- \
 		-Verlang-base='$(ERLANGBASE)'
@@ -513,7 +507,6 @@
 	dh_installdeb -perlang-base-hipe
 	dh_shlibdeps -perlang-base-hipe
 	dh_gencontrol -perlang-base-hipe -- \
-		-Vprocps:Depends='$(PROCPS)' \
 		-Vlibsctp:Version='$(LIBSCTPDEP)'
 	dh_md5sums -perlang-base-hipe
 	dh_builddeb -perlang-base-hipe