More ARM portage work.

Signed-off-by: Jérôme Benoit <jerome.benoit@piment-noir.org>

diff --git a/debian/changelog b/debian/changelog
index cf4aaf1792f34b2870e04a0fc9c1c124aa5a6e61..4d774bb230a1693f4a65440c90881595eddacd9f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+265 (1.4+222+hg5f9f7194267b-1~trusty1) trusty; urgency=low
+
+  * ARMv7 portage
+
+ -- Jérôme Benoit <jerome.benoit@piment-noir.org>  Wed, 14 Jan 2015 20:25:00 +0100
+
 x265 (1.4+222+hg5f9f7194267b-1~trusty) trusty; urgency=low
 
   * Current snapshot

diff --git a/debian/control b/debian/control
index 0b09e9f3d121c6f376e1e780e768878d11b2fcbc..a9e28e15f64a75a348a1d857656094bca207d899 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Description: H.265/HEVC video encoder - frontend binary
  library for encoding video using the High
  Efficiency Video Coding (HEVC/H.265) standard.
 
-Package: libx265-39
+Package: libx265-40
 Architecture: any
 Pre-Depends:
  ${misc:Pre-Depends}
@@ -37,13 +37,13 @@ Architecture: any
 Section: libdevel
 Depends:
  ${misc:Depends},
- libx265-39 (= ${binary:Version})
+ libx265-40 (= ${binary:Version})
 Description: H.265/HEVC video encoder - development files
  library for encoding video using the High
  Efficiency Video Coding (HEVC/H.265) standard.
  .
  This package contains the static library and
- headers used to build programs that use libx265-39.
+ headers used to build programs that use libx265-40.
 
 Package: x265-doc
 Architecture: all
@@ -65,7 +65,7 @@ Priority: extra
 Depends:
  ${misc:Depends},
  x265 (= ${binary:Version}),
- libx265-39 (= ${binary:Version})
+ libx265-40 (= ${binary:Version})
 Description: debugging symbols for x265 and libx265
  library for encoding video using the High
  Efficiency Video Coding (HEVC/H.265) standard.

diff --git a/debian/rules b/debian/rules
index 30cd9d127e8524951d0ae0e5fe8fdb306b380382..b79cb8ff94ef770bfeaef0eedd1b4e86969f5355 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -59,8 +59,10 @@ override_dh_auto_build:
 # build documentation
        $(MAKE) -C doc/reST pickle html man
 
+ifneq (arm, $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)) 
 override_dh_auto_test:
        $(builddir)/test/TestBench
+endif
 
 override_dh_install:
        dh_install --list-missing --sourcedir=$(CURDIR)/debian/install