[Pkg-erlang-commits] r1166 - erlang/trunk/debian
sgolovan at alioth.debian.org
sgolovan at alioth.debian.org
Tue Jan 12 19:15:17 UTC 2010
Author: sgolovan
Date: 2010-01-12 19:15:17 +0000 (Tue, 12 Jan 2010)
New Revision: 1166
Modified:
erlang/trunk/debian/changelog
erlang/trunk/debian/control
erlang/trunk/debian/rules
Log:
* Added erlang-erl-docgen package to erlang-nox dependencies.
* Made dummy packages erlang-nox and erlang-x11 architecture all.
* Cleaned up working with custom substitution variables in debian/rules.
* Reorganized debian/rules to ensure that manpages arent built twice, and
aren't built at all if only architecture-dependent packages are requested.
Modified: erlang/trunk/debian/changelog
===================================================================
--- erlang/trunk/debian/changelog 2010-01-10 18:54:28 UTC (rev 1165)
+++ erlang/trunk/debian/changelog 2010-01-12 19:15:17 UTC (rev 1166)
@@ -4,8 +4,13 @@
* Made erlang-depends add only substvars which are requested in
debian/control file. This minimizes number of warnings from dh_gencontrol.
Also, improved descriptions of the functions in erlang-depends escript.
+ * Added erlang-erl-docgen package to erlang-nox dependencies.
+ * Made dummy packages erlang-nox and erlang-x11 architecture all.
+ * Cleaned up working with custom substitution variables in debian/rules.
+ * Reorganized debian/rules to ensure that manpages arent built twice, and
+ aren't built at all if only architecture-dependent packages are requested.
- -- Sergei Golovan <sgolovan at debian.org> Sun, 20 Dec 2009 15:07:53 +0300
+ -- Sergei Golovan <sgolovan at debian.org> Mon, 11 Jan 2010 23:37:44 +0300
erlang (1:13.b.3-dfsg-2) unstable; urgency=low
Modified: erlang/trunk/debian/control
===================================================================
--- erlang/trunk/debian/control 2010-01-10 18:54:28 UTC (rev 1165)
+++ erlang/trunk/debian/control 2010-01-12 19:15:17 UTC (rev 1166)
@@ -6,10 +6,11 @@
Standards-Version: 3.8.3
Build-Depends: debhelper (>= 5.0.0), autoconf (>= 2.50), openssl, libssl-dev, m4,
libncurses5-dev, quilt, autotools-dev, unixodbc-dev, bison, flex,
- libwxgtk2.8-dev, dctrl-tools, xsltproc,
+ libwxgtk2.8-dev, dctrl-tools,
libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev,
libsctp-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64 !solaris-i386],
kfreebsd-kernel-headers [kfreebsd-i386 kfreebsd-amd64]
+Build-Depends-Indep: xsltproc
Build-Conflicts: autoconf2.13
Homepage: http://www.erlang.org/
Vcs-Svn: svn://svn.debian.org//svn/pkg-erlang/erlang/trunk/
@@ -56,7 +57,7 @@
Package: erlang-appmon
Architecture: any
-Depends: ${erlang-base}, erlang-inets (= ${binary:Version}), erlang-gs (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: ${erlang-base}, erlang-inets (= ${binary:Version}), erlang-gs (= ${binary:Version}), ${misc:Depends}
Suggests: erlang, erlang-manpages, erlang-doc-html
Replaces: erlang (<< ${source:Version}), erlang-base (<< ${binary:Version}), erlang-base-hipe (<< ${binary:Version}), erlang-nox (<< ${source:Version}), erlang-x11 (<< ${binary:Version}), erlang-src (<< ${source:Version}), erlang-dev (<< ${binary:Version}), erlang-examples (<< ${source:Version}), erlang-mode (<< 1:12.b.1-dfsg-2), erlang-doc-html (<< ${source:Upstream-Version}), erlang-doc-html (>> ${source:Upstream-Version}-999), erlang-manpages (<= 1:11.b.1-2)
Description: Erlang/OTP application monitor
@@ -77,7 +78,7 @@
Package: erlang-common-test
Architecture: any
-Depends: ${erlang-base}, erlang-crypto (= ${binary:Version}), erlang-debugger (= ${binary:Version}), erlang-inets (= ${binary:Version}), erlang-runtime-tools (= ${binary:Version}), erlang-snmp (= ${binary:Version}), erlang-ssh (= ${binary:Version}), erlang-test-server (= ${binary:Version}), erlang-tools (= ${binary:Version}), erlang-webtool (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: ${erlang-base}, erlang-crypto (= ${binary:Version}), erlang-debugger (= ${binary:Version}), erlang-inets (= ${binary:Version}), erlang-runtime-tools (= ${binary:Version}), erlang-snmp (= ${binary:Version}), erlang-ssh (= ${binary:Version}), erlang-test-server (= ${binary:Version}), erlang-tools (= ${binary:Version}), erlang-webtool (= ${binary:Version}), ${misc:Depends}
Suggests: erlang, erlang-manpages, erlang-doc-html
Replaces: erlang (<< ${source:Version}), erlang-base (<< ${binary:Version}), erlang-base-hipe (<< ${binary:Version}), erlang-nox (<< ${source:Version}), erlang-x11 (<< ${binary:Version}), erlang-src (<< ${source:Version}), erlang-dev (<< ${binary:Version}), erlang-examples (<< ${source:Version}), erlang-mode (<< 1:12.b.1-dfsg-2), erlang-doc-html (<< ${source:Upstream-Version}), erlang-doc-html (>> ${source:Upstream-Version}-999), erlang-manpages (<= 1:11.b.1-2)
Description: Erlang/OTP application for automated testing
@@ -95,7 +96,7 @@
Package: erlang-corba
Architecture: any
-Depends: ${erlang-base}, erlang-inets (= ${binary:Version}), erlang-mnesia (= ${binary:Version}), erlang-ssl (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: ${erlang-base}, erlang-inets (= ${binary:Version}), erlang-mnesia (= ${binary:Version}), erlang-ssl (= ${binary:Version}), ${misc:Depends}
Suggests: erlang, erlang-manpages, erlang-doc-html
Replaces: erlang (<< ${source:Version}), erlang-base (<< ${binary:Version}), erlang-base-hipe (<< ${binary:Version}), erlang-nox (<< ${source:Version}), erlang-x11 (<< ${binary:Version}), erlang-src (<< ${source:Version}), erlang-dev (<< ${binary:Version}), erlang-examples (<< ${source:Version}), erlang-mode (<< 1:12.b.1-dfsg-2), erlang-doc-html (<< ${source:Upstream-Version}), erlang-doc-html (>> ${source:Upstream-Version}-999), erlang-manpages (<= 1:11.b.1-2)
Description: Erlang/OTP applications for CORBA support
@@ -137,7 +138,7 @@
Package: erlang-debugger
Architecture: any
-Depends: ${erlang-base}, erlang-gs (= ${binary:Version}), erlang-wx (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: ${erlang-base}, erlang-gs (= ${binary:Version}), erlang-wx (= ${binary:Version}), ${misc:Depends}
Suggests: erlang, erlang-manpages, erlang-doc-html
Replaces: erlang (<< ${source:Version}), erlang-base (<< ${binary:Version}), erlang-base-hipe (<< ${binary:Version}), erlang-nox (<< ${source:Version}), erlang-x11 (<< ${binary:Version}), erlang-src (<< ${source:Version}), erlang-dev (<< ${binary:Version}), erlang-examples (<< ${source:Version}), erlang-mode (<< 1:12.b.1-dfsg-2), erlang-doc-html (<< ${source:Upstream-Version}), erlang-doc-html (>> ${source:Upstream-Version}-999), erlang-manpages (<= 1:11.b.1-2)
Description: Erlang/OTP application for debugging and testing
@@ -160,7 +161,7 @@
Package: erlang-docbuilder
Architecture: any
-Depends: ${erlang-base}, erlang-edoc (= ${binary:Version}), erlang-xmerl (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: ${erlang-base}, erlang-edoc (= ${binary:Version}), erlang-xmerl (= ${binary:Version}), ${misc:Depends}
Suggests: erlang, erlang-manpages, erlang-doc-html
Replaces: erlang (<< ${source:Version}), erlang-base (<< ${binary:Version}), erlang-base-hipe (<< ${binary:Version}), erlang-nox (<< ${source:Version}), erlang-x11 (<< ${binary:Version}), erlang-src (<< ${source:Version}), erlang-dev (<< ${binary:Version}), erlang-examples (<< ${source:Version}), erlang-mode (<< 1:12.b.1-dfsg-2), erlang-doc-html (<< ${source:Upstream-Version}), erlang-doc-html (>> ${source:Upstream-Version}-999), erlang-manpages (<= 1:11.b.1-2)
Description: Erlang/OTP application for building HTML documentation
@@ -171,7 +172,7 @@
Package: erlang-edoc
Architecture: any
-Depends: ${erlang-base}, erlang-inets (= ${binary:Version}), erlang-syntax-tools (=${binary:Version}), erlang-xmerl (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: ${erlang-base}, erlang-inets (= ${binary:Version}), erlang-syntax-tools (=${binary:Version}), erlang-xmerl (= ${binary:Version}), ${misc:Depends}
Suggests: erlang, erlang-manpages, erlang-doc-html
Replaces: erlang (<< ${source:Version}), erlang-base (<< ${binary:Version}), erlang-base-hipe (<< ${binary:Version}), erlang-nox (<< ${source:Version}), erlang-x11 (<< ${binary:Version}), erlang-src (<< ${source:Version}), erlang-dev (<< ${binary:Version}), erlang-examples (<< ${source:Version}), erlang-mode (<< 1:12.b.1-dfsg-2), erlang-doc-html (<< ${source:Upstream-Version}), erlang-doc-html (>> ${source:Upstream-Version}-999), erlang-manpages (<= 1:11.b.1-2)
Description: Erlang/OTP module for generating documentation
@@ -182,7 +183,7 @@
Package: erlang-erl-docgen
Architecture: any
-Depends: ${erlang-base}, ${shlibs:Depends}, ${misc:Depends}
+Depends: ${erlang-base}, ${misc:Depends}
Suggests: xsltproc, fop, erlang, erlang-manpages, erlang-doc-html
Replaces: erlang (<< ${source:Version}), erlang-base (<< ${binary:Version}), erlang-base-hipe (<< ${binary:Version}), erlang-nox (<< ${source:Version}), erlang-x11 (<< ${binary:Version}), erlang-src (<< ${source:Version}), erlang-dev (<< ${binary:Version}), erlang-examples (<< ${source:Version}), erlang-mode (<< 1:12.b.1-dfsg-2), erlang-doc-html (<< ${source:Upstream-Version}), erlang-doc-html (>> ${source:Upstream-Version}-999), erlang-manpages (<= 1:11.b.1-2)
Description: Erlang/OTP documentation stylesheets
@@ -193,7 +194,7 @@
Package: erlang-et
Architecture: any
-Depends: ${erlang-base}, erlang-gs (= ${binary:Version}), erlang-runtime-tools (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: ${erlang-base}, erlang-gs (= ${binary:Version}), erlang-runtime-tools (= ${binary:Version}), ${misc:Depends}
Suggests: erlang, erlang-manpages, erlang-doc-html
Replaces: erlang (<< ${source:Version}), erlang-base (<< ${binary:Version}), erlang-base-hipe (<< ${binary:Version}), erlang-nox (<< ${source:Version}), erlang-x11 (<< ${binary:Version}), erlang-src (<< ${source:Version}), erlang-dev (<< ${binary:Version}), erlang-examples (<< ${source:Version}), erlang-mode (<< 1:12.b.1-dfsg-2), erlang-doc-html (<< ${source:Upstream-Version}), erlang-doc-html (>> ${source:Upstream-Version}-999), erlang-manpages (<= 1:11.b.1-2)
Description: Erlang/OTP event tracer application
@@ -203,7 +204,7 @@
Package: erlang-eunit
Architecture: any
-Depends: ${erlang-base}, ${shlibs:Depends}, ${misc:Depends}
+Depends: ${erlang-base}, ${misc:Depends}
Suggests: erlang, erlang-manpages, erlang-doc-html
Replaces: erlang (<< ${source:Version}), erlang-base (<< ${binary:Version}), erlang-base-hipe (<< ${binary:Version}), erlang-nox (<< ${source:Version}), erlang-x11 (<< ${binary:Version}), erlang-src (<< ${source:Version}), erlang-dev (<< ${binary:Version}), erlang-examples (<< ${source:Version}), erlang-mode (<< 1:12.b.1-dfsg-2), erlang-doc-html (<< ${source:Upstream-Version}), erlang-doc-html (>> ${source:Upstream-Version}-999), erlang-manpages (<= 1:11.b.1-2)
Description: Erlang/OTP module for unit testing
@@ -212,7 +213,7 @@
Package: erlang-gs
Architecture: any
-Depends: ${erlang-base}, ${shlibs:Depends}, ${misc:Depends}, tk | wish
+Depends: ${erlang-base}, ${misc:Depends}, tk | wish
Suggests: erlang, erlang-manpages, erlang-doc-html
Replaces: erlang (<< ${source:Version}), erlang-base (<< ${binary:Version}), erlang-base-hipe (<< ${binary:Version}), erlang-nox (<< ${source:Version}), erlang-x11 (<< ${binary:Version}), erlang-src (<< ${source:Version}), erlang-dev (<< ${binary:Version}), erlang-examples (<< ${source:Version}), erlang-mode (<< 1:12.b.1-dfsg-2), erlang-doc-html (<< ${source:Upstream-Version}), erlang-doc-html (>> ${source:Upstream-Version}-999), erlang-manpages (<= 1:11.b.1-2)
Description: Erlang/OTP graphics system
@@ -224,7 +225,7 @@
Package: erlang-ic
Architecture: any
-Depends: ${erlang-base}, ${shlibs:Depends}, ${misc:Depends}
+Depends: ${erlang-base}, ${misc:Depends}
Suggests: erlang, erlang-manpages, erlang-doc-html
Replaces: erlang (<< ${source:Version}), erlang-base (<< ${binary:Version}), erlang-base-hipe (<< ${binary:Version}), erlang-nox (<< ${source:Version}), erlang-x11 (<< ${binary:Version}), erlang-src (<< ${source:Version}), erlang-dev (<< ${binary:Version}), erlang-examples (<< ${source:Version}), erlang-mode (<< 1:12.b.1-dfsg-2), erlang-doc-html (<< ${source:Upstream-Version}), erlang-doc-html (>> ${source:Upstream-Version}-999), erlang-manpages (<= 1:11.b.1-2)
Description: Erlang/OTP IDL compiler
@@ -236,7 +237,7 @@
Package: erlang-inets
Architecture: any
-Depends: ${erlang-base}, erlang-mnesia (= ${binary:Version}), erlang-runtime-tools (= ${binary:Version}), erlang-ssl (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: ${erlang-base}, erlang-mnesia (= ${binary:Version}), erlang-runtime-tools (= ${binary:Version}), erlang-ssl (= ${binary:Version}), ${misc:Depends}
Suggests: erlang, erlang-manpages, erlang-doc-html
Replaces: erlang (<< ${source:Version}), erlang-base (<< ${binary:Version}), erlang-base-hipe (<< ${binary:Version}), erlang-nox (<< ${source:Version}), erlang-x11 (<< ${binary:Version}), erlang-src (<< ${source:Version}), erlang-dev (<< ${binary:Version}), erlang-examples (<< ${source:Version}), erlang-mode (<< 1:12.b.1-dfsg-2), erlang-doc-html (<< ${source:Upstream-Version}), erlang-doc-html (>> ${source:Upstream-Version}-999), erlang-manpages (<= 1:11.b.1-2)
Description: Erlang/OTP Internet clients and servers
@@ -247,7 +248,7 @@
Package: erlang-inviso
Architecture: any
-Depends: ${erlang-base}, erlang-runtime-tools (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: ${erlang-base}, erlang-runtime-tools (= ${binary:Version}), ${misc:Depends}
Suggests: erlang, erlang-manpages, erlang-doc-html
Replaces: erlang (<< ${source:Version}), erlang-base (<< ${binary:Version}), erlang-base-hipe (<< ${binary:Version}), erlang-nox (<< ${source:Version}), erlang-x11 (<< ${binary:Version}), erlang-src (<< ${source:Version}), erlang-dev (<< ${binary:Version}), erlang-examples (<< ${source:Version}), erlang-mode (<< 1:12.b.1-dfsg-2), erlang-doc-html (<< ${source:Upstream-Version}), erlang-doc-html (>> ${source:Upstream-Version}-999), erlang-manpages (<= 1:11.b.1-2)
Description: Erlang/OTP trace tool
@@ -259,7 +260,8 @@
Package: erlang-manpages
Section: doc
Architecture: all
-Suggests: erlang
+Depends: ${misc:Depends}
+Suggests: erlang, erlang-doc-html
Description: Erlang/OTP manual pages
Documentation for the Erlang programming language in `man' format. This
documentation can be read using the command `erl -man mod', where `mod'
@@ -280,7 +282,7 @@
Package: erlang-mnesia
Architecture: any
-Depends: ${erlang-base}, ${shlibs:Depends}, ${misc:Depends}
+Depends: ${erlang-base}, ${misc:Depends}
Suggests: erlang, erlang-manpages, erlang-doc-html
Replaces: erlang (<< ${source:Version}), erlang-base (<< ${binary:Version}), erlang-base-hipe (<< ${binary:Version}), erlang-nox (<< ${source:Version}), erlang-x11 (<< ${binary:Version}), erlang-src (<< ${source:Version}), erlang-dev (<< ${binary:Version}), erlang-examples (<< ${source:Version}), erlang-mode (<< 1:12.b.1-dfsg-2), erlang-doc-html (<< ${source:Upstream-Version}), erlang-doc-html (>> ${source:Upstream-Version}-999), erlang-manpages (<= 1:11.b.1-2)
Description: Erlang/OTP distributed relational/object hybrid database
@@ -291,7 +293,7 @@
Package: erlang-observer
Architecture: any
-Depends: ${erlang-base}, erlang-et (= ${binary:Version}), erlang-inets (= ${binary:Version}), erlang-gs (= ${binary:Version}), erlang-runtime-tools (= ${binary:Version}), erlang-webtool (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: ${erlang-base}, erlang-et (= ${binary:Version}), erlang-inets (= ${binary:Version}), erlang-gs (= ${binary:Version}), erlang-runtime-tools (= ${binary:Version}), erlang-webtool (= ${binary:Version}), ${misc:Depends}
Suggests: erlang, erlang-manpages, erlang-doc-html
Replaces: erlang (<< ${source:Version}), erlang-base (<< ${binary:Version}), erlang-base-hipe (<< ${binary:Version}), erlang-nox (<< ${source:Version}), erlang-x11 (<< ${binary:Version}), erlang-src (<< ${source:Version}), erlang-dev (<< ${binary:Version}), erlang-examples (<< ${source:Version}), erlang-mode (<< 1:12.b.1-dfsg-2), erlang-doc-html (<< ${source:Upstream-Version}), erlang-doc-html (>> ${source:Upstream-Version}-999), erlang-manpages (<= 1:11.b.1-2)
Description: Erlang/OTP application for investigating distributed systems
@@ -323,7 +325,7 @@
Package: erlang-parsetools
Architecture: any
-Depends: ${erlang-base}, ${shlibs:Depends}, ${misc:Depends}
+Depends: ${erlang-base}, ${misc:Depends}
Suggests: erlang, erlang-manpages, erlang-doc-html
Replaces: erlang (<< ${source:Version}), erlang-base (<< ${binary:Version}), erlang-base-hipe (<< ${binary:Version}), erlang-nox (<< ${source:Version}), erlang-x11 (<< ${binary:Version}), erlang-src (<< ${source:Version}), erlang-dev (<< ${binary:Version}), erlang-examples (<< ${source:Version}), erlang-mode (<< 1:12.b.1-dfsg-2), erlang-doc-html (<< ${source:Upstream-Version}), erlang-doc-html (>> ${source:Upstream-Version}-999), erlang-manpages (<= 1:11.b.1-2)
Description: Erlang/OTP parsing tools
@@ -335,7 +337,7 @@
Package: erlang-percept
Architecture: any
-Depends: ${erlang-base}, erlang-inets (= ${binary:Version}), erlang-runtime-tools (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: ${erlang-base}, erlang-inets (= ${binary:Version}), erlang-runtime-tools (= ${binary:Version}), ${misc:Depends}
Suggests: erlang, erlang-manpages, erlang-doc-html
Replaces: erlang (<< ${source:Version}), erlang-base (<< ${binary:Version}), erlang-base-hipe (<< ${binary:Version}), erlang-nox (<< ${source:Version}), erlang-x11 (<< ${binary:Version}), erlang-src (<< ${source:Version}), erlang-dev (<< ${binary:Version}), erlang-examples (<< ${source:Version}), erlang-mode (<< 1:12.b.1-dfsg-2), erlang-doc-html (<< ${source:Upstream-Version}), erlang-doc-html (>> ${source:Upstream-Version}-999), erlang-manpages (<= 1:11.b.1-2)
Description: Erlang/OTP concurrency profiling tool
@@ -345,7 +347,7 @@
Package: erlang-pman
Architecture: any
-Depends: ${erlang-base}, erlang-gs (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: ${erlang-base}, erlang-gs (= ${binary:Version}), ${misc:Depends}
Suggests: erlang, erlang-manpages, erlang-doc-html
Replaces: erlang (<< ${source:Version}), erlang-base (<< ${binary:Version}), erlang-base-hipe (<< ${binary:Version}), erlang-nox (<< ${source:Version}), erlang-x11 (<< ${binary:Version}), erlang-src (<< ${source:Version}), erlang-dev (<< ${binary:Version}), erlang-examples (<< ${source:Version}), erlang-mode (<< 1:12.b.1-dfsg-2), erlang-doc-html (<< ${source:Upstream-Version}), erlang-doc-html (>> ${source:Upstream-Version}-999), erlang-manpages (<= 1:11.b.1-2)
Description: Erlang/OTP process manager
@@ -356,7 +358,7 @@
Package: erlang-public-key
Architecture: any
-Depends: ${erlang-base}, erlang-crypto (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: ${erlang-base}, erlang-crypto (= ${binary:Version}), ${misc:Depends}
Suggests: erlang, erlang-manpages, erlang-doc-html
Replaces: erlang (<< ${source:Version}), erlang-base (<< ${binary:Version}), erlang-base-hipe (<< ${binary:Version}), erlang-nox (<< ${source:Version}), erlang-x11 (<< ${binary:Version}), erlang-src (<< ${source:Version}), erlang-dev (<< ${binary:Version}), erlang-examples (<< ${source:Version}), erlang-mode (<< 1:12.b.1-dfsg-2), erlang-doc-html (<< ${source:Upstream-Version}), erlang-doc-html (>> ${source:Upstream-Version}-999), erlang-manpages (<= 1:11.b.1-2)
Description: Erlang/OTP public key infrastructure
@@ -366,7 +368,7 @@
Package: erlang-reltool
Architecture: any
-Depends: ${erlang-base}, erlang-syntax-tools (= ${binary:Version}), erlang-tools (= ${binary:Version}), erlang-wx (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: ${erlang-base}, erlang-syntax-tools (= ${binary:Version}), erlang-tools (= ${binary:Version}), erlang-wx (= ${binary:Version}), ${misc:Depends}
Suggests: erlang, erlang-manpages, erlang-doc-html
Replaces: erlang (<< ${source:Version}), erlang-base (<< ${binary:Version}), erlang-base-hipe (<< ${binary:Version}), erlang-nox (<< ${source:Version}), erlang-x11 (<< ${binary:Version}), erlang-src (<< ${source:Version}), erlang-dev (<< ${binary:Version}), erlang-examples (<< ${source:Version}), erlang-mode (<< 1:12.b.1-dfsg-2), erlang-doc-html (<< ${source:Upstream-Version}), erlang-doc-html (>> ${source:Upstream-Version}-999), erlang-manpages (<= 1:11.b.1-2)
Description: Erlang/OTP release management tool
@@ -389,7 +391,7 @@
Package: erlang-snmp
Architecture: any
-Depends: ${erlang-base}, erlang-crypto (= ${binary:Version}), erlang-mnesia (= ${binary:Version}), erlang-runtime-tools (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: ${erlang-base}, erlang-crypto (= ${binary:Version}), erlang-mnesia (= ${binary:Version}), erlang-runtime-tools (= ${binary:Version}), ${misc:Depends}
Suggests: erlang, erlang-manpages, erlang-doc-html
Replaces: erlang (<< ${source:Version}), erlang-base (<< ${binary:Version}), erlang-base-hipe (<< ${binary:Version}), erlang-nox (<< ${source:Version}), erlang-x11 (<< ${binary:Version}), erlang-src (<< ${source:Version}), erlang-dev (<< ${binary:Version}), erlang-examples (<< ${source:Version}), erlang-mode (<< 1:12.b.1-dfsg-2), erlang-doc-html (<< ${source:Upstream-Version}), erlang-doc-html (>> ${source:Upstream-Version}-999), erlang-manpages (<= 1:11.b.1-2)
Description: Erlang/OTP SNMP applications
@@ -403,7 +405,7 @@
Package: erlang-ssh
Architecture: any
-Depends: ${erlang-base}, erlang-crypto (= ${binary:Version}), erlang-public-key (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: ${erlang-base}, erlang-crypto (= ${binary:Version}), erlang-public-key (= ${binary:Version}), ${misc:Depends}
Suggests: erlang, erlang-manpages, erlang-doc-html
Replaces: erlang (<< ${source:Version}), erlang-base (<< ${binary:Version}), erlang-base-hipe (<< ${binary:Version}), erlang-nox (<< ${source:Version}), erlang-x11 (<< ${binary:Version}), erlang-src (<< ${source:Version}), erlang-dev (<< ${binary:Version}), erlang-examples (<< ${source:Version}), erlang-mode (<< 1:12.b.1-dfsg-2), erlang-doc-html (<< ${source:Upstream-Version}), erlang-doc-html (>> ${source:Upstream-Version}-999), erlang-manpages (<= 1:11.b.1-2)
Description: Erlang/OTP implementation of SSH protocol
@@ -422,7 +424,7 @@
Package: erlang-syntax-tools
Architecture: any
-Depends: ${erlang-base}, ${shlibs:Depends}, ${misc:Depends}
+Depends: ${erlang-base}, ${misc:Depends}
Suggests: erlang, erlang-manpages, erlang-doc-html
Replaces: erlang (<< ${source:Version}), erlang-base (<< ${binary:Version}), erlang-base-hipe (<< ${binary:Version}), erlang-nox (<< ${source:Version}), erlang-x11 (<< ${binary:Version}), erlang-src (<< ${source:Version}), erlang-dev (<< ${binary:Version}), erlang-examples (<< ${source:Version}), erlang-mode (<< 1:12.b.1-dfsg-2), erlang-doc-html (<< ${source:Upstream-Version}), erlang-doc-html (>> ${source:Upstream-Version}-999), erlang-manpages (<= 1:11.b.1-2)
Description: Erlang/OTP modules for handling abstract Erlang syntax trees
@@ -436,7 +438,7 @@
Package: erlang-test-server
Architecture: any
-Depends: ${erlang-base}, erlang-observer (= ${binary:Version}), erlang-runtime-tools (= ${binary:Version}), erlang-tools (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: ${erlang-base}, erlang-observer (= ${binary:Version}), erlang-runtime-tools (= ${binary:Version}), erlang-tools (= ${binary:Version}), ${misc:Depends}
Suggests: erlang, erlang-manpages, erlang-doc-html
Replaces: erlang (<< ${source:Version}), erlang-base (<< ${binary:Version}), erlang-base-hipe (<< ${binary:Version}), erlang-nox (<< ${source:Version}), erlang-x11 (<< ${binary:Version}), erlang-src (<< ${source:Version}), erlang-dev (<< ${binary:Version}), erlang-examples (<< ${source:Version}), erlang-mode (<< 1:12.b.1-dfsg-2), erlang-doc-html (<< ${source:Upstream-Version}), erlang-doc-html (>> ${source:Upstream-Version}-999), erlang-manpages (<= 1:11.b.1-2)
Description: Erlang/OTP server for automated application testing
@@ -449,7 +451,7 @@
Package: erlang-toolbar
Architecture: any
-Depends: ${erlang-base}, erlang-gs (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: ${erlang-base}, erlang-gs (= ${binary:Version}), ${misc:Depends}
Suggests: erlang, erlang-manpages, erlang-doc-html
Replaces: erlang (<< ${source:Version}), erlang-base (<< ${binary:Version}), erlang-base-hipe (<< ${binary:Version}), erlang-nox (<< ${source:Version}), erlang-x11 (<< ${binary:Version}), erlang-src (<< ${source:Version}), erlang-dev (<< ${binary:Version}), erlang-examples (<< ${source:Version}), erlang-mode (<< 1:12.b.1-dfsg-2), erlang-doc-html (<< ${source:Upstream-Version}), erlang-doc-html (>> ${source:Upstream-Version}-999), erlang-manpages (<= 1:11.b.1-2)
Description: Erlang/OTP graphical toolbar
@@ -486,7 +488,7 @@
Package: erlang-tv
Architecture: any
-Depends: ${erlang-base}, erlang-gs (= ${binary:Version}), erlang-mnesia (= ${binary:Version}), erlang-pman (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: ${erlang-base}, erlang-gs (= ${binary:Version}), erlang-mnesia (= ${binary:Version}), erlang-pman (= ${binary:Version}), ${misc:Depends}
Suggests: erlang, erlang-manpages, erlang-doc-html
Replaces: erlang (<< ${source:Version}), erlang-base (<< ${binary:Version}), erlang-base-hipe (<< ${binary:Version}), erlang-nox (<< ${source:Version}), erlang-x11 (<< ${binary:Version}), erlang-src (<< ${source:Version}), erlang-dev (<< ${binary:Version}), erlang-examples (<< ${source:Version}), erlang-mode (<< 1:12.b.1-dfsg-2), erlang-doc-html (<< ${source:Upstream-Version}), erlang-doc-html (>> ${source:Upstream-Version}-999), erlang-manpages (<= 1:11.b.1-2)
Description: Erlang/OTP table viewer
@@ -507,7 +509,7 @@
Package: erlang-webtool
Architecture: any
-Depends: ${erlang-base}, erlang-inets (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: ${erlang-base}, erlang-inets (= ${binary:Version}), ${misc:Depends}
Suggests: erlang-observer (= ${binary:Version}), erlang, erlang-manpages, erlang-doc-html
Replaces: erlang (<< ${source:Version}), erlang-base (<< ${binary:Version}), erlang-base-hipe (<< ${binary:Version}), erlang-nox (<< ${source:Version}), erlang-x11 (<< ${binary:Version}), erlang-src (<< ${source:Version}), erlang-dev (<< ${binary:Version}), erlang-examples (<< ${source:Version}), erlang-mode (<< 1:12.b.1-dfsg-2), erlang-doc-html (<< ${source:Upstream-Version}), erlang-doc-html (>> ${source:Upstream-Version}-999), erlang-manpages (<= 1:11.b.1-2)
Description: Erlang/OTP helper for web-based tools
@@ -527,7 +529,7 @@
Package: erlang-xmerl
Architecture: any
-Depends: ${erlang-base}, ${shlibs:Depends}, ${misc:Depends}
+Depends: ${erlang-base}, ${misc:Depends}
Suggests: erlang, erlang-manpages, erlang-doc-html
Replaces: erlang (<< ${source:Version}), erlang-base (<< ${binary:Version}), erlang-base-hipe (<< ${binary:Version}), erlang-nox (<< ${source:Version}), erlang-x11 (<< ${binary:Version}), erlang-src (<< ${source:Version}), erlang-dev (<< ${binary:Version}), erlang-examples (<< ${source:Version}), erlang-mode (<< 1:12.b.1-dfsg-2), erlang-doc-html (<< ${source:Upstream-Version}), erlang-doc-html (>> ${source:Upstream-Version}-999), erlang-manpages (<= 1:11.b.1-2)
Description: Erlang/OTP XML tools
@@ -536,7 +538,7 @@
Package: erlang-dev
Architecture: any
-Depends: ${erlang-base}, ${shlibs:Depends}, ${misc:Depends}
+Depends: ${erlang-base}, ${misc:Depends}
Suggests: erlang, erlang-manpages, erlang-doc-html
Replaces: erlang (<< ${source:Version}), erlang-base (<< ${binary:Version}), erlang-base-hipe (<< ${binary:Version}), erlang-nox (<< ${binary:Version}), erlang-x11 (<< ${binary:Version}), erlang-src (<< ${source:Version}), erlang-examples (<< ${source:Version}), erlang-mode (<< 1:12.b.1-dfsg-2)
Description: Erlang/OTP development libraries and headers
@@ -547,7 +549,7 @@
Package: erlang-src
Architecture: all
-Depends: ${erlang-base}
+Depends: erlang-base (>= ${binary:Version}) | erlang-base-hipe (>= ${binary:Version}), erlang-base (<< ${binary:Version}.0) | erlang-base-hipe (<< ${binary:Version}.0), ${misc:Depends}
Suggests: erlang, erlang-manpages, erlang-doc-html
Replaces: erlang (<< ${binary:Version}), erlang-base (<< ${binary:Version}), erlang-base-hipe (<< ${binary:Version}), erlang-nox (<< ${binary:Version}), erlang-x11 (<< ${binary:Version}), erlang-dev (<< ${binary:Version}), erlang-examples (<< ${binary:Version}), erlang-mode (<< 1:12.b.1-dfsg-2)
Description: Erlang/OTP applications sources
@@ -558,7 +560,7 @@
Package: erlang-examples
Architecture: all
-Depends: ${erlang-base}
+Depends: erlang-base (>= ${binary:Version}) | erlang-base-hipe (>= ${binary:Version}), erlang-base (<< ${binary:Version}.0) | erlang-base-hipe (<< ${binary:Version}.0), ${misc:Depends}
Recommends: erlang-asn1, erlang-gs, erlang-megaco, erlang-snmp, erlang-ssl, erlang-wx
Suggests: erlang, erlang-manpages, erlang-doc-html
Replaces: erlang (<< ${binary:Version}), erlang-base (<< ${binary:Version}), erlang-base-hipe (<< ${binary:Version}), erlang-nox (<< ${binary:Version}), erlang-x11 (<< ${binary:Version}), erlang-dev (<< ${binary:Version}), erlang-src (<< ${binary:Version}), erlang-mode (<< 1:12.b.1-dfsg-2)
@@ -568,7 +570,7 @@
Package: erlang-mode
Architecture: all
-Depends: emacsen-common
+Depends: emacsen-common, ${misc:Depends}
Suggests: erlang, erlang-manpages, erlang-doc-html
Replaces: erlang-base (<< 1:12.b.1-dfsg-2), erlang-base-hipe (<< 1:12.b.1-dfsg-2)
Description: Erlang major editing mode for Emacs
@@ -579,35 +581,35 @@
Package: erlang-nox
-Architecture: any
-Depends: ${erlang-base}, erlang-asn1, erlang-corba, erlang-crypto,
- erlang-docbuilder, erlang-edoc, erlang-eunit, erlang-ic, erlang-inets,
- erlang-inviso, erlang-mnesia, erlang-odbc, erlang-os-mon, erlang-parsetools,
- erlang-percept, erlang-public-key, erlang-runtime-tools, erlang-snmp,
- erlang-ssh, erlang-ssl, erlang-syntax-tools, erlang-tools, erlang-webtool,
- erlang-xmerl
+Architecture: all
+Depends: erlang-base | erlang-base-hipe, erlang-asn1, erlang-corba, erlang-crypto,
+ erlang-docbuilder, erlang-edoc, erlang-erl-docgen, erlang-eunit, erlang-ic,
+ erlang-inets, erlang-inviso, erlang-mnesia, erlang-odbc, erlang-os-mon,
+ erlang-parsetools, erlang-percept, erlang-public-key, erlang-runtime-tools,
+ erlang-snmp, erlang-ssh, erlang-ssl, erlang-syntax-tools, erlang-tools,
+ erlang-webtool, erlang-xmerl, ${misc:Depends}
Suggests: erlang, erlang-manpages, erlang-doc-html
Description: Erlang/OTP applications that don't require X Window System
- This package is a dummy transitional package which will install all
- Erlang/OTP applications which do not require X Window System to run.
+ This package is a dummy package which will install all Erlang/OTP
+ applications which do not require X Window System to run.
Package: erlang-x11
-Architecture: any
-Depends: ${erlang-base}, erlang-nox, erlang-appmon, erlang-common-test,
+Architecture: all
+Depends: erlang-base | erlang-base-hipe, erlang-nox, erlang-appmon, erlang-common-test,
erlang-debugger, erlang-dialyzer, erlang-et, erlang-gs, erlang-megaco,
erlang-observer, erlang-pman, erlang-reltool, erlang-test-server,
- erlang-toolbar, erlang-tv, erlang-typer, erlang-wx
+ erlang-toolbar, erlang-tv, erlang-typer, erlang-wx, ${misc:Depends}
Suggests: erlang, erlang-manpages, erlang-doc-html
Description: Erlang/OTP applications that require X Window System
- This package is a dummy transitional package which will install all
- Erlang/OTP applications which use graphical interface and therefore
- require X Window System to run.
+ This package is a dummy package which will install all Erlang/OTP
+ applications which use graphical interface and therefore require
+ X Window System to run.
Package: erlang
Architecture: all
-Depends: ${erlang-base}, erlang-dev, erlang-appmon, erlang-asn1,
+Depends: erlang-base | erlang-base-hipe, erlang-dev, erlang-appmon, erlang-asn1,
erlang-common-test, erlang-corba, erlang-crypto, erlang-debugger,
erlang-dialyzer, erlang-docbuilder, erlang-edoc, erlang-erl-docgen, erlang-et,
erlang-eunit, erlang-gs, erlang-ic, erlang-inets, erlang-inviso,
@@ -615,7 +617,7 @@
erlang-parsetools, erlang-percept, erlang-pman, erlang-public-key,
erlang-reltool, erlang-runtime-tools, erlang-snmp, erlang-ssh, erlang-ssl,
erlang-syntax-tools, erlang-test-server, erlang-toolbar, erlang-tools,
- erlang-tv, erlang-typer, erlang-webtool, erlang-wx, erlang-xmerl
+ erlang-tv, erlang-typer, erlang-webtool, erlang-wx, erlang-xmerl, ${misc:Depends}
Recommends: erlang-mode, erlang-src, erlang-examples
Suggests: erlang-manpages, erlang-doc-html
Description: Concurrent, real-time, distributed functional language
Modified: erlang/trunk/debian/rules
===================================================================
--- erlang/trunk/debian/rules 2010-01-10 18:54:28 UTC (rev 1165)
+++ erlang/trunk/debian/rules 2010-01-12 19:15:17 UTC (rev 1166)
@@ -30,13 +30,18 @@
BINARY_TARGETS=binary-erlang-base
INSTALL_RULE=install-stnd-stamp
TMPINSTALL_DIR=debian/erlang-stnd
-ERLANGBASE=erlang-base=erlang-base (= $${binary:Version})
+ERLANGBASE=erlang-base (= $${binary:Version})
else
BINARY_TARGETS=binary-erlang-base binary-erlang-base-hipe
INSTALL_RULE=install-stnd-stamp install-hipe-stamp
TMPINSTALL_DIR=debian/erlang-hipe
-ERLANGBASE=erlang-base=erlang-base (= $${binary:Version}) | erlang-base-hipe (= $${binary:Version})
+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)
@@ -63,7 +68,8 @@
endif
endif
-LIBSCTP=libsctp1
+LIBSCTP=$(shell grep-status -s Depends -PX libsctp-dev |sed -e 's!.*\(libsctp[0-9]*\).*!\1!')
+LIBSCTPDEP=$(shell grep-status -s Version -PX $(LIBSCTP) | sed -e's!^Version: \(.*\)-[^-]*!$(LIBSCTP) (>= \1)!')
ifeq ($(findstring debug,$(DEB_BUILD_OPTIONS)),debug)
CFLAGS=-g -O2 -fno-strict-aliasing
@@ -313,7 +319,7 @@
install -D -m 755 $< $@
manpages: manpages-stamp
-manpages-stamp: build-stnd-stamp bin/docb_gen
+manpages-stamp: $(INSTALL_RULE) bin/docb_gen
dh_testdir
pwd=$$(pwd) ; \
target=$$(basename $$(find make -type d |grep /)) ; \
@@ -321,21 +327,6 @@
for m in $$(find . -wholename '*/doc/src/Makefile') ; do \
(cd $$(dirname $$m) && make man ERL_TOP=$$pwd TARGET=$$target) || exit 1 ; \
done
- touch manpages-stamp
-
-
-install-hipe: install-hipe-stamp
-install-hipe-stamp: INSTALL_DIR=$(shell pwd)/debian/erlang-hipe
-install-hipe-stamp: build-hipe-stamp
- dh_testdir
- $(do-install)
- touch install-hipe-stamp
-
-install-stnd: install-stnd-stamp
-install-stnd-stamp: INSTALL_DIR=$(shell pwd)/debian/erlang-stnd
-install-stnd-stamp: build-stnd-stamp manpages-stamp
- dh_testdir
- $(do-install)
#
# Install manpages
install -d -m 755 $(TMP_DIR)/usr/share/man
@@ -368,13 +359,26 @@
for f in $$(find $(TMP_DIR)/usr/share/man/man3 -type f) ; do \
mv $$f $${f}erl ; \
done
+ touch manpages-stamp
+
+
+install-hipe: install-hipe-stamp
+install-hipe-stamp: INSTALL_DIR=$(shell pwd)/debian/erlang-hipe
+install-hipe-stamp: build-hipe-stamp
+ dh_testdir
+ $(do-install)
+ touch install-hipe-stamp
+
+install-stnd: install-stnd-stamp
+install-stnd-stamp: INSTALL_DIR=$(shell pwd)/debian/erlang-stnd
+install-stnd-stamp: build-stnd-stamp
+ dh_testdir
+ $(do-install)
touch install-stnd-stamp
-# Very accurately place each installed file into the proper package
-# See this script and the debian/patterns/*.patterns files for more informations.
+build: build-arch build-indep
build-arch: build-stamp
-build-indep: build-stamp
-build: build-stamp
+build-indep: build-stamp manpages-stamp
build-stamp: $(INSTALL_RULE)
dh_testdir
#
@@ -389,6 +393,9 @@
-e's/@COMMON_TEST_VSN@/$(COMMON_TEST_VSN)/g' \
-e's/@TOOLS_VSN@/$(TOOLS_VSN)/g' <$$i >$${i%%.in} ; \
done
+ #
+ # Place each installed file into the proper package.
+ # See this script and the debian/patterns/* files for more informations.
sh debian/scripts/analyse $(TMPINSTALL_DIR)
#
# Add all author lists to debian/AUTHORS
@@ -409,7 +416,7 @@
#
touch build-stamp
-binary-indep: build-stamp
+binary-indep: build-stamp manpages-stamp
dh_testdir
dh_testroot
dh_installdirs -i
@@ -432,11 +439,6 @@
dh_fixperms -i
dh_makeshlibs -i
dh_installdeb -i
- echo 'erlang-base=erlang-base | erlang-base-hipe' >>debian/erlang.substvars
- echo 'erlang-base=erlang-base (>= $${binary:Version}) | erlang-base-hipe (>= $${binary:Version}), erlang-base (<< $${binary:Version}.0) | erlang-base-hipe (<< $${binary:Version}.0)' \
- >>debian/erlang-src.substvars
- echo 'erlang-base=erlang-base (>= $${binary:Version}) | erlang-base-hipe (>= $${binary:Version}), erlang-base (<< $${binary:Version}.0) | erlang-base-hipe (<< $${binary:Version}.0)' \
- >>debian/erlang-examples.substvars
dh_shlibdeps -i
dh_gencontrol -i
dh_md5sums -i
@@ -475,24 +477,12 @@
dh_fixperms -a -Nerlang-base-hipe
dh_makeshlibs -a -Nerlang-base-hipe
dh_installdeb -a -Nerlang-base-hipe
-ifneq ($(DEB_HOST_ARCH), hurd-i386)
- echo 'procps:Depends=procps' >>debian/erlang-base.substvars
-endif
- echo 'erlang-base=erlang-base | erlang-base-hipe' >>debian/erlang-nox.substvars
- echo 'erlang-base=erlang-base | erlang-base-hipe' >>debian/erlang-x11.substvars
- for pkg in \
- dev appmon asn1 common-test corba crypto debugger dialyzer \
- docbuilder edoc erl-docgen et eunit gs ic inets inviso megaco \
- mnesia observer odbc os-mon parsetools percept pman public-key \
- reltool runtime-tools snmp ssh ssl syntax-tools test-server toolbar \
- tools tv typer webtool wx xmerl ; do \
- echo '$(ERLANGBASE)' >>debian/erlang-$$pkg.substvars ; \
- done
dh_shlibdeps -a -Nerlang-base-hipe
- grep-status -s Version -PX $(LIBSCTP) | \
- sed -e's!^Version: \(.*\)-[^-]*!libsctp:Version=$(LIBSCTP) (>= \1)!' \
- >> debian/erlang-base.substvars
- dh_gencontrol -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)'
dh_md5sums -a -Nerlang-base-hipe
dh_builddeb -a -Nerlang-base-hipe
@@ -523,20 +513,13 @@
dh_fixperms -perlang-base-hipe
dh_makeshlibs -perlang-base-hipe
dh_installdeb -perlang-base-hipe
-ifneq ($(DEB_HOST_ARCH), hurd-i386)
- echo 'procps:Depends=procps' >>debian/erlang-base-hipe.substvars
-endif
dh_shlibdeps -perlang-base-hipe
- grep-status -s Version -PX $(LIBSCTP) | \
- sed -e's!^Version: \(.*\)-[^-]*!libsctp:Version=$(LIBSCTP) (>= \1)!' \
- >> debian/erlang-base-hipe.substvars
- dh_gencontrol -perlang-base-hipe
+ dh_gencontrol -perlang-base-hipe -- \
+ -Vprocps:Depends='$(PROCPS)' \
+ -Vlibsctp:Version='$(LIBSCTPDEP)'
dh_md5sums -perlang-base-hipe
dh_builddeb -perlang-base-hipe
-source diff:
- @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
-
binary: binary-indep binary-arch
REL=R13B03
More information about the Pkg-erlang-commits
mailing list