From 65c3ddc5b7e1fad19cd54e456f94758ec4880ea1 Mon Sep 17 00:00:00 2001 From: Antonio Ospite Date: Thu, 15 May 2014 15:37:32 +0200 Subject: [PATCH 01/16] debian/control: rename the libam7xxx-bin package to libam7xxx0.1-bin This fixes a lintian error: E: libam7xxx source: version-substvar-for-external-package libam7xxx0.1 -> libam7xxx0.1-bin --- debian/control | 2 +- debian/libam7xxx-bin.install | 1 - debian/libam7xxx-bin.manpages | 1 - debian/libam7xxx0.1-bin.install | 1 + debian/libam7xxx0.1-bin.manpages | 1 + 5 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 debian/libam7xxx-bin.install delete mode 100644 debian/libam7xxx-bin.manpages create mode 100644 debian/libam7xxx0.1-bin.install create mode 100644 debian/libam7xxx0.1-bin.manpages diff --git a/debian/control b/debian/control index 3d1de06..744d223 100644 --- a/debian/control +++ b/debian/control @@ -85,7 +85,7 @@ Description: library for accessing am7xxx based devices -- development files This is the development package containing the libraries and header for software development with libam7xxx. -Package: libam7xxx-bin +Package: libam7xxx0.1-bin Section: utils Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} diff --git a/debian/libam7xxx-bin.install b/debian/libam7xxx-bin.install deleted file mode 100644 index 1df36c6..0000000 --- a/debian/libam7xxx-bin.install +++ /dev/null @@ -1 +0,0 @@ -usr/bin/* diff --git a/debian/libam7xxx-bin.manpages b/debian/libam7xxx-bin.manpages deleted file mode 100644 index 4450a71..0000000 --- a/debian/libam7xxx-bin.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/share/man/man1/*.1 diff --git a/debian/libam7xxx0.1-bin.install b/debian/libam7xxx0.1-bin.install new file mode 100644 index 0000000..1df36c6 --- /dev/null +++ b/debian/libam7xxx0.1-bin.install @@ -0,0 +1 @@ +usr/bin/* diff --git a/debian/libam7xxx0.1-bin.manpages b/debian/libam7xxx0.1-bin.manpages new file mode 100644 index 0000000..4450a71 --- /dev/null +++ b/debian/libam7xxx0.1-bin.manpages @@ -0,0 +1 @@ +debian/tmp/usr/share/man/man1/*.1 -- 2.1.4 From af06e1791ebac515ead762e785aea796ef356f1e Mon Sep 17 00:00:00 2001 From: Antonio Ospite Date: Thu, 15 May 2014 13:03:44 +0200 Subject: [PATCH 02/16] debian/patches: drop all patches Some patches were fixes from upstream which are now in the orig codebase. Some other patches were reverts of upstream commits needed to build with older libav and libusb versions shipped in Debian distributions, drop these as well as they are not needed anymore to build the package in Unstable; possibly they can come back in a backport branch if needed. --- ...7xxx-play-switch-to-avcodec_encode_video2.patch | 101 --------------------- ...-quirks-for-Philips-Sagemcom-PicoPix-2055.patch | 34 ------- ...txt-define-DEBUG-1-only-when-CMAKE_BUILD_.patch | 46 ---------- ...xx-use-the-symbolic-constant-for-libusb-l.patch | 30 ------ debian/patches/series | 4 - 5 files changed, 215 deletions(-) delete mode 100644 debian/patches/0001-Revert-am7xxx-play-switch-to-avcodec_encode_video2.patch delete mode 100644 debian/patches/0002-am7xxx-add-quirks-for-Philips-Sagemcom-PicoPix-2055.patch delete mode 100644 debian/patches/0003-CMakeLists.txt-define-DEBUG-1-only-when-CMAKE_BUILD_.patch delete mode 100644 debian/patches/0004-Revert-am7xxx-use-the-symbolic-constant-for-libusb-l.patch delete mode 100644 debian/patches/series diff --git a/debian/patches/0001-Revert-am7xxx-play-switch-to-avcodec_encode_video2.patch b/debian/patches/0001-Revert-am7xxx-play-switch-to-avcodec_encode_video2.patch deleted file mode 100644 index 9310ec0..0000000 --- a/debian/patches/0001-Revert-am7xxx-play-switch-to-avcodec_encode_video2.patch +++ /dev/null @@ -1,101 +0,0 @@ -From 25fee52c64caa7230a3c2b03467114e0c84fee67 Mon Sep 17 00:00:00 2001 -From: Antonio Ospite -Date: Sun, 28 Jul 2013 19:35:41 +0200 -Subject: [PATCH] Revert "am7xxx-play: switch to avcodec_encode_video2()" -X-Face: z*RaLf`X<@C75u6Ig9}{oW$H;1_\2t5)({*|jhM/Vb;]yA5\I~93>J<_`<4)A{':UrE - -This reverts commit b344c71f3e03f912d8b6ee7d96cdd67b31cdf8cc. - -avcodec_encode_video2() has been introduced in lavc 54.01.0 but Debian Wheezy -ships with lavc 53, so for now we should revert this change for the Debian -packages. - -When this patch will be dropped maybe the package should depend on -libavcodec54 as the old API may be disabled in the Debian packages. ---- - examples/am7xxx-play.c | 29 +++++++++-------------------- - 1 file changed, 9 insertions(+), 20 deletions(-) - -diff --git a/examples/am7xxx-play.c b/examples/am7xxx-play.c -index 3230e67..37d1191 100644 ---- a/examples/am7xxx-play.c -+++ b/examples/am7xxx-play.c -@@ -285,12 +285,9 @@ static int am7xxx_play(const char *input_format_string, - int out_buf_size; - uint8_t *out_buf; - int out_picture_size; -- uint8_t *out_picture; - struct SwsContext *sw_scale_ctx; - AVPacket in_packet; -- AVPacket out_packet; - int got_picture; -- int got_packet; - int ret; - - ret = video_input_init(&input_ctx, input_format_string, input_path, input_options); -@@ -393,26 +390,20 @@ static int am7xxx_play(const char *input_format_string, - picture_scaled->linesize); - - if (output_ctx.raw_output) { -- out_picture = out_buf; - out_picture_size = out_buf_size; - } else { - picture_scaled->quality = (output_ctx.codec_ctx)->global_quality; -- av_init_packet(&out_packet); -- out_packet.data = NULL; -- out_packet.size = 0; -- got_packet = 0; -- ret = avcodec_encode_video2(output_ctx.codec_ctx, -- &out_packet, -- picture_scaled, -- &got_packet); -- if (ret < 0 || !got_packet) { -+ /* TODO: switch to avcodec_encode_video2() eventually */ -+ out_picture_size = avcodec_encode_video(output_ctx.codec_ctx, -+ out_buf, -+ out_buf_size, -+ picture_scaled); -+ if (out_picture_size < 0) { - fprintf(stderr, "cannot encode video\n"); -+ ret = out_picture_size; - run = 0; - goto end_while; - } -- -- out_picture = out_packet.data; -- out_picture_size = out_packet.size; - } - - #ifdef DEBUG -@@ -423,7 +414,7 @@ static int am7xxx_play(const char *input_format_string, - else - snprintf(filename, NAME_MAX, "out.raw"); - file = fopen(filename, "wb"); -- fwrite(out_picture, 1, out_picture_size, file); -+ fwrite(out_buf, 1, out_picture_size, file); - fclose(file); - #endif - -@@ -431,7 +422,7 @@ static int am7xxx_play(const char *input_format_string, - image_format, - (output_ctx.codec_ctx)->width, - (output_ctx.codec_ctx)->height, -- out_picture, -+ out_buf, - out_picture_size); - if (ret < 0) { - perror("am7xxx_send_image"); -@@ -440,8 +431,6 @@ static int am7xxx_play(const char *input_format_string, - } - } - end_while: -- if (!output_ctx.raw_output && got_packet) -- av_free_packet(&out_packet); - av_free_packet(&in_packet); - } - --- -1.8.3.2 - diff --git a/debian/patches/0002-am7xxx-add-quirks-for-Philips-Sagemcom-PicoPix-2055.patch b/debian/patches/0002-am7xxx-add-quirks-for-Philips-Sagemcom-PicoPix-2055.patch deleted file mode 100644 index 53cdaf4..0000000 --- a/debian/patches/0002-am7xxx-add-quirks-for-Philips-Sagemcom-PicoPix-2055.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 03231a2b8d29e8cef1628cb25335f9583f067496 Mon Sep 17 00:00:00 2001 -From: Antonio Ospite -Date: Sat, 3 Aug 2013 15:14:34 +0200 -Subject: [PATCH] am7xxx: add quirks for Philips/Sagemcom PicoPix 2055 -X-Face: z*RaLf`X<@C75u6Ig9}{oW$H;1_\2t5)({*|jhM/Vb;]yA5\I~93>J<_`<4)A{':UrE - -The Philips/Sagemcom PicoPix 2055 does not support some operations: - - setting the power mode confuses the firmware - - setting the zoom mode has no effect whatsoever - -Disable these operations. - -Thanks-to: Luca Bompani ---- - src/am7xxx.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/am7xxx.c b/src/am7xxx.c -index 5b1e35a..b66a4ee 100644 ---- a/src/am7xxx.c -+++ b/src/am7xxx.c -@@ -111,6 +111,7 @@ static const struct am7xxx_usb_device_descriptor supported_devices[] = { - .product_id = 0x0016, - .configuration = 2, - .interface_number = 0, -+ .quirks = AM7XXX_QUIRK_NO_POWER_MODE | AM7XXX_QUIRK_NO_ZOOM_MODE, - }, - { - .name = "Philips/Sagemcom PicoPix 2330", --- -1.8.4.rc1 - diff --git a/debian/patches/0003-CMakeLists.txt-define-DEBUG-1-only-when-CMAKE_BUILD_.patch b/debian/patches/0003-CMakeLists.txt-define-DEBUG-1-only-when-CMAKE_BUILD_.patch deleted file mode 100644 index 9ba2b6c..0000000 --- a/debian/patches/0003-CMakeLists.txt-define-DEBUG-1-only-when-CMAKE_BUILD_.patch +++ /dev/null @@ -1,46 +0,0 @@ -From f3b176f27268e13942f452e915171b9c8b34f6ce Mon Sep 17 00:00:00 2001 -From: Antonio Ospite -Date: Wed, 30 Oct 2013 10:41:06 +0100 -Subject: [PATCH] CMakeLists.txt: define DEBUG=1 only when - CMAKE_BUILD_TYPE=Debug -X-Face: z*RaLf`X<@C75u6Ig9}{oW$H;1_\2t5)({*|jhM/Vb;]yA5\I~93>J<_`<4)A{':UrE - -When building with CMAKE_BUILD_TYPE=RelWithDebInfo the development debug -code should not be enabled, so don't define DEBUG=1 in DEBUG_FLAGS as -this will end up being both in CMAKE_C_FLAGS_DEBUG and -CMAKE_C_FLAGS_RELWITHDEBINFO. - -Instead define DEBUG=1 only for CMAKE_C_FLAGS_DEBUG so it gets used only -when CMAKE_BUILD_TYPE=Debug. ---- - CMakeLists.txt | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d643ed9..fa111c9 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -69,8 +69,7 @@ if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_CLANG) - -fstack-protector) - - add_flags(DEBUG_FLAGS -- -ggdb -- -DDEBUG=1) -+ -ggdb) - - add_flags(RELEASE_FLAGS - -Wp,-D_FORTIFY_SOURCE=2) -@@ -105,7 +104,7 @@ if (CMAKE_COMPILER_IS_CLANG) - endif() - endif() - --set(CMAKE_C_FLAGS_DEBUG "-O0 ${DEBUG_FLAGS} ${STRICT_FLAGS}") -+set(CMAKE_C_FLAGS_DEBUG "-O0 -DDEBUG=1 ${DEBUG_FLAGS} ${STRICT_FLAGS}") - set(CMAKE_C_FLAGS_RELEASE "-O2 ${RELEASE_FLAGS} ${STRICT_FLAGS}") - set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 ${RELEASE_FLAGS} ${DEBUG_FLAGS} ${STRICT_FLAGS}") - --- -1.8.4.rc3 - diff --git a/debian/patches/0004-Revert-am7xxx-use-the-symbolic-constant-for-libusb-l.patch b/debian/patches/0004-Revert-am7xxx-use-the-symbolic-constant-for-libusb-l.patch deleted file mode 100644 index 18c507f..0000000 --- a/debian/patches/0004-Revert-am7xxx-use-the-symbolic-constant-for-libusb-l.patch +++ /dev/null @@ -1,30 +0,0 @@ -From d33f5f7c7ff7087188054de13d47d6b9ba525804 Mon Sep 17 00:00:00 2001 -From: Antonio Ospite -Date: Sun, 5 Jan 2014 08:30:03 +0100 -Subject: [PATCH] Revert "am7xxx: use the symbolic constant for libusb log - level" -X-Face: z*RaLf`X<@C75u6Ig9}{oW$H;1_\2t5)({*|jhM/Vb;]yA5\I~93>J<_`<4)A{':UrE - -This reverts commit 6d960cf72946c2f05d60dfcf8fb21efbdb69c9c7. ---- - src/am7xxx.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/am7xxx.c b/src/am7xxx.c -index 4ac2461..5b25e96 100644 ---- a/src/am7xxx.c -+++ b/src/am7xxx.c -@@ -982,7 +982,7 @@ AM7XXX_PUBLIC int am7xxx_init(am7xxx_context **ctx) - if (ret < 0) - goto out_free_context; - -- libusb_set_debug((*ctx)->usb_context, LIBUSB_LOG_LEVEL_INFO); -+ libusb_set_debug((*ctx)->usb_context, 3); - - ret = scan_devices(*ctx, SCAN_OP_BUILD_DEVLIST , 0, NULL); - if (ret < 0) { --- -1.8.5.2 - diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 277215d..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,4 +0,0 @@ -0001-Revert-am7xxx-play-switch-to-avcodec_encode_video2.patch -0002-am7xxx-add-quirks-for-Philips-Sagemcom-PicoPix-2055.patch -0003-CMakeLists.txt-define-DEBUG-1-only-when-CMAKE_BUILD_.patch -0004-Revert-am7xxx-use-the-symbolic-constant-for-libusb-l.patch -- 2.1.4 From e3696bbced0060abe8c156229cabacc61913ffbb Mon Sep 17 00:00:00 2001 From: Antonio Ospite Date: Thu, 15 May 2014 16:45:11 +0200 Subject: [PATCH 03/16] debian/watch: detect new versions from gitweb --- debian/watch | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/watch b/debian/watch index 0f44399..02da243 100644 --- a/debian/watch +++ b/debian/watch @@ -1 +1,5 @@ -#git=git://git.ao2.it/libam7xxx.git +version=3 + +opts=downloadurlmangle=s/shortlog\/refs\/tags\/(v[\d\.]+)/snapshot\/$1.tar.gz/,\ +filenamemangle=s/.*v([\d\.]+)$/libam7xxx-$1.tar.gz/ \ + http://git.ao2.it/libam7xxx.git/tags ^.*v([\d\.]+) -- 2.1.4 From 9b71d83540172b3f5aae722f8ea40cae31105fca Mon Sep 17 00:00:00 2001 From: Antonio Ospite Date: Thu, 15 May 2014 16:54:31 +0200 Subject: [PATCH 04/16] debian/control: fix installation over old versions --- debian/control | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/debian/control b/debian/control index 744d223..4aecea9 100644 --- a/debian/control +++ b/debian/control @@ -89,6 +89,8 @@ Package: libam7xxx0.1-bin Section: utils Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} +Conflicts: libam7xxx-bin +Replaces: libam7xxx-bin Description: library for accessing am7xxx devices -- utilities and samples libam7xxx is an Open Source library to communicate via USB with projectors and Digital Picture Frames based on the Actions Micro AM7XXX family if ICs. @@ -113,6 +115,8 @@ Package: libam7xxx0.1-doc Section: doc Architecture: all Depends: ${misc:Depends} +Conflicts: libam7xxx-doc +Replaces: libam7xxx-doc Description: library for accessing am7xxx devices -- documentation libam7xxx is an Open Source library to communicate via USB with projectors and Digital Picture Frames based on the Actions Micro AM7XXX family if ICs. -- 2.1.4 From 39aa5c0234f088cc4649fb09b64d386ae4dda1d5 Mon Sep 17 00:00:00 2001 From: Antonio Ospite Date: Thu, 15 May 2014 17:59:15 +0200 Subject: [PATCH 05/16] debian/control: use a single dash in short descriptions Some packages use two dashes to separate the generic description from the package specific one, but the majority of packages use only one. --- debian/control | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/control b/debian/control index 4aecea9..40c4d37 100644 --- a/debian/control +++ b/debian/control @@ -64,7 +64,7 @@ Package: libam7xxx-dev Architecture: any Depends: ${misc:Depends}, libam7xxx0.1 (= ${binary:Version}) Recommends: libam7xxx0.1-doc (= ${source:Version}) -Description: library for accessing am7xxx based devices -- development files +Description: library for accessing am7xxx based devices - development files libam7xxx is an Open Source library to communicate via USB with projectors and Digital Picture Frames based on the Actions Micro AM7XXX family if ICs. . @@ -91,7 +91,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: libam7xxx-bin Replaces: libam7xxx-bin -Description: library for accessing am7xxx devices -- utilities and samples +Description: library for accessing am7xxx devices - utilities and samples libam7xxx is an Open Source library to communicate via USB with projectors and Digital Picture Frames based on the Actions Micro AM7XXX family if ICs. . @@ -117,7 +117,7 @@ Architecture: all Depends: ${misc:Depends} Conflicts: libam7xxx-doc Replaces: libam7xxx-doc -Description: library for accessing am7xxx devices -- documentation +Description: library for accessing am7xxx devices - documentation libam7xxx is an Open Source library to communicate via USB with projectors and Digital Picture Frames based on the Actions Micro AM7XXX family if ICs. . -- 2.1.4 From 380f77cfcddd821b4c0a11d25eee4a4272880b9b Mon Sep 17 00:00:00 2001 From: Antonio Ospite Date: Thu, 15 May 2014 18:08:00 +0200 Subject: [PATCH 06/16] debian/control: fix cme warnings "Synopsis is too long." --- debian/control | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 40c4d37..af16a37 100644 --- a/debian/control +++ b/debian/control @@ -64,7 +64,7 @@ Package: libam7xxx-dev Architecture: any Depends: ${misc:Depends}, libam7xxx0.1 (= ${binary:Version}) Recommends: libam7xxx0.1-doc (= ${source:Version}) -Description: library for accessing am7xxx based devices - development files +Description: library for accessing am7xxx devices - development files libam7xxx is an Open Source library to communicate via USB with projectors and Digital Picture Frames based on the Actions Micro AM7XXX family if ICs. . @@ -91,7 +91,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: libam7xxx-bin Replaces: libam7xxx-bin -Description: library for accessing am7xxx devices - utilities and samples +Description: library for accessing am7xxx devices - utilities libam7xxx is an Open Source library to communicate via USB with projectors and Digital Picture Frames based on the Actions Micro AM7XXX family if ICs. . -- 2.1.4 From 9f03eb8bcf8b0e1991107d4dfec5363c64d011b4 Mon Sep 17 00:00:00 2001 From: Antonio Ospite Date: Thu, 15 May 2014 18:10:02 +0200 Subject: [PATCH 07/16] debian/changelog: release package version 0.1.5-1 Git-Dch: ignore --- debian/changelog | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index c9571fb..6126a51 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,19 @@ -libam7xxx (0.1.5-1) UNRELEASED; urgency=medium +libam7xxx (0.1.5-1) unstable; urgency=medium * New upstream release - - -- Antonio Ospite Thu, 15 May 2014 12:51:33 +0200 + * debian/control: update Maintainer email address + * debian/copyright: update contact info and copyright years + * debian/rules: install the NEWS file as the upstream changelog + * debian/control: rename the libam7xxx-doc package to libam7xxx0.1-doc + * debian/libam7xxx0.1-doc.lintian-overrides: update overrides + * debian/control: rename the libam7xxx-bin package to libam7xxx0.1-bin + * debian/patches: drop all patches + * debian/watch: detect new versions from gitweb + * debian/control: fix installation over old versions + * debian/control: use a single dash in short descriptions + * debian/control: fix cme warnings "Synopsis is too long." + + -- Antonio Ospite Thu, 15 May 2014 18:09:09 +0200 libam7xxx (0.1.4-3) unstable; urgency=medium -- 2.1.4 From 6f9d16908d282025245637a1234e73f33c89c7f9 Mon Sep 17 00:00:00 2001 From: Antonio Ospite Date: Mon, 7 Jul 2014 14:25:45 +0200 Subject: [PATCH 08/16] debian/gbp.conf: fix typo s/prinstine-tar/pristine-tar/g --- debian/gbp.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/gbp.conf b/debian/gbp.conf index 17033f3..7ac6ffb 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -2,4 +2,4 @@ debian-branch = debian upstream-branch = master upstream-tag = v%(version)s -prinstine-tar = False +pristine-tar = False -- 2.1.4 From e16cccdb1b91761a6821e8ad0b80583ef5340054 Mon Sep 17 00:00:00 2001 From: Antonio Ospite Date: Mon, 7 Jul 2014 15:25:13 +0200 Subject: [PATCH 09/16] debian/libam7xxx0.1-doc.lintian-overrides: update one override --- debian/libam7xxx0.1-doc.lintian-overrides | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/libam7xxx0.1-doc.lintian-overrides b/debian/libam7xxx0.1-doc.lintian-overrides index 38d8fb7..f3f5ea3 100644 --- a/debian/libam7xxx0.1-doc.lintian-overrides +++ b/debian/libam7xxx0.1-doc.lintian-overrides @@ -6,4 +6,4 @@ libam7xxx0.1-doc: duplicate-files usr/share/doc/libam7xxx0.1-doc/html/ftv2plastn libam7xxx0.1-doc: duplicate-files usr/share/doc/libam7xxx0.1-doc/html/ftv2mlastnode.png usr/share/doc/libam7xxx0.1-doc/html/ftv2mnode.png libam7xxx0.1-doc: duplicate-files usr/share/doc/libam7xxx0.1-doc/html/search/all_1.js usr/share/doc/libam7xxx0.1-doc/html/search/pages_0.js libam7xxx0.1-doc: duplicate-files usr/share/doc/libam7xxx0.1-doc/html/search/all_2.js usr/share/doc/libam7xxx0.1-doc/html/search/variables_0.js -libam7xxx0.1-doc: embedded-javascript-library usr/share/doc/libam7xxx0.1-doc/html/jquery.js +libam7xxx0.1-doc: embedded-javascript-library usr/share/doc/libam7xxx0.1-doc/html/jquery.js please use libjs-jquery -- 2.1.4 From 8d77bcab58f457b2829a111401cd052eb2d802e4 Mon Sep 17 00:00:00 2001 From: Antonio Ospite Date: Mon, 7 Jul 2014 15:56:39 +0200 Subject: [PATCH 10/16] debian/patches: add a patch to fix the license of the example programs --- ...e-examples-were-always-meant-to-be-all-un.patch | 43 ++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 44 insertions(+) create mode 100644 debian/patches/examples-the-examples-were-always-meant-to-be-all-un.patch create mode 100644 debian/patches/series diff --git a/debian/patches/examples-the-examples-were-always-meant-to-be-all-un.patch b/debian/patches/examples-the-examples-were-always-meant-to-be-all-un.patch new file mode 100644 index 0000000..11ca605 --- /dev/null +++ b/debian/patches/examples-the-examples-were-always-meant-to-be-all-un.patch @@ -0,0 +1,43 @@ +From e92eacd8960854b239d698bf05b97f6089a478c6 Mon Sep 17 00:00:00 2001 +From: Antonio Ospite +Date: Mon, 7 Jul 2014 15:53:22 +0200 +Subject: [PATCH] examples: the examples were always meant to be all under + GPL-3+ +X-Face: z*RaLf`X<@C75u6Ig9}{oW$H;1_\2t5)({*|jhM/Vb;]yA5\I~93>J<_`<4)A{':UrE + +--- + examples/am7xxx-modeswitch.c | 2 +- + examples/picoproj.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/examples/am7xxx-modeswitch.c b/examples/am7xxx-modeswitch.c +index a66c37d..bba3f3c 100644 +--- a/examples/am7xxx-modeswitch.c ++++ b/examples/am7xxx-modeswitch.c +@@ -4,7 +4,7 @@ + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by +- * the Free Software Foundation, either version 2 of the License, or ++ * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, +diff --git a/examples/picoproj.c b/examples/picoproj.c +index d335ed1..2069799 100644 +--- a/examples/picoproj.c ++++ b/examples/picoproj.c +@@ -4,7 +4,7 @@ + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by +- * the Free Software Foundation, either version 2 of the License, or ++ * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, +-- +2.0.1 + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..884d232 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +examples-the-examples-were-always-meant-to-be-all-un.patch -- 2.1.4 From 360ac6d1605faded2029446575035ee97562fa82 Mon Sep 17 00:00:00 2001 From: Antonio Ospite Date: Mon, 7 Jul 2014 16:41:15 +0200 Subject: [PATCH 11/16] debian/copyright: document the license of some scripts from contrib/ --- debian/copyright | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/debian/copyright b/debian/copyright index 86417ba..ee15758 100644 --- a/debian/copyright +++ b/debian/copyright @@ -25,6 +25,10 @@ Files: examples/* Copyright: 2012-2014, Antonio Ospite License: GPL-3+ +Files: contrib/*.sh +Copyright: 2012-2014, Antonio Ospite +License: WTFPL-2 + License: GPL-2+ This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -86,3 +90,18 @@ License: BSD-3+CMAKE ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +License: WTFPL-2 + DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE + Version 2, December 2004 + . + Copyright (C) 2004 Sam Hocevar + . + Everyone is permitted to copy and distribute verbatim or modified + copies of this license document, and changing it is allowed as long + as the name is changed. + . + DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + . + 0. You just DO WHAT THE FUCK YOU WANT TO. -- 2.1.4 From 08aaf914b8fa75d232e594bd6b44ad4cb594c226 Mon Sep 17 00:00:00 2001 From: Antonio Ospite Date: Mon, 7 Jul 2014 16:41:55 +0200 Subject: [PATCH 12/16] debian/libam7xxx0.1-bin.install: distribute some files from contrib/ --- debian/libam7xxx0.1-bin.install | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/libam7xxx0.1-bin.install b/debian/libam7xxx0.1-bin.install index 1df36c6..0781138 100644 --- a/debian/libam7xxx0.1-bin.install +++ b/debian/libam7xxx0.1-bin.install @@ -1 +1,2 @@ usr/bin/* +contrib/50-am7xxx_mode_switch.rules contrib/99-am7xxx-autodisplay.rules contrib/*.sh usr/share/doc/libam7xxx0.1-bin/contrib -- 2.1.4 From a3d81092461da2c85acdecdb63db4a9c2da031f1 Mon Sep 17 00:00:00 2001 From: Antonio Ospite Date: Mon, 7 Jul 2014 17:54:54 +0200 Subject: [PATCH 13/16] debian/libam7xxx0.1-doc.examples: move the C example programs to libam7xxx-dev --- debian/libam7xxx-dev.examples | 1 + debian/libam7xxx0.1-doc.examples | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 debian/libam7xxx-dev.examples delete mode 100644 debian/libam7xxx0.1-doc.examples diff --git a/debian/libam7xxx-dev.examples b/debian/libam7xxx-dev.examples new file mode 100644 index 0000000..43ec862 --- /dev/null +++ b/debian/libam7xxx-dev.examples @@ -0,0 +1 @@ +examples/*.c diff --git a/debian/libam7xxx0.1-doc.examples b/debian/libam7xxx0.1-doc.examples deleted file mode 100644 index 43ec862..0000000 --- a/debian/libam7xxx0.1-doc.examples +++ /dev/null @@ -1 +0,0 @@ -examples/*.c -- 2.1.4 From 1a3c19d329ea34752a68d6b9333f6afd9c4b3875 Mon Sep 17 00:00:00 2001 From: Antonio Ospite Date: Mon, 7 Jul 2014 22:42:26 +0200 Subject: [PATCH 14/16] debian/changelog: release package version 0.1.5-2 Git-Dch: ignore --- debian/changelog | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/debian/changelog b/debian/changelog index 6126a51..76dd5c2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +libam7xxx (0.1.5-2) unstable; urgency=medium + + * debian/gbp.conf: fix typo s/prinstine-tar/pristine-tar/g + * debian/libam7xxx0.1-doc.lintian-overrides: update one override + * debian/patches: add a patch to fix the license of the example programs + * debian/copyright: document the license of some scripts from contrib/ + * debian/libam7xxx0.1-bin.install: distribute some files from contrib/ + * debian/libam7xxx0.1-doc.examples: move the C example programs to libam7xxx-dev + + -- Antonio Ospite Mon, 07 Jul 2014 22:41:29 +0200 + libam7xxx (0.1.5-1) unstable; urgency=medium * New upstream release -- 2.1.4 From a7c7b5dbddefb73527407933b5d0b4451d25c530 Mon Sep 17 00:00:00 2001 From: Antonio Ospite Date: Wed, 5 Nov 2014 15:20:11 +0100 Subject: [PATCH 15/16] debian/control: move asciidoc and xmlto to Build-Depends This fixes the problem of the missing man pages in libam7xxx0.1-bin when building only the binary packages. Building the man pages depends on asciidoc, and the man pages need to be built along with libam7xxx0.1-bin which is a binary package; however dependencies in Build-Depends-Indep are not brought in when doing a binary only build. xmlto is needed as well because the a2x program from asciidoc needs it. --- debian/control | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index af16a37..502acdb 100644 --- a/debian/control +++ b/debian/control @@ -4,8 +4,9 @@ Priority: extra Maintainer: Antonio Ospite Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1~), cmake, pkg-config, libusb-1.0-0-dev, libxcb1-dev, - libavdevice-dev, libavformat-dev, libavcodec-dev, libswscale-dev -Build-Depends-Indep: doxygen, asciidoc, xmlto + libavdevice-dev, libavformat-dev, libavcodec-dev, libswscale-dev, + asciidoc, xmlto +Build-Depends-Indep: doxygen Standards-Version: 3.9.5 Homepage: http://git.ao2.it/libam7xxx.git Vcs-Git: git://git.ao2.it/libam7xxx.git -b debian -- 2.1.4 From a4717e1748edfd4d592d3cdc86d5378e62f9c30b Mon Sep 17 00:00:00 2001 From: Antonio Ospite Date: Wed, 5 Nov 2014 16:25:05 +0100 Subject: [PATCH 16/16] debian/changelog: release package version 0.1.5-3 Git-Dch: ignore --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 76dd5c2..20655d6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libam7xxx (0.1.5-3) unstable; urgency=medium + + * debian/control: move asciidoc and xmlto to Build-Depends + + -- Antonio Ospite Wed, 05 Nov 2014 16:24:45 +0100 + libam7xxx (0.1.5-2) unstable; urgency=medium * debian/gbp.conf: fix typo s/prinstine-tar/pristine-tar/g -- 2.1.4