Merge branch 'release' of https://github.com/Pulse-Eight/libcec into upstream

Signed-off-by: Jérôme Benoit <jerome.benoit@piment-noir.org>
Conflicts:
	debian/changelog
	debian/libcec-get-orig-source
	debian/rules

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..6336858
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,117 @@
+/build
+/.cproject
+/.project
+/.settings
+*.dll
+*.exe
+*.exp
+*.ilk
+*.lib
+*.manifest
+*.metagen
+*.ncb
+*.opensdf
+*.pdb
+*.suo
+*.user
+*.aps
+
+*~
+
+/support/private
+
+/driver/p8usb-cec.cat
+/bootloader-driver/p8_usb_dfu.cat
+
+aclocal.m4
+autom4te.cache
+config.guess
+config.log
+config.status
+config.sub
+depcomp
+configure
+install-sh
+INSTALL
+libtool
+ltmain.sh
+Makefile
+Makefile.in
+missing
+config.h
+config.h.in
+config.h.in~
+stamp-h1
+
+/debian/*.log
+/debian/*.substvars
+/debian/*.debhelper
+/debian/files
+/debian/cec-utils
+/debian/libcec-dev
+/debian/libcec
+/debian/libcec2
+/debian/tmp
+
+include/boost
+
+project/bin
+project/Debug/
+project/*.exe
+project/Release/
+project/ipch/
+project/libcec.sdf
+project/obj
+project/Properties
+project/_*
+project/x64
+project/LibCecSharp/x64
+project/LibCecSharp/Debug
+project/LibCecSharp/Release
+project/libcec/x64
+project/libcec/Debug
+project/libcec/Release
+project/testclient/x64
+project/testclient/Debug
+project/testclient/Release
+
+project/RPi/toolchain
+project/RPi/firmware
+project/RPi/deps
+
+src/lib/.deps
+src/lib/.libs
+src/lib/*.a
+src/lib/*.la
+src/lib/*.lo
+src/lib/*.o
+src/lib/*.P
+src/lib/libcec.pc
+src/lib/Makefile
+src/lib/Makefile.in
+
+src/lib/util/*.d
+src/lib/util/*.o
+src/lib/util/*.a
+src/lib/util/*.P
+
+src/testclient/.deps
+src/testclient/.libs
+src/testclient/cec-client
+src/testclient/*.o
+
+src/CecSharpTester/bin
+src/CecSharpTester/obj
+
+src/cec-config-gui/obj
+src/cec-config/cec-config
+src/cec-config/*.o
+src/cec-config/.deps
+
+src/libcec-wmc/bin
+src/libcec-wmc/obj
+
+/dpinst-x86.exe
+/dpinst-amd64.exe
+
+/documentation

diff --git a/debian/changelog b/debian/changelog
index 4635db9fd78beec6ca6c49b08a86f85ca7c658e6..862c347b339b459867e8d5d7049d59c1ba94dd8a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,20 +1,28 @@
-libcec (2.2.0-2~trusty) trusty; urgency=low
+libcec (2.2.0-1) unstable; urgency=low
 
-  * Fix a build option for exynos support
-
- -- Piment Noir Packaging <contact@piment-noir.org>  Mon, 10 Nov 2014 18:44:00 +0100
-
-libcec (2.2.0-1~trusty) trusty; urgency=medium
+  * changed / added:
+    * read the physical address from X11 randr extension. credits: @smithereens
+    * support for Exynos HDMI. credits: @vamanea
+    * another vendor ID for Harman/Kardon. credits: @ksooo
+    * some 1.4 keycodes have been added. credits: @ksooo
+    * cec-client: fix typo prevent keycodes to be passed. credits: @popcornmix
 
-  * Build version 2.2.0 for Ubuntu 'trusty'
+  * fixed:
+    * various Raspberry Pi fixes. credits: @mk01
+    * vendor specific handlers weren't used for Toshiba and Onkyo.
+      credits: @ksooo
+    * LibCecTray: keypress not sent when multiple instances of eshell.exe are
+      running. thanks @pvanbaren
+    * deadlock on exit in XBMC, because of CEC_ALERT_CONNECTION_LOST
 
- -- Piment Noir Packaging <contact@piment-noir.org>  Mon, 10 Nov 2014 17:15:00 +0100
+ -- Pulse-Eight Packaging <packaging@pulse-eight.com>  Tue, 28 Oct 2014 10:45:00 +0200
 
-libcec (2.1.4-4~trusty) trusty; urgency=low
+libcec (2.1.4-2) unstable; urgency=low
 
-  * Build for Ubuntu 'trusty'
+  * fixed:
+    * OS X build
 
- -- Pulse-Eight Packaging <packaging@pulse-eight.com>  Sat, 14 Dec 2013 01:02:43 +0100
+ -- Pulse-Eight Packaging <packaging@pulse-eight.com>  Wed, 18 Dec 2013 02:14:00 +0100
 
 libcec (2.1.4-1) unstable; urgency=low
 
@@ -128,7 +136,7 @@ libcec (2.1.1-1) unstable; urgency=low
 
  -- Pulse-Eight Packaging <packaging@pulse-eight.com>  Fri, 8 Mar 2013 17:21:00 +0100
  
-libcec (2.1.0-1) unstable; urgency=low
+ libcec (2.1.0-1) unstable; urgency=low
 
   * changed / added:
     * added vendor id for Denon

diff --git a/debian/libcec-get-orig-source b/debian/libcec-get-orig-source
index 24fcb227a2699e440072ad1e57ab6d1bd7d8ea9b..a17a7d31f9626dba03f846c730404420dc312bea 100755 (executable)
--- a/debian/libcec-get-orig-source
+++ b/debian/libcec-get-orig-source
@@ -4,7 +4,7 @@
 
 LIBCEC_GIT_URL="git://github.com/Pulse-Eight/libcec.git"
 LIBCEC_GIT_BRANCH="release"
-LIBCEC_VERSION="2.2.0"
+LIBCEC_VERSION="1.6.1"
 
 rm -rf "libcec-${LIBCEC_VERSION}"
 git clone "$LIBCEC_GIT_URL" "libcec-${LIBCEC_VERSION}"

diff --git a/debian/rules b/debian/rules
index e128074b76de03452c916ba3328306c47e925aa6..b4bd2b63b263b836b4388cd0d9c4ed9bc150a258 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -6,5 +6,3 @@
 %:
        dh  $@ --parallel
 
-override_dh_auto_configure:
-       dh_auto_configure -- --enable-exynos