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

[sgolovan at alioth.debian.org]

Author: sgolovan
Date: 2010-02-28 10:25:56 +0000 (Sun, 28 Feb 2010)
New Revision: 1201

Modified:
   erlang/trunk/debian/changelog
   erlang/trunk/debian/control
   erlang/trunk/debian/patches/docs.patch
Log:
[erlang]
  * Added libwxgtk2.4-dev and libwxgtk2.6-dev to build conflicts.
  * Fixed .RE patch.


Modified: erlang/trunk/debian/changelog
===================================================================
--- erlang/trunk/debian/changelog	2010-02-28 09:40:11 UTC (rev 1200)
+++ erlang/trunk/debian/changelog	2010-02-28 10:25:56 UTC (rev 1201)
@@ -11,8 +11,9 @@
     a single source package (closes: #558451).
   * Removed RPATH from ssl and crypto application binaries as required by
     Debian policy.
+  * Added libwxgtk2.4-dev and libwxgtk2.6-dev to build conflicts.
 
- -- Sergei Golovan <sgolovan at debian.org>  Sat, 27 Feb 2010 09:40:42 +0300
+ -- Sergei Golovan <sgolovan at debian.org>  Sat, 27 Feb 2010 17:38:13 +0300
 
 erlang (1:13.b.3-dfsg-5) unstable; urgency=low
 

Modified: erlang/trunk/debian/control
===================================================================
--- erlang/trunk/debian/control	2010-02-28 09:40:11 UTC (rev 1200)
+++ erlang/trunk/debian/control	2010-02-28 10:25:56 UTC (rev 1201)
@@ -11,7 +11,7 @@
  libsctp-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64 !solaris-i386],
  kfreebsd-kernel-headers [kfreebsd-i386 kfreebsd-amd64],
  default-jdk
-Build-Conflicts: autoconf2.13
+Build-Conflicts: autoconf2.13, libwxgtk2.4-dev, libwxgtk2.6-dev
 Homepage: http://www.erlang.org/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-erlang/erlang/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-erlang/erlang/trunk/

Modified: erlang/trunk/debian/patches/docs.patch
===================================================================
--- erlang/trunk/debian/patches/docs.patch	2010-02-28 09:40:11 UTC (rev 1200)
+++ erlang/trunk/debian/patches/docs.patch	2010-02-28 10:25:56 UTC (rev 1201)
@@ -9,7 +9,7 @@
      <xsl:text>&#10;.RS 2</xsl:text>
      <xsl:apply-templates/>
 -    <xsl:text>&#10;.RE</xsl:text>
-+    <xsl:text>&#10;.RE </xsl:text>
++    <xsl:text>&#10;.RE&#10;</xsl:text>
    </xsl:template>
  
    <xsl:template match="list/item">
@@ -18,7 +18,7 @@
      <xsl:text>&#10;.RS 2</xsl:text>
      <xsl:apply-templates select="tag|item"/>
 -    <xsl:text>&#10;.RE</xsl:text>
-+    <xsl:text>&#10;.RE </xsl:text>
++    <xsl:text>&#10;.RE&#10;</xsl:text>
    </xsl:template>
    
    <xsl:template match="taglist/tag">
@@ -27,7 +27,7 @@
          <xsl:text>&#10;.LP&#10;&#10;.LP&#10;</xsl:text>     
          <xsl:value-of select="$content"/>
 -        <xsl:text>&#10;.RE</xsl:text>     
-+        <xsl:text>&#10;.RE</xsl:text>     
++        <xsl:text>&#10;.RE&#10;</xsl:text>     
        </xsl:otherwise>
      </xsl:choose>
    </xsl:template>
@@ -36,7 +36,7 @@
      <xsl:text>&#10;Types</xsl:text>
      <xsl:apply-templates/>
 -    <xsl:text>&#10;.RE</xsl:text>
-+    <xsl:text>&#10;.RE </xsl:text>
++    <xsl:text>&#10;.RE&#10;</xsl:text>
    </xsl:template>
  
  
@@ -45,7 +45,7 @@
      <xsl:text>&#10;.RS</xsl:text>
      <xsl:apply-templates/>
 -    <xsl:text>&#10;.RE</xsl:text>
-+    <xsl:text>&#10;.RE </xsl:text>
++    <xsl:text>&#10;.RE&#10;</xsl:text>
    </xsl:template>