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

sgolovan at alioth.debian.org sgolovan at alioth.debian.org
Thu Sep 19 18:19:41 UTC 2013


Author: sgolovan
Date: 2013-09-19 18:19:41 +0000 (Thu, 19 Sep 2013)
New Revision: 1537

Added:
   erlang/trunk/debian/erlang-appmon.lintian-overrides
   erlang/trunk/debian/erlang-base-hipe.lintian-overrides
   erlang/trunk/debian/erlang-base.lintian-overrides
   erlang/trunk/debian/erlang-common-test.lintian-overrides
   erlang/trunk/debian/erlang-debugger.lintian-overrides
   erlang/trunk/debian/erlang-edoc.lintian-overrides
   erlang/trunk/debian/erlang-erl-docgen.lintian-overrides
   erlang/trunk/debian/erlang-examples.lintian-overrides
   erlang/trunk/debian/erlang-gs.lintian-overrides
   erlang/trunk/debian/erlang-observer.lintian-overrides
   erlang/trunk/debian/erlang-percept.lintian-overrides
   erlang/trunk/debian/erlang-pman.lintian-overrides
   erlang/trunk/debian/erlang-tv.lintian-overrides
   erlang/trunk/debian/erlang-wx.lintian-overrides
Removed:
   erlang/trunk/debian/lintian/
   erlang/trunk/debian/patches/efile.patch
   erlang/trunk/debian/patches/odbcserver.patch
Modified:
   erlang/trunk/debian/changelog
   erlang/trunk/debian/compat
   erlang/trunk/debian/control
   erlang/trunk/debian/patches/clean.patch
   erlang/trunk/debian/patches/docs.patch
   erlang/trunk/debian/patches/emacs.patch
   erlang/trunk/debian/patches/gnu.patch
   erlang/trunk/debian/patches/hppa.patch
   erlang/trunk/debian/patches/java.patch
   erlang/trunk/debian/patches/man.patch
   erlang/trunk/debian/patches/powerpc.patch
   erlang/trunk/debian/patches/rpath.patch
   erlang/trunk/debian/patches/series
   erlang/trunk/debian/patches/sparc.patch
   erlang/trunk/debian/rules
Log:
[erlang]
  * New upstream release.
  * Removed patches for odbcserver and dets fixes because the bugs were
    fixed upstream.
  * Limited number of simultaneous jobs to 4 to use less build resources
    which makes build easier on systems with less memory.
  * Bumped debhelper compatibility version to 8.
  * Use dh_lintian to install lintian overrides.


Modified: erlang/trunk/debian/changelog
===================================================================
--- erlang/trunk/debian/changelog	2013-09-03 12:07:05 UTC (rev 1536)
+++ erlang/trunk/debian/changelog	2013-09-19 18:19:41 UTC (rev 1537)
@@ -1,8 +1,14 @@
-erlang (1:16.b.1-dfsg-6) UNRELEASED; urgency=low
+erlang (1:16.b.2-dfsg-1) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * New upstream release.
+  * Removed patches for odbcserver and dets fixes because the bugs were
+    fixed upstream.
+  * Limited number of simultaneous jobs to 4 to use less build resources
+    which makes build easier on systems with less memory.
+  * Bumped debhelper compatibility version to 8.
+  * Use dh_lintian to install lintian overrides.
 
- -- Sergei Golovan <sgolovan at debian.org>  Sat, 24 Aug 2013 00:47:51 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Thu, 19 Sep 2013 22:19:04 +0400
 
 erlang (1:16.b.1-dfsg-5) unstable; urgency=low
 

Modified: erlang/trunk/debian/compat
===================================================================
--- erlang/trunk/debian/compat	2013-09-03 12:07:05 UTC (rev 1536)
+++ erlang/trunk/debian/compat	2013-09-19 18:19:41 UTC (rev 1537)
@@ -1 +1 @@
-5
+8

Modified: erlang/trunk/debian/control
===================================================================
--- erlang/trunk/debian/control	2013-09-03 12:07:05 UTC (rev 1536)
+++ erlang/trunk/debian/control	2013-09-19 18:19:41 UTC (rev 1537)
@@ -4,7 +4,7 @@
 Section: interpreters
 Priority: optional
 Standards-Version: 3.9.4
-Build-Depends: debhelper (>= 5.0.0), autoconf (>= 2.50), openssl, libssl-dev, m4,
+Build-Depends: debhelper (>= 8.0.0), autoconf (>= 2.50), openssl, libssl-dev, m4,
  libncurses5-dev, autotools-dev, unixodbc-dev, bison, flex, ed,
  libwxgtk2.8-dev, dctrl-tools, xsltproc,
  libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev,

Copied: erlang/trunk/debian/erlang-appmon.lintian-overrides (from rev 1533, erlang/trunk/debian/lintian/erlang-appmon.lintian-overrides)
===================================================================
--- erlang/trunk/debian/erlang-appmon.lintian-overrides	                        (rev 0)
+++ erlang/trunk/debian/erlang-appmon.lintian-overrides	2013-09-19 18:19:41 UTC (rev 1537)
@@ -0,0 +1 @@
+erlang-appmon: image-file-in-usr-lib

Copied: erlang/trunk/debian/erlang-base-hipe.lintian-overrides (from rev 1533, erlang/trunk/debian/lintian/erlang-base-hipe.lintian-overrides)
===================================================================
--- erlang/trunk/debian/erlang-base-hipe.lintian-overrides	                        (rev 0)
+++ erlang/trunk/debian/erlang-base-hipe.lintian-overrides	2013-09-19 18:19:41 UTC (rev 1537)
@@ -0,0 +1,3 @@
+# PCRE3 which is embedded into Erlang VM is patched, so
+# it's not possible to link it to an external pcre3.
+erlang-base-hipe: embedded-library

Copied: erlang/trunk/debian/erlang-base.lintian-overrides (from rev 1533, erlang/trunk/debian/lintian/erlang-base.lintian-overrides)
===================================================================
--- erlang/trunk/debian/erlang-base.lintian-overrides	                        (rev 0)
+++ erlang/trunk/debian/erlang-base.lintian-overrides	2013-09-19 18:19:41 UTC (rev 1537)
@@ -0,0 +1,3 @@
+# PCRE3 which is embedded into Erlang VM is patched, so
+# it's not possible to link it to an external pcre3.
+erlang-base: embedded-library

Copied: erlang/trunk/debian/erlang-common-test.lintian-overrides (from rev 1533, erlang/trunk/debian/lintian/erlang-common-test.lintian-overrides)
===================================================================
--- erlang/trunk/debian/erlang-common-test.lintian-overrides	                        (rev 0)
+++ erlang/trunk/debian/erlang-common-test.lintian-overrides	2013-09-19 18:19:41 UTC (rev 1537)
@@ -0,0 +1 @@
+erlang-common-test: image-file-in-usr-lib

Copied: erlang/trunk/debian/erlang-debugger.lintian-overrides (from rev 1533, erlang/trunk/debian/lintian/erlang-debugger.lintian-overrides)
===================================================================
--- erlang/trunk/debian/erlang-debugger.lintian-overrides	                        (rev 0)
+++ erlang/trunk/debian/erlang-debugger.lintian-overrides	2013-09-19 18:19:41 UTC (rev 1537)
@@ -0,0 +1 @@
+erlang-debugger: image-file-in-usr-lib

Copied: erlang/trunk/debian/erlang-edoc.lintian-overrides (from rev 1533, erlang/trunk/debian/lintian/erlang-edoc.lintian-overrides)
===================================================================
--- erlang/trunk/debian/erlang-edoc.lintian-overrides	                        (rev 0)
+++ erlang/trunk/debian/erlang-edoc.lintian-overrides	2013-09-19 18:19:41 UTC (rev 1537)
@@ -0,0 +1 @@
+erlang-edoc: image-file-in-usr-lib

Copied: erlang/trunk/debian/erlang-erl-docgen.lintian-overrides (from rev 1533, erlang/trunk/debian/lintian/erlang-erl-docgen.lintian-overrides)
===================================================================
--- erlang/trunk/debian/erlang-erl-docgen.lintian-overrides	                        (rev 0)
+++ erlang/trunk/debian/erlang-erl-docgen.lintian-overrides	2013-09-19 18:19:41 UTC (rev 1537)
@@ -0,0 +1 @@
+erlang-erl-docgen: image-file-in-usr-lib

Copied: erlang/trunk/debian/erlang-examples.lintian-overrides (from rev 1533, erlang/trunk/debian/lintian/erlang-examples.lintian-overrides)
===================================================================
--- erlang/trunk/debian/erlang-examples.lintian-overrides	                        (rev 0)
+++ erlang/trunk/debian/erlang-examples.lintian-overrides	2013-09-19 18:19:41 UTC (rev 1537)
@@ -0,0 +1,5 @@
+erlang-examples: image-file-in-usr-lib
+
+# The scripts in the following warnings are not scripts but script skeletons.
+erlang-examples: script-not-executable
+erlang-examples: shell-script-fails-syntax-check

Copied: erlang/trunk/debian/erlang-gs.lintian-overrides (from rev 1533, erlang/trunk/debian/lintian/erlang-gs.lintian-overrides)
===================================================================
--- erlang/trunk/debian/erlang-gs.lintian-overrides	                        (rev 0)
+++ erlang/trunk/debian/erlang-gs.lintian-overrides	2013-09-19 18:19:41 UTC (rev 1537)
@@ -0,0 +1 @@
+erlang-gs: image-file-in-usr-lib

Copied: erlang/trunk/debian/erlang-observer.lintian-overrides (from rev 1533, erlang/trunk/debian/lintian/erlang-observer.lintian-overrides)
===================================================================
--- erlang/trunk/debian/erlang-observer.lintian-overrides	                        (rev 0)
+++ erlang/trunk/debian/erlang-observer.lintian-overrides	2013-09-19 18:19:41 UTC (rev 1537)
@@ -0,0 +1 @@
+erlang-observer: image-file-in-usr-lib

Copied: erlang/trunk/debian/erlang-percept.lintian-overrides (from rev 1533, erlang/trunk/debian/lintian/erlang-percept.lintian-overrides)
===================================================================
--- erlang/trunk/debian/erlang-percept.lintian-overrides	                        (rev 0)
+++ erlang/trunk/debian/erlang-percept.lintian-overrides	2013-09-19 18:19:41 UTC (rev 1537)
@@ -0,0 +1 @@
+erlang-percept: image-file-in-usr-lib

Copied: erlang/trunk/debian/erlang-pman.lintian-overrides (from rev 1533, erlang/trunk/debian/lintian/erlang-pman.lintian-overrides)
===================================================================
--- erlang/trunk/debian/erlang-pman.lintian-overrides	                        (rev 0)
+++ erlang/trunk/debian/erlang-pman.lintian-overrides	2013-09-19 18:19:41 UTC (rev 1537)
@@ -0,0 +1 @@
+erlang-pman: image-file-in-usr-lib

Copied: erlang/trunk/debian/erlang-tv.lintian-overrides (from rev 1533, erlang/trunk/debian/lintian/erlang-tv.lintian-overrides)
===================================================================
--- erlang/trunk/debian/erlang-tv.lintian-overrides	                        (rev 0)
+++ erlang/trunk/debian/erlang-tv.lintian-overrides	2013-09-19 18:19:41 UTC (rev 1537)
@@ -0,0 +1 @@
+erlang-tv: image-file-in-usr-lib

Copied: erlang/trunk/debian/erlang-wx.lintian-overrides (from rev 1533, erlang/trunk/debian/lintian/erlang-wx.lintian-overrides)
===================================================================
--- erlang/trunk/debian/erlang-wx.lintian-overrides	                        (rev 0)
+++ erlang/trunk/debian/erlang-wx.lintian-overrides	2013-09-19 18:19:41 UTC (rev 1537)
@@ -0,0 +1 @@
+erlang-wx: image-file-in-usr-lib

Modified: erlang/trunk/debian/patches/clean.patch
===================================================================
--- erlang/trunk/debian/patches/clean.patch	2013-09-03 12:07:05 UTC (rev 1536)
+++ erlang/trunk/debian/patches/clean.patch	2013-09-19 18:19:41 UTC (rev 1537)
@@ -3,8 +3,8 @@
 Erlang leaves many files after make clean. This patch contains
 a hack to remove them.
 
---- erlang-16.b.1-dfsg.orig/Makefile.in
-+++ erlang-16.b.1-dfsg/Makefile.in
+--- erlang-16.b.2-dfsg.orig/Makefile.in
++++ erlang-16.b.2-dfsg/Makefile.in
 @@ -995,6 +995,7 @@
  	find . -type f -name SKIP -print | xargs $(RM)
  	cd erts && ERL_TOP=$(ERL_TOP) $(MAKE) clean
@@ -13,7 +13,7 @@
  
  #
  # Just wipe out emulator, not libraries
-@@ -1032,3 +1033,207 @@
+@@ -1032,3 +1033,209 @@
  		|| $(MAKE) BOOTSTRAP_ROOT=$(BOOTSTRAP_ROOT) bootstrap_root_clean
  
  # ----------------------------------------------------------------------
@@ -54,6 +54,7 @@
 +	rm -rf $(ERL_TOP)/erts/etc/common/erl.src
 +	rm -rf $(ERL_TOP)/erts/etc/common/$(TARGET)
 +	rm -rf $(ERL_TOP)/erts/etc/common/Install
++	rm -rf $(ERL_TOP)/erts/etc/unix/etp-commands
 +	rm -rf $(ERL_TOP)/erts/$(TARGET)
 +	rm -rf $(ERL_TOP)/erts/include/$(TARGET)
 +	rm -rf $(ERL_TOP)/erts/include/internal/$(TARGET)
@@ -65,6 +66,7 @@
 +	rm -rf $(ERL_TOP)/erts/Makefile
 +	rm -rf $(ERL_TOP)/erts/obj/$(TARGET)
 +	rm -rf $(ERL_TOP)/erts/obj.debug/$(TARGET)
++	rm -rf $(ERL_TOP)/erts/preloaded/erts.app
 +	rm -rf $(ERL_TOP)/erts/start_scripts/RELEASES.src
 +	rm -rf $(ERL_TOP)/erts/start_scripts/tmp
 +	rm -rf $(ERL_TOP)/lib/asn1/priv/lib/$(TARGET)

Modified: erlang/trunk/debian/patches/docs.patch
===================================================================
--- erlang/trunk/debian/patches/docs.patch	2013-09-03 12:07:05 UTC (rev 1536)
+++ erlang/trunk/debian/patches/docs.patch	2013-09-19 18:19:41 UTC (rev 1537)
@@ -3,8 +3,8 @@
  and a few bugs with docs installation.
 Last-modified: Thu, 09 Dec 2010 10:45:56 +0300
 
---- erlang-16.b.1-dfsg.orig/lib/erl_docgen/priv/xsl/db_man.xsl
-+++ erlang-16.b.1-dfsg/lib/erl_docgen/priv/xsl/db_man.xsl
+--- erlang-16.b.2-dfsg.orig/lib/erl_docgen/priv/xsl/db_man.xsl
++++ erlang-16.b.2-dfsg/lib/erl_docgen/priv/xsl/db_man.xsl
 @@ -508,7 +508,7 @@
          <xsl:text>
.RS 2</xsl:text>
          <xsl:text>
.LP
</xsl:text>
@@ -23,8 +23,8 @@
    </xsl:template>
  
  
---- erlang-16.b.1-dfsg.orig/lib/megaco/doc/src/Makefile
-+++ erlang-16.b.1-dfsg/lib/megaco/doc/src/Makefile
+--- erlang-16.b.2-dfsg.orig/lib/megaco/doc/src/Makefile
++++ erlang-16.b.2-dfsg/lib/megaco/doc/src/Makefile
 @@ -169,8 +169,6 @@
  	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
  	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
@@ -34,8 +34,8 @@
  
  release_spec:
  
---- erlang-16.b.1-dfsg.orig/lib/stdlib/doc/src/re.xml
-+++ erlang-16.b.1-dfsg/lib/stdlib/doc/src/re.xml
+--- erlang-16.b.2-dfsg.orig/lib/stdlib/doc/src/re.xml
++++ erlang-16.b.2-dfsg/lib/stdlib/doc/src/re.xml
 @@ -310,7 +310,7 @@
        metacharacter should not match before it. Setting this without
        <c>multiline</c> (at compile time) causes circumflex never to
@@ -56,8 +56,8 @@
  
        <tag><c>{offset, integer() >= 0}</c></tag>
  
---- erlang-16.b.1-dfsg.orig/lib/tools/Makefile
-+++ erlang-16.b.1-dfsg/lib/tools/Makefile
+--- erlang-16.b.2-dfsg.orig/lib/tools/Makefile
++++ erlang-16.b.2-dfsg/lib/tools/Makefile
 @@ -23,7 +23,7 @@
  # Macros
  # ----------------------------------------------------

Deleted: erlang/trunk/debian/patches/efile.patch
===================================================================
--- erlang/trunk/debian/patches/efile.patch	2013-09-03 12:07:05 UTC (rev 1536)
+++ erlang/trunk/debian/patches/efile.patch	2013-09-19 18:19:41 UTC (rev 1537)
@@ -1,155 +0,0 @@
---- erlang-16.b.1-dfsg.orig/erts/emulator/drivers/common/efile_drv.c
-+++ erlang-16.b.1-dfsg/erts/emulator/drivers/common/efile_drv.c
-@@ -546,53 +546,81 @@
-     (((char *)(ev)->iov[(q)].iov_base) + (p))
- 
- /* int EV_GET_CHAR(ErlIOVec *ev, char *p, int *pp, int *qp) */
--#define EV_GET_CHAR(ev, p, pp, qp)                      \
--    (*(pp)+1 <= (ev)->iov[*(qp)].iov_len                \
--     ? (*(p) = *EV_CHAR_P(ev, *(pp), *(qp)),            \
--        *(pp) = (    *(pp)+1 < (ev)->iov[*(qp)].iov_len \
--                 ?   *(pp)+1                            \
--                 : ((*(qp))++, 0)),                     \
--        !0)                                             \
--     : 0)
-+#define EV_GET_CHAR(ev, p, pp, qp) efile_ev_get_char(ev, p ,pp, qp)
-+static int
-+efile_ev_get_char(ErlIOVec *ev, char *p, int *pp, int *qp) {
-+  if (*(pp)+1 <= (ev)->iov[*(qp)].iov_len) {
-+    *(p) = *EV_CHAR_P(ev, *(pp), *(qp));
-+    if (*(pp)+1 < (ev)->iov[*(qp)].iov_len)
-+      *(pp) = *(pp)+1;
-+    else {
-+      (*(qp))++;
-+      *pp = 0;
-+    }
-+    return !0;
-+  }
-+  return 0;
-+}
- 
- /* Uint32 EV_UINT32(ErlIOVec *ev, int p, int q)*/
- #define EV_UINT32(ev, p, q) \
-     ((Uint32) *(((unsigned char *)(ev)->iov[(q)].iov_base) + (p)))
- 
- /* int EV_GET_UINT32(ErlIOVec *ev, Uint32 *p, int *pp, int *qp) */
--#define EV_GET_UINT32(ev, p, pp, qp)                      \
--    (*(pp)+4 <= (ev)->iov[*(qp)].iov_len                  \
--     ? (*(p) = (EV_UINT32(ev, *(pp),   *(qp)) << 24)      \
--             | (EV_UINT32(ev, *(pp)+1, *(qp)) << 16)      \
--             | (EV_UINT32(ev, *(pp)+2, *(qp)) << 8)       \
--             | (EV_UINT32(ev, *(pp)+3, *(qp))),           \
--        *(pp) = (    *(pp)+4 < (ev)->iov[*(qp)].iov_len   \
--                 ?   *(pp)+4                              \
--                 : ((*(qp))++, 0)),                       \
--        !0)                                               \
--     : 0)
-+#define EV_GET_UINT32(ev, p, pp, qp) efile_ev_get_uint32(ev,p,pp,qp)
-+static int
-+efile_ev_get_uint32(ErlIOVec *ev, Uint32 *p, int *pp, int *qp) {
-+  if (*(pp)+4 <= (ev)->iov[*(qp)].iov_len) {
-+    *(p) = (EV_UINT32(ev, *(pp),   *(qp)) << 24)
-+      | (EV_UINT32(ev, *(pp)+1, *(qp)) << 16)		  
-+      | (EV_UINT32(ev, *(pp)+2, *(qp)) << 8)		  
-+      | (EV_UINT32(ev, *(pp)+3, *(qp)));
-+    if (*(pp)+4 < (ev)->iov[*(qp)].iov_len)
-+      *(pp) = *(pp)+4;
-+    else {
-+      (*(qp))++;
-+      *pp = 0;
-+    }
-+    return !0;
-+  }
-+  return 0;
-+}
- 
- /* Uint64 EV_UINT64(ErlIOVec *ev, int p, int q)*/
- #define EV_UINT64(ev, p, q) \
-     ((Uint64) *(((unsigned char *)(ev)->iov[(q)].iov_base) + (p)))
- 
--/* int EV_GET_UINT64(ErlIOVec *ev, Uint32 *p, int *pp, int *qp) */
--#define EV_GET_UINT64(ev, p, pp, qp)                      \
--    (*(pp)+8 <= (ev)->iov[*(qp)].iov_len                  \
--     ? (*(p) = (EV_UINT64(ev, *(pp),   *(qp)) << 56)      \
--             | (EV_UINT64(ev, *(pp)+1, *(qp)) << 48)      \
--             | (EV_UINT64(ev, *(pp)+2, *(qp)) << 40)      \
--             | (EV_UINT64(ev, *(pp)+3, *(qp)) << 32)      \
--             | (EV_UINT64(ev, *(pp)+4, *(qp)) << 24)      \
--             | (EV_UINT64(ev, *(pp)+5, *(qp)) << 16)      \
--             | (EV_UINT64(ev, *(pp)+6, *(qp)) << 8)       \
--             | (EV_UINT64(ev, *(pp)+7, *(qp))),           \
--        *(pp) = (    *(pp)+8 < (ev)->iov[*(qp)].iov_len   \
--                 ?   *(pp)+8                              \
--                 : ((*(qp))++, 0)),                       \
--        !0)                                               \
--     : 0)
-+/* int EV_GET_UINT64(ErlIOVec *ev, Uint64 *p, int *pp, int *qp) */
-+#define EV_GET_UINT64(ev, p, pp, qp) efile_ev_get_uint64(ev,p,pp,qp)
-+static int
-+efile_ev_get_uint64(ErlIOVec *ev, Uint64 *p, int *pp, int *qp) {
-+  if (*(pp)+8 <= (ev)->iov[*(qp)].iov_len) {
-+    *(p) = (EV_UINT64(ev, *(pp),   *(qp)) << 56)
-+      | (EV_UINT64(ev, *(pp)+1, *(qp)) << 48)
-+      | (EV_UINT64(ev, *(pp)+2, *(qp)) << 40)
-+      | (EV_UINT64(ev, *(pp)+3, *(qp)) << 32)
-+      | (EV_UINT64(ev, *(pp)+4, *(qp)) << 24)
-+      | (EV_UINT64(ev, *(pp)+5, *(qp)) << 16)
-+      | (EV_UINT64(ev, *(pp)+6, *(qp)) << 8)
-+      | (EV_UINT64(ev, *(pp)+7, *(qp)));
-+    if (*(pp)+8 < (ev)->iov[*(qp)].iov_len)
-+      *(pp) = *(pp)+8;
-+    else {
-+      (*(qp))++;
-+      *pp = 0;
-+    }
-+    return !0;
-+  }
-+  return 0;
-+}
- 
-+/* int EV_GET_SINT64(ErlIOVec *ev, Uint64 *p, int *pp, int *qp) */
-+#define EV_GET_SINT64(ev, p, pp, qp) efile_ev_get_sint64(ev,p,pp,qp)
-+static int
-+efile_ev_get_sint64(ErlIOVec *ev, Sint64 *p, int *pp, int *qp) {
-+  Uint64 *tmp = (Uint64*)p;
-+  return EV_GET_UINT64(ev,tmp,pp,qp);
-+}
- 
- #if 0
- 
-@@ -3604,7 +3632,7 @@
- 	for(i = 0; i < n; i++) {
- 	    Uint32 sizeH, sizeL;
- 	    size_t size;
--	    if (   !EV_GET_UINT64(ev, &d->c.pwritev.specs[i].offset, &p, &q)
-+	    if (   !EV_GET_SINT64(ev, &d->c.pwritev.specs[i].offset, &p, &q)
- 		|| !EV_GET_UINT32(ev, &sizeH, &p, &q)
- 		|| !EV_GET_UINT32(ev, &sizeL, &p, &q)) {
- 		/* Misalignment in buffer */
-@@ -3746,7 +3774,7 @@
- 	for (i = 1; i < 1+n; i++) {
- 	    Uint32 sizeH, sizeL;
- 	    size_t size;
--	    if (   !EV_GET_UINT64(ev, &d->c.preadv.offsets[i-1], &p, &q)
-+	    if (   !EV_GET_SINT64(ev, &d->c.preadv.offsets[i-1], &p, &q)
- 		|| !EV_GET_UINT32(ev, &sizeH, &p, &q)
- 		|| !EV_GET_UINT32(ev, &sizeL, &p, &q)) {
- 		reply_posix_error(desc, EINVAL);
-@@ -3814,7 +3842,7 @@
- 	Uint32 origin;		/* Origin of seek. */
- 
- 	if (ev->size < 1+8+4
--	    || !EV_GET_UINT64(ev, &offset, &p, &q)
-+	    || !EV_GET_SINT64(ev, &offset, &p, &q)
- 	    || !EV_GET_UINT32(ev, &origin, &p, &q)) {
- 	    /* Wrong length of buffer to contain offset and origin */
- 	    reply_posix_error(desc, EINVAL);
-@@ -3927,7 +3955,7 @@
- 	    goto done;
- 	}
- 	if (ev->size < 1+1+8+4
--	    || !EV_GET_UINT64(ev, &hdr_offset, &p, &q)
-+	    || !EV_GET_SINT64(ev, &hdr_offset, &p, &q)
- 	    || !EV_GET_UINT32(ev, &max_size, &p, &q)) {
- 	    /* Buffer too short to contain 
- 	     * the header offset and max size spec */

Modified: erlang/trunk/debian/patches/emacs.patch
===================================================================
--- erlang/trunk/debian/patches/emacs.patch	2013-09-03 12:07:05 UTC (rev 1536)
+++ erlang/trunk/debian/patches/emacs.patch	2013-09-19 18:19:41 UTC (rev 1537)
@@ -3,8 +3,8 @@
 Also, it fixes manpage name regexp matching only 3erl manpages in
 section 3.
 
---- erlang-16.b.1-dfsg.orig/lib/tools/emacs/erlang.el
-+++ erlang-16.b.1-dfsg/lib/tools/emacs/erlang.el
+--- erlang-16.b.2-dfsg.orig/lib/tools/emacs/erlang.el
++++ erlang-16.b.2-dfsg/lib/tools/emacs/erlang.el
 @@ -495,8 +495,8 @@
  (defvar erlang-man-dirs
    '(("Man - Commands" "/man/man1" t)

Modified: erlang/trunk/debian/patches/gnu.patch
===================================================================
--- erlang/trunk/debian/patches/gnu.patch	2013-09-03 12:07:05 UTC (rev 1536)
+++ erlang/trunk/debian/patches/gnu.patch	2013-09-19 18:19:41 UTC (rev 1537)
@@ -11,9 +11,9 @@
 
 (4) Switch some PATH_MAX occurrences to MAXPATHLEN;
 
---- erlang-16.b.1-dfsg.orig/erts/configure.in
-+++ erlang-16.b.1-dfsg/erts/configure.in
-@@ -425,7 +425,7 @@
+--- erlang-16.b.2-dfsg.orig/erts/configure.in
++++ erlang-16.b.2-dfsg/erts/configure.in
+@@ -433,7 +433,7 @@
  
  dnl NOTE: CPPFLAGS will be included in CFLAGS at the end
  case $host_os in
@@ -22,7 +22,7 @@
      win32)
  	# The ethread library requires _WIN32_WINNT of at least 0x0403.
  	# -D_WIN32_WINNT=* from CPPFLAGS is saved in ETHR_DEFS.
-@@ -1232,7 +1232,7 @@
+@@ -1248,7 +1248,7 @@
  	    solaris*)
  		enable_child_waiter_thread=yes
  		;;
@@ -31,8 +31,8 @@
  		AC_MSG_CHECKING([whether dlopen() needs to be called before first call to dlerror()])
  		if test "x$ETHR_THR_LIB_BASE_TYPE" != "xposix_nptl"; then
  		    AC_DEFINE(ERTS_NEED_DLOPEN_BEFORE_DLERROR,[1],
---- erlang-16.b.1-dfsg.orig/lib/os_mon/c_src/memsup.c
-+++ erlang-16.b.1-dfsg/lib/os_mon/c_src/memsup.c
+--- erlang-16.b.2-dfsg.orig/lib/os_mon/c_src/memsup.c
++++ erlang-16.b.2-dfsg/lib/os_mon/c_src/memsup.c
 @@ -98,6 +98,11 @@
  #include <time.h>
  #include <errno.h>
@@ -45,9 +45,9 @@
  #ifdef BSD4_4
  #include <sys/types.h>
  #include <sys/sysctl.h>
---- erlang-16.b.1-dfsg.orig/erts/emulator/drivers/common/inet_drv.c
-+++ erlang-16.b.1-dfsg/erts/emulator/drivers/common/inet_drv.c
-@@ -511,6 +511,11 @@
+--- erlang-16.b.2-dfsg.orig/erts/emulator/drivers/common/inet_drv.c
++++ erlang-16.b.2-dfsg/erts/emulator/drivers/common/inet_drv.c
+@@ -519,6 +519,11 @@
          inet_driver_select((d)->port, (ErlDrvEvent)(long)(d)->event, (flags), (onoff)); \
     } while(0)
  
@@ -57,11 +57,11 @@
 +#endif
 +
  
- #endif /* __WIN32__ */
+ #endif /* #ifdef __WIN32__    #else */
  
---- erlang-16.b.1-dfsg.orig/erts/etc/common/erlexec.c
-+++ erlang-16.b.1-dfsg/erts/etc/common/erlexec.c
-@@ -1525,7 +1525,7 @@
+--- erlang-16.b.2-dfsg.orig/erts/etc/common/erlexec.c
++++ erlang-16.b.2-dfsg/erts/etc/common/erlexec.c
+@@ -1540,7 +1540,7 @@
      if (!bindir) {
  	/* Determine bindir from absolute path to executable */
  	char *p;
@@ -70,7 +70,7 @@
  	strncpy(buffer, argv[0], sizeof(buffer));
  	buffer[sizeof(buffer)-1] = '\0';
  	
-@@ -1539,7 +1539,7 @@
+@@ -1554,7 +1554,7 @@
      if (!rootdir) {
  	/* Determine rootdir from absolute path to bindir */
  	char *p;
@@ -79,8 +79,8 @@
  	strncpy(buffer, bindir, sizeof(buffer));
  	buffer[sizeof(buffer)-1] = '\0';
  	
---- erlang-16.b.1-dfsg.orig/erts/etc/common/escript.c
-+++ erlang-16.b.1-dfsg/erts/etc/common/escript.c
+--- erlang-16.b.2-dfsg.orig/erts/etc/common/escript.c
++++ erlang-16.b.2-dfsg/erts/etc/common/escript.c
 @@ -53,7 +53,7 @@
  #  define IS_DIRSEP(c) ((c) == '/')
  #  define DIRSEPSTR "/"
@@ -90,8 +90,8 @@
  #  define ERL_NAME "erl"
  #endif
  
---- erlang-16.b.1-dfsg.orig/erts/etc/unix/dyn_erl.c
-+++ erlang-16.b.1-dfsg/erts/etc/unix/dyn_erl.c
+--- erlang-16.b.2-dfsg.orig/erts/etc/unix/dyn_erl.c
++++ erlang-16.b.2-dfsg/erts/etc/unix/dyn_erl.c
 @@ -149,8 +149,8 @@
  static char *
  find_prog(char *origpath)

Modified: erlang/trunk/debian/patches/hppa.patch
===================================================================
--- erlang/trunk/debian/patches/hppa.patch	2013-09-03 12:07:05 UTC (rev 1536)
+++ erlang/trunk/debian/patches/hppa.patch	2013-09-19 18:19:41 UTC (rev 1537)
@@ -6,9 +6,9 @@
 Forwarded: no
 Last-updated: Mon, 22 Feb 2010 10:34:34 +0300
 
---- erlang-16.b.1-dfsg.orig/erts/configure.in
-+++ erlang-16.b.1-dfsg/erts/configure.in
-@@ -1971,6 +1971,14 @@
+--- erlang-16.b.2-dfsg.orig/erts/configure.in
++++ erlang-16.b.2-dfsg/erts/configure.in
+@@ -1991,6 +1991,14 @@
  AC_CHECK_DECLS([posix2time, time2posix],,,[#include <time.h>])
  
  disable_vfork=false

Modified: erlang/trunk/debian/patches/java.patch
===================================================================
--- erlang/trunk/debian/patches/java.patch	2013-09-03 12:07:05 UTC (rev 1536)
+++ erlang/trunk/debian/patches/java.patch	2013-09-19 18:19:41 UTC (rev 1537)
@@ -6,9 +6,9 @@
 Forwarded: yes
 Last-updated: Sat, 13 Feb 2010 10:08:42 +0300
 
---- erlang-16.b.1-dfsg.orig/erts/configure.in
-+++ erlang-16.b.1-dfsg/erts/configure.in
-@@ -4470,7 +4470,8 @@
+--- erlang-16.b.2-dfsg.orig/erts/configure.in
++++ erlang-16.b.2-dfsg/erts/configure.in
+@@ -4490,7 +4490,8 @@
    dnl Make sure it's at least JDK 1.5
    AC_CACHE_CHECK(for JDK version 1.5, 
       ac_cv_prog_javac_ver_1_5,
@@ -18,8 +18,8 @@
          ac_cv_prog_javac_ver_1_5=yes, ac_cv_prog_javac_ver_1_5=no)])
    if test $ac_cv_prog_javac_ver_1_5 = no; then
      unset -v JAVAC
---- erlang-16.b.1-dfsg.orig/lib/test_server/src/configure.in
-+++ erlang-16.b.1-dfsg/lib/test_server/src/configure.in
+--- erlang-16.b.2-dfsg.orig/lib/test_server/src/configure.in
++++ erlang-16.b.2-dfsg/lib/test_server/src/configure.in
 @@ -392,7 +392,8 @@
    dnl Make sure it's at least JDK 1.5
    AC_CACHE_CHECK(for JDK version 1.5, 

Modified: erlang/trunk/debian/patches/man.patch
===================================================================
--- erlang/trunk/debian/patches/man.patch	2013-09-03 12:07:05 UTC (rev 1536)
+++ erlang/trunk/debian/patches/man.patch	2013-09-19 18:19:41 UTC (rev 1537)
@@ -4,8 +4,8 @@
 (Erlang manual pages are placed to /usr/share/man/ hierarchy
 as required by Debian policy.)
 
---- erlang-16.b.1-dfsg.orig/erts/etc/common/erlexec.c
-+++ erlang-16.b.1-dfsg/erts/etc/common/erlexec.c
+--- erlang-16.b.2-dfsg.orig/erts/etc/common/erlexec.c
++++ erlang-16.b.2-dfsg/erts/etc/common/erlexec.c
 @@ -715,8 +715,10 @@
  			error("-man not supported on Windows");
  #else

Deleted: erlang/trunk/debian/patches/odbcserver.patch
===================================================================
--- erlang/trunk/debian/patches/odbcserver.patch	2013-09-03 12:07:05 UTC (rev 1536)
+++ erlang/trunk/debian/patches/odbcserver.patch	2013-09-19 18:19:41 UTC (rev 1537)
@@ -1,45 +0,0 @@
-Author: Sergei Golovan
-Description: Patch adds a few input checks which prevent odbcserver crash if
- it's executed and supplied incorrect data to stdin. A crash example:
- echo -en "\x0\x0\x0\x1\x0" | ./odbcserver
-Last-Updated: Thu, 27 Jun 2013 09:42:57 +0400
-
---- erlang-16.b.1-dfsg.orig/lib/odbc/c_src/odbcserver.c
-+++ erlang-16.b.1-dfsg/lib/odbc/c_src/odbcserver.c
-@@ -277,11 +277,15 @@
-     msg = receive_erlang_port_msg();
- 
-     temp = strtok(msg, ";");
-+    if (temp == NULL)
-+	DO_EXIT(EXIT_STDIN_BODY);
-     length = strlen(temp);
-     supervisor_port = safe_malloc(length + 1);
-     strcpy(supervisor_port, temp);
- 
-     temp = strtok(NULL, ";");
-+    if (temp == NULL)
-+	DO_EXIT(EXIT_STDIN_BODY);
-     length = strlen(temp);
-     odbc_port = safe_malloc(length + 1);
-     strcpy(odbc_port, temp);
-@@ -1819,12 +1823,20 @@
- 	len |= lengthstr[i];
-     }
-     
-+    if (len <= 0 || len > 1024) {
-+	DO_EXIT(EXIT_STDIN_HEADER);
-+    }
-+
-     buffer = (byte *)safe_malloc(len);
-     
-     if (read_exact(buffer, len) <= 0) {
- 	DO_EXIT(EXIT_STDIN_BODY);
-     }
- 
-+    if (buffer[len-1] != '\0') {
-+	DO_EXIT(EXIT_STDIN_BODY);
-+    }
-+
-     return buffer;
- }
-  

Modified: erlang/trunk/debian/patches/powerpc.patch
===================================================================
--- erlang/trunk/debian/patches/powerpc.patch	2013-09-03 12:07:05 UTC (rev 1536)
+++ erlang/trunk/debian/patches/powerpc.patch	2013-09-19 18:19:41 UTC (rev 1537)
@@ -2,9 +2,9 @@
 Description: Patch defines HiPE architecture ppc for powerpc arch.
 Last-Modified: Mon, 08 Mar 2010 12:23:16 +0300
 
---- erlang-16.b.1-dfsg.orig/erts/configure.in
-+++ erlang-16.b.1-dfsg/erts/configure.in
-@@ -617,6 +617,7 @@
+--- erlang-16.b.2-dfsg.orig/erts/configure.in
++++ erlang-16.b.2-dfsg/erts/configure.in
+@@ -625,6 +625,7 @@
      x86_64)	ARCH=amd64;;
      amd64)	ARCH=amd64;;
      macppc)	ARCH=ppc;;

Modified: erlang/trunk/debian/patches/rpath.patch
===================================================================
--- erlang/trunk/debian/patches/rpath.patch	2013-09-03 12:07:05 UTC (rev 1536)
+++ erlang/trunk/debian/patches/rpath.patch	2013-09-19 18:19:41 UTC (rev 1537)
@@ -4,9 +4,9 @@
 Forwarded: no
 Last-modified:Sat, 27 Feb 2010 09:34:43 +0300
 
---- erlang-16.b.1-dfsg.orig/erts/configure.in
-+++ erlang-16.b.1-dfsg/erts/configure.in
-@@ -4328,9 +4328,9 @@
+--- erlang-16.b.2-dfsg.orig/erts/configure.in
++++ erlang-16.b.2-dfsg/erts/configure.in
+@@ -4348,9 +4348,9 @@
  SSL_CC_RUNTIME_LIBRARY_PATH=
  SSL_LD_RUNTIME_LIBRARY_PATH=
  SSL_DED_LD_RUNTIME_LIBRARY_PATH=

Modified: erlang/trunk/debian/patches/series
===================================================================
--- erlang/trunk/debian/patches/series	2013-09-03 12:07:05 UTC (rev 1536)
+++ erlang/trunk/debian/patches/series	2013-09-19 18:19:41 UTC (rev 1537)
@@ -8,5 +8,3 @@
 java.patch
 hppa.patch
 powerpc.patch
-odbcserver.patch
-efile.patch

Modified: erlang/trunk/debian/patches/sparc.patch
===================================================================
--- erlang/trunk/debian/patches/sparc.patch	2013-09-03 12:07:05 UTC (rev 1536)
+++ erlang/trunk/debian/patches/sparc.patch	2013-09-19 18:19:41 UTC (rev 1537)
@@ -5,9 +5,9 @@
 
 (2) Fixes FTBFS(see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=328031).
 
---- erlang-16.b.1-dfsg.orig/erts/configure.in
-+++ erlang-16.b.1-dfsg/erts/configure.in
-@@ -606,7 +606,7 @@
+--- erlang-16.b.2-dfsg.orig/erts/configure.in
++++ erlang-16.b.2-dfsg/erts/configure.in
+@@ -614,7 +614,7 @@
  fi
  
  case $chk_arch_ in
@@ -16,8 +16,8 @@
      sparc64)	ARCH=sparc64;;
      sun4v)	ARCH=ultrasparc;;
      i86pc)	ARCH=x86;;
---- erlang-16.b.1-dfsg.orig/erts/emulator/beam/beam_emu.c
-+++ erlang-16.b.1-dfsg/erts/emulator/beam/beam_emu.c
+--- erlang-16.b.2-dfsg.orig/erts/emulator/beam/beam_emu.c
++++ erlang-16.b.2-dfsg/erts/emulator/beam/beam_emu.c
 @@ -967,16 +967,6 @@
   * in registers.
   */

Modified: erlang/trunk/debian/rules
===================================================================
--- erlang/trunk/debian/rules	2013-09-03 12:07:05 UTC (rev 1536)
+++ erlang/trunk/debian/rules	2013-09-19 18:19:41 UTC (rev 1537)
@@ -81,7 +81,7 @@
 	dh_testdir
 	dh_testroot
 	#
-	[ ! -f Makefile ] || ${MAKE} -j clean
+	[ ! -f Makefile ] || ${MAKE} -j 4 clean
 	rm -f lib/dialyzer/SKIP
 	#
 	# Remove installed erlang from debian/
@@ -172,7 +172,7 @@
 	#
 	echo "BUILDING HIPE VERSION (BUILD_HIPE: $(BUILD_HIPE))"
 	#
-	[ ! -f Makefile ] || ${MAKE} -j clean
+	[ ! -f Makefile ] || ${MAKE} -j 4 clean
 	rm -f lib/dialyzer/SKIP
 	#
 	CFLAGS="$(CFLAGS)" \
@@ -201,7 +201,7 @@
 	#
 	echo "BUILDING STANDARD VERSION (BUILD_HIPE: $(BUILD_HIPE))"
 	#
-	[ ! -f Makefile ] || ${MAKE} -j clean
+	[ ! -f Makefile ] || ${MAKE} -j 4 clean
 	rm -f lib/dialyzer/SKIP
 	#
 	CFLAGS="$(CFLAGS)" \
@@ -228,7 +228,7 @@
 	echo "*** do-install called for $(INSTALL_DIR)."
 
 	# Calls make install.
-	${MAKE} -j DESTDIR=$(INSTALL_DIR) TYPE=$(TYPE) install
+	${MAKE} -j 4 DESTDIR=$(INSTALL_DIR) TYPE=$(TYPE) install
 
 	# Replace ROOTDIR in "erl" and "start" scripts for real rootdir
 	# If there's no erl or start then it's better to fail than silently continue
@@ -287,7 +287,7 @@
 	target=$$(basename $$(find make -type d |grep /)) ; \
 	PATH=$(ROOT_DIR)/bin:$$PATH ; \
 	for m in lib/diameter lib/snmp lib/dialyzer lib/erl_interface lib/common_test lib/webtool erts ; do \
-	    ${MAKE} -j -C $$m/doc/src man ERL_TOP=$(ROOT_DIR) TARGET=$$target ; \
+	    ${MAKE} -j 4 -C $$m/doc/src man ERL_TOP=$(ROOT_DIR) TARGET=$$target ; \
 	done
 	#
 	install -d $(MAN_DIR)/man1 $(MAN_DIR)/man3 ; \
@@ -307,27 +307,27 @@
 build-hipe-stamp: configure-hipe-stamp
 	dh_testdir
 ifeq ($(findstring debug,$(DEB_BUILD_OPTIONS)),debug)
-	${MAKE} -j TYPE=$(TYPE) FLAVOR=smp GEN_OPT_FLGS="$(GEN_OPT_FLGS)" JAVA_OPTIONS="$(JAVA_OPTIONS)" emulator
-	${MAKE} -j TYPE=$(TYPE) FLAVOR=plain GEN_OPT_FLGS="$(GEN_OPT_FLGS)" JAVA_OPTIONS="$(JAVA_OPTIONS)" emulator
+	${MAKE} -j 4 TYPE=$(TYPE) FLAVOR=smp GEN_OPT_FLGS="$(GEN_OPT_FLGS)" JAVA_OPTIONS="$(JAVA_OPTIONS)" emulator
+	${MAKE} -j 4 TYPE=$(TYPE) FLAVOR=plain GEN_OPT_FLGS="$(GEN_OPT_FLGS)" JAVA_OPTIONS="$(JAVA_OPTIONS)" emulator
 endif
-	${MAKE} -j TYPE=$(TYPE) GEN_OPT_FLGS="$(GEN_OPT_FLGS)" JAVA_OPTIONS="$(JAVA_OPTIONS)"
+	${MAKE} -j 4 TYPE=$(TYPE) GEN_OPT_FLGS="$(GEN_OPT_FLGS)" JAVA_OPTIONS="$(JAVA_OPTIONS)"
 	touch build-hipe-stamp
 
 build-stnd: build-stnd-stamp
 build-stnd-stamp: configure-stnd-stamp
 	dh_testdir
 ifeq ($(findstring debug,$(DEB_BUILD_OPTIONS)),debug)
-	${MAKE} -j TYPE=$(TYPE) FLAVOR=smp GEN_OPT_FLGS="$(GEN_OPT_FLGS)" JAVA_OPTIONS="$(JAVA_OPTIONS)" emulator
-	${MAKE} -j TYPE=$(TYPE) FLAVOR=plain GEN_OPT_FLGS="$(GEN_OPT_FLGS)" JAVA_OPTIONS="$(JAVA_OPTIONS)" emulator
+	${MAKE} -j 4 TYPE=$(TYPE) FLAVOR=smp GEN_OPT_FLGS="$(GEN_OPT_FLGS)" JAVA_OPTIONS="$(JAVA_OPTIONS)" emulator
+	${MAKE} -j 4 TYPE=$(TYPE) FLAVOR=plain GEN_OPT_FLGS="$(GEN_OPT_FLGS)" JAVA_OPTIONS="$(JAVA_OPTIONS)" emulator
 endif
-	${MAKE} -j TYPE=$(TYPE) GEN_OPT_FLGS="$(GEN_OPT_FLGS)" JAVA_OPTIONS="$(JAVA_OPTIONS)"
+	${MAKE} -j 4 TYPE=$(TYPE) GEN_OPT_FLGS="$(GEN_OPT_FLGS)" JAVA_OPTIONS="$(JAVA_OPTIONS)"
 	touch build-stnd-stamp
 
 docs: docs-stamp
 docs-stamp: $(INSTALL_RULE)
 	dh_testdir
-	PATH=$(ROOT_DIR)/bin:$$PATH $(MAKE) -j docs
-	$(MAKE) -j DESTDIR=$(ROOT_DIR)/debian/erlang-docs install-docs
+	PATH=$(ROOT_DIR)/bin:$$PATH $(MAKE) -j 4 docs
+	$(MAKE) -j 4 DESTDIR=$(ROOT_DIR)/debian/erlang-docs install-docs
 	#
 	sh debian/scripts/fixmanpages $(MAN_DIR) 2
 	#
@@ -400,12 +400,7 @@
 	dh_testroot
 	dh_installdirs -i
 	dh_install -i --sourcedir=$(TMPINSTALL_DIR)
-	#
-	for pkg in examples ; do \
-	    install -D -m 644 debian/lintian/erlang-$$pkg.lintian-overrides \
-		$(ROOT_DIR)/debian/erlang-$$pkg/usr/share/lintian/overrides/erlang-$$pkg ; \
-	done
-	#
+	dh_lintian -i
 	dh_installdocs -i -A debian/README.Debian debian/TODO.Debian debian/AUTHORS
 	dh_installemacsen -i
 	dh_installexamples -i
@@ -439,11 +434,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 common-test debugger edoc erl-docgen gs observer percept pman tv wx ; do \
-	    install -D -m 644 debian/lintian/erlang-$$pkg.lintian-overrides \
-		$(ROOT_DIR)/debian/erlang-$$pkg/usr/share/lintian/overrides/erlang-$$pkg ; \
-	done
-	#
+	dh_lintian -a -Nerlang-base-hipe
 	dh_installdocs -a -Nerlang-base-hipe -A debian/README.Debian debian/TODO.Debian debian/AUTHORS
 	dh_installchangelogs -a -Nerlang-base-hipe
 	dh_installemacsen -a -Nerlang-base-hipe
@@ -469,16 +460,13 @@
 	dh_testroot
 	dh_installdirs -perlang-base-hipe
 	dh_install -perlang-base-hipe --sourcedir=debian/erlang-hipe
+	#
 	install -D -m 644 $(ROOT_DIR)/debian/erlang.xpm \
 		$(ROOT_DIR)/debian/erlang-base-hipe/usr/share/pixmaps/erlang.xpm
 	install -D -m 644 $(ROOT_DIR)/debian/erlang-base-hipe.desktop \
 		$(ROOT_DIR)/debian/erlang-base-hipe/usr/share/apps/konsole/erlang.desktop
 	#
-	for pkg in base-hipe ; do \
-	    install -D -m 644 debian/lintian/erlang-$$pkg.lintian-overrides \
-		$(ROOT_DIR)/debian/erlang-$$pkg/usr/share/lintian/overrides/erlang-$$pkg ; \
-	done
-	#
+	dh_lintian -perlang-base-hipe
 	dh_installdocs -perlang-base-hipe debian/README.Debian debian/TODO.Debian debian/AUTHORS
 	dh_installchangelogs -perlang-base-hipe
 	dh_installemacsen -perlang-base-hipe
@@ -499,9 +487,9 @@
 
 binary: binary-indep binary-arch
 
-REL=R16B01
-RELDIR=R16B01
-DEB_REL=16.b.1-dfsg
+REL=R16B02
+RELDIR=R16B02
+DEB_REL=16.b.2-dfsg
 
 get-orig-source:
 	CURDIR=`pwd` && TMPDIR=`mktemp -d /tmp/erlang.XXXXXX` && \




More information about the Pkg-erlang-commits mailing list