From 56c97316febfbdc3cf38ac4a0c1daa87b3335a75 Mon Sep 17 00:00:00 2001 From: Dmitry Kovalev Date: Wed, 16 Jan 2019 18:06:08 -0800 Subject: [PATCH] Get rid of debian folder. Debian package can be generated using stdeb library if needed. Change-Id: I8ab25272d37682fc48c1d759c6c689457a4381e8 --- Makefile | 4 --- debian/changelog | 75 ------------------------------------------------ debian/compat | 1 - debian/control | 11 ------- debian/copyright | 7 ----- debian/dirs | 1 - debian/postinst | 18 ------------ debian/prerm | 6 ---- debian/rules | 20 ------------- stdeb.cfg | 2 ++ 10 files changed, 2 insertions(+), 143 deletions(-) delete mode 100644 debian/changelog delete mode 100644 debian/compat delete mode 100644 debian/control delete mode 100644 debian/copyright delete mode 100644 debian/dirs delete mode 100644 debian/postinst delete mode 100644 debian/prerm delete mode 100755 debian/rules create mode 100644 stdeb.cfg diff --git a/Makefile b/Makefile index c699a7ef..0ee3ad79 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,6 @@ all: @echo "make test-vision-examples - Run vision example tests" @echo "make test-vision - Run all vision tests" @echo "make clean - Remove generated files" - @echo "make deb - Generate Debian package" test-vision-images: $(MAKE) -C src/tests/images @@ -50,9 +49,6 @@ test-vision: test-vision-images $(VISION_MODEL_TESTS) \ $(VISION_EXAMPLE_TESTS) -deb: - dpkg-buildpackage -b -rfakeroot -us -uc -tc - lint: find src -iname "*.py" | grep -v pb2 | xargs $(PYTHON) -m pylint --rcfile .pylintrc diff --git a/debian/changelog b/debian/changelog deleted file mode 100644 index ccdc94d1..00000000 --- a/debian/changelog +++ /dev/null @@ -1,75 +0,0 @@ -aiy-projects-python (1.1-0) stable; urgency=medium - - * Fix gpiozero LED on/off bug - * Fix check_audio.py - * Add Makefile for common shortcuts - * Add vision unit tests for all models and examples - * Add video streaming support (experimental) - * Add Google Cloud IoT support (experimental) - * Add more documentation (pinouts, drivers, troubleshooting, etc.) - * Add new code examples and update existing ones - * Add CHANGES.md to track release changes - * Remove unnecessary files (e.g. ALSA configs) - * Update HACKING.md - - -- Dmitry Kovalev Fri, 03 Aug 2018 14:01:27 -0700 - -aiy-projects-python (1.0-0) stable; urgency=medium - - [ Dmitry Kovalev ] - * Run Joy Demo under pi user by default. - - [ Aaron Loo ] - * handling edge case where stop is called before start - - [ Weiran Zhao ] - * Rename object_detection_camera.py to image_classification_camera.py - - [ Peter Malkin ] - * Use pip3 system wide, install google-assistant-library for rpi0 as well - - [ Alex Van Damme ] - * Add Pi Zero checks to some voice samples - - [ Alex Van Damme ] - * Don't arecord and aplay at the same time - - [ henryherman ] - * Fix mcu address issue for voice bonnet. - - [ Peter Malkin ] - * Use system-wide python to run desktop check scripts - - [ Michael Brooks ] - * Formatting changes to make Travis happy. - - [ Dmitry Kovalev ] - * Flexible SPI buffer allocation. - * Calculate default timeout based on payload_len. - - [ Alex Van Damme ] - * Unify volume between assistant_{grpc,library}_demo - - [ Weiran Zhao ] - * Add script to run generic MobileNet based classification model. - - [ Dmitry Kovalev ] - * Remove outdated configure-driver.sh script. - * Makefile is not needed anymore since we are using deb packages. - - [ henryherman ] - * Fix import error for annotator. - - [ Alex Van Damme ] - * Remove annotator.py from setup.py scripts - - [ Weiran Zhao ] - * Add option to enable camera preview and show FPS. - - -- Alex Van Damme Fri, 13 Apr 2018 10:58:29 -0700 - -aiy-projects-python (0.1-0) stable; urgency=medium - - * Initial release. - - -- Alex Van Damme Fri, 01 Dec 2017 14:48:39 -0800 diff --git a/debian/compat b/debian/compat deleted file mode 100644 index f599e28b..00000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -10 diff --git a/debian/control b/debian/control deleted file mode 100644 index 1c1cdf37..00000000 --- a/debian/control +++ /dev/null @@ -1,11 +0,0 @@ -Source: aiy-projects-python -Section: misc -Priority: optional -Maintainer: AIY Projects -Build-Depends: git, debhelper (>= 10) -Standards-Version: 3.8.1 - -Package: aiy-projects-python -Architecture: all -Depends: python3, avahi-utils, libttspico-utils, aiy-voicebonnet-soundcard-dkms, aiy-vision-dkms, aiy-models, aiy-dkms, pwm-soft-dkms, leds-ktd202x-dkms, git, ${misc:Depends} -Description: AIY Python API diff --git a/debian/copyright b/debian/copyright deleted file mode 100644 index cf9f9071..00000000 --- a/debian/copyright +++ /dev/null @@ -1,7 +0,0 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: aiy-projects-python -Source: https://aiyprojects.withgoogle.com - -Files: * -Copyright: Copyright 2017 Google, LLC -License: Apache-2.0 diff --git a/debian/dirs b/debian/dirs deleted file mode 100644 index 57cdbbe2..00000000 --- a/debian/dirs +++ /dev/null @@ -1 +0,0 @@ -opt/aiy diff --git a/debian/postinst b/debian/postinst deleted file mode 100644 index a27a95d1..00000000 --- a/debian/postinst +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash - -set -e - -git clone /opt/aiy/projects-python.bundle /opt/aiy/projects-python - -pushd /opt/aiy/projects-python -git checkout aiy-github -git tag -d aiy-github -git checkout -b aiyprojects -git remote remove origin -git remote add origin https://github.com/google/aiyprojects-raspbian -git config branch.aiyprojects.remote origin -git config branch.aiyprojects.merge refs/heads/aiyprojects -popd - -chown -R pi:pi /opt/aiy/projects-python -pip3 install --no-deps -e /opt/aiy/projects-python/src diff --git a/debian/prerm b/debian/prerm deleted file mode 100644 index b6e3e05c..00000000 --- a/debian/prerm +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -set -e - -pip3 uninstall -y aiy-projects-python || true -rm -rf /opt/aiy/projects-python/ diff --git a/debian/rules b/debian/rules deleted file mode 100755 index 924a0b79..00000000 --- a/debian/rules +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/make -f -# -*- makefile -*- - -# Uncomment this to turn on verbose mode. -# export DH_VERBOSE=1 - -AIY_GITHUB_COMMIT ?= $(shell git rev-parse HEAD) - -%: - dh $@ - -override_dh_auto_build: - -override_dh_auto_test: - -override_dh_install: - git tag aiy-github $(AIY_GITHUB_COMMIT) - git bundle create debian/aiy-projects-python/opt/aiy/projects-python.bundle aiy-github - git tag -d aiy-github - dh_install diff --git a/stdeb.cfg b/stdeb.cfg new file mode 100644 index 00000000..afc4a1a7 --- /dev/null +++ b/stdeb.cfg @@ -0,0 +1,2 @@ +[DEFAULT] +Depends3: avahi-utils, libttspico-utils, aiy-voicebonnet-soundcard-dkms, aiy-vision-dkms, aiy-models, aiy-dkms, pwm-soft-dkms, leds-ktd202x-dkms