[Pkg-erlang-commits] r1149 - in erlang/trunk/debian: . patches scripts

[sgolovan at alioth.debian.org]

Author: sgolovan
Date: 2009-12-19 19:03:14 +0000 (Sat, 19 Dec 2009)
New Revision: 1149

Modified:
   erlang/trunk/debian/control
   erlang/trunk/debian/patches/docs.patch
   erlang/trunk/debian/rules
   erlang/trunk/debian/scripts/analyse
Log:
[erlang]
  * Moved erl-docgen to arch all.
  * Fixed modules and packages init for erlang-depends.
  * Fixed docs patch.


Modified: erlang/trunk/debian/control
===================================================================
--- erlang/trunk/debian/control	2009-12-19 16:45:46 UTC (rev 1148)
+++ erlang/trunk/debian/control	2009-12-19 19:03:14 UTC (rev 1149)
@@ -181,7 +181,7 @@
 
 
 Package: erlang-erl-docgen
-Architecture: all
+Architecture: any
 Depends: ${erlang-base}, ${shlibs:Depends}, ${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)

Modified: erlang/trunk/debian/patches/docs.patch
===================================================================
--- erlang/trunk/debian/patches/docs.patch	2009-12-19 16:45:46 UTC (rev 1148)
+++ erlang/trunk/debian/patches/docs.patch	2009-12-19 19:03:14 UTC (rev 1149)
@@ -28,7 +28,7 @@
      <xsl:text>&#10;Types</xsl:text>
      <xsl:apply-templates/>
 -    <xsl:text>&#10;.RE</xsl:text>
-+    <xsl:text>&#10;.RE&#10;</xsl:text>
++    <xsl:text>&#10;.RE </xsl:text>
    </xsl:template>
  
  
@@ -37,7 +37,7 @@
      <xsl:text>&#10;.RS</xsl:text>
      <xsl:apply-templates/>
 -    <xsl:text>&#10;.RE</xsl:text>
-+    <xsl:text>&#10;.RE&#10;</xsl:text>
++    <xsl:text>&#10;.RE </xsl:text>
    </xsl:template>
  
  

Modified: erlang/trunk/debian/rules
===================================================================
--- erlang/trunk/debian/rules	2009-12-19 16:45:46 UTC (rev 1148)
+++ erlang/trunk/debian/rules	2009-12-19 19:03:14 UTC (rev 1149)
@@ -348,7 +348,7 @@
 	# Fix manpages
 	for f in $$(find $(TMP_DIR)/usr/share/man -type f) ; do \
 	    sed -i -e's/\(^\.TH .*\) 3 /\1 3erl /' \
-		   -e's/\([[:alnum:]]\)(3)/\1(3erl)/g' \
+		   -e's/\([^[:space:]]\)(3)/\1(3erl)/g' \
 		$$f ; \
 	done
 	for f in $$(find $(TMP_DIR)/usr/share/man/man3 -type f) ; do \
@@ -409,7 +409,7 @@
 	dh_installdirs -i
 	dh_install -i --sourcedir=$(TMPINSTALL_DIR)
 	#
-	for pkg in erl-docgen examples ; do \
+	for pkg in examples ; do \
 	    install -D -m 644 debian/lintian/erlang-$$pkg.lintian-override \
 		$(ROOT_DIR)/debian/erlang-$$pkg/usr/share/lintian/overrides/erlang-$$pkg ; \
 	done
@@ -427,7 +427,6 @@
 	dh_makeshlibs -i
 	dh_installdeb -i
 	echo 'erlang-base=erlang-base | erlang-base-hipe' >>debian/erlang.substvars
-	echo 'erlang-base=erlang-base | erlang-base-hipe' >>debian/erlang-erl-docgen.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)' \
@@ -453,7 +452,7 @@
 	install -D -m 644 $(ROOT_DIR)/debian/erlang-base.desktop \
 		$(ROOT_DIR)/debian/erlang-base/usr/share/apps/konsole/erlang.desktop
 	#
-	for pkg in base appmon debugger docbuilder edoc gs observer percept pman tv wx ; do \
+	for pkg in base appmon debugger docbuilder edoc erl-docgen gs observer percept pman tv wx ; do \
 	    install -D -m 644 debian/lintian/erlang-$$pkg.lintian-override \
 		$(ROOT_DIR)/debian/erlang-$$pkg/usr/share/lintian/overrides/erlang-$$pkg ; \
 	done
@@ -477,7 +476,7 @@
 	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 et eunit gs ic inets inviso megaco \
+		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 \

Modified: erlang/trunk/debian/scripts/analyse
===================================================================
--- erlang/trunk/debian/scripts/analyse	2009-12-19 16:45:46 UTC (rev 1148)
+++ erlang/trunk/debian/scripts/analyse	2009-12-19 19:03:14 UTC (rev 1149)
@@ -90,7 +90,7 @@
     PACKAGES2="$PACKAGES2, \"$pkg\""
 done
 
-sed -i -e "s/@PACKAGES@/$PACKAGES2/" -e "s/@MODULES@/$MODULES/" debian/erlang-depends
+sed -i -e "s/@PACKAGES@/$PACKAGES2/" -e "s/@MODULES@/$MODULES/" debian/scripts/erlang-depends
 
 echo "FILES WHICH HAVEN'T REACHED ANY PACKAGE"
 find $DIR -type f | eval $CMD1