diff options
author | Piotr Krysik <ptrkrysik@users.noreply.github.com> | 2017-08-30 10:06:15 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-30 10:06:15 +0200 |
commit | 1ecd1ac683dca343e28ea54e8d5f2c345f434002 (patch) | |
tree | facfbf4f491fd3279fc9c72ee64b95ad642c04fb | |
parent | 82ae3d01bb109bda924d24460c9a1c7608244863 (diff) | |
parent | 160598ab2e921907d64795d8c28b6260398e1e43 (diff) |
Merge pull request #323 from petterreinholdtsen/deb-build
Improve debian build rules and avoid conflict with official Debian package.
-rw-r--r-- | debian/compat | 1 | ||||
-rw-r--r-- | debian/source/format | 1 | ||||
-rwxr-xr-x | dists/debian/build-package (renamed from debian/build-package) | 9 | ||||
-rw-r--r-- | dists/debian/changelog (renamed from debian/changelog) | 2 | ||||
-rw-r--r-- | dists/debian/compat | 1 | ||||
-rw-r--r-- | dists/debian/control (renamed from debian/control) | 16 | ||||
-rw-r--r-- | dists/debian/copyright (renamed from debian/copyright) | 0 | ||||
-rw-r--r-- | dists/debian/gr-gsm.links | 1 | ||||
-rwxr-xr-x | dists/debian/rules (renamed from debian/rules) | 11 | ||||
-rw-r--r-- | dists/debian/source/format | 1 |
10 files changed, 33 insertions, 10 deletions
diff --git a/debian/compat b/debian/compat deleted file mode 100644 index f11c82a..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -9
\ No newline at end of file diff --git a/debian/source/format b/debian/source/format deleted file mode 100644 index 46ebe02..0000000 --- a/debian/source/format +++ /dev/null @@ -1 +0,0 @@ -3.0 (quilt)
\ No newline at end of file diff --git a/debian/build-package b/dists/debian/build-package index 2d928de..8056187 100755 --- a/debian/build-package +++ b/dists/debian/build-package @@ -1,4 +1,9 @@ #!/bin/bash + +if [ ! -e debian ] ; then + ln -s dists/debian . +fi + BASEVERSION=$(dpkg-parsechangelog --show-field Version | cut -d- -f1) DEBVERSION=$(dpkg-parsechangelog --show-field Version) @@ -13,3 +18,7 @@ debuild -S -sa #pdebuild cd .. dput ppa:ptrkrysik/gr-gsm gr-gsm_${DEBVERSION}_source.changes + +if [ -h debian ] ; then + rm debian +fi diff --git a/debian/changelog b/dists/debian/changelog index 11c86a9..a8596b0 100644 --- a/debian/changelog +++ b/dists/debian/changelog @@ -1,5 +1,5 @@ gr-gsm (0.40-0ppa0) xenial; urgency=low - * Initial upload! + * Initial upload (Closes: #871055). -- Piotr Krysik <ptrkrysik@gmail.com> Sun, 24 Apr 2016 16:00:00 +0100 diff --git a/dists/debian/compat b/dists/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/dists/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/dists/debian/control index a513300..e97d542a 100644 --- a/debian/control +++ b/dists/debian/control @@ -3,15 +3,15 @@ Section: libdevel Priority: optional Maintainer: Piotr Krysik <ptrkrysik@gmail.com> Build-Depends: cmake, - debhelper (>= 9.0.0~), - pkg-config, - python-scipy, + debhelper (>= 9~), gnuradio-dev, libosmocore-dev, + pkg-config, python-dev, + python-scipy, swig X-Python-Version: >= 2.7, << 2.8 -Standards-Version: 3.9.7 +Standards-Version: 4.0.1 Homepage: http://github.com/ptrkrysik/gr-gsm/ Vcs-Git: git://github.com/ptrkrysik/gr-gsm.git Vcs-Browser: https://github.com/ptrkrysik/gr-gsm/ @@ -19,5 +19,11 @@ Vcs-Browser: https://github.com/ptrkrysik/gr-gsm/ Package: gr-gsm Architecture: any Pre-Depends: ${misc:Pre-Depends} -Depends: gnuradio, gr-osmosdr, ${misc:Depends}, ${python:Depends}, ${shlibs:Depends} +Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}, + libjs-jquery, + gnuradio, + gr-osmosdr Description: Gnuradio blocks and tools for receiving GSM transmissions + Implementation of the Global System for Mobile Communications + protocol and provide tools for scanning for GSM base stations and for + decoding GSM radio trafic. diff --git a/debian/copyright b/dists/debian/copyright index aa7bcef..aa7bcef 100644 --- a/debian/copyright +++ b/dists/debian/copyright diff --git a/dists/debian/gr-gsm.links b/dists/debian/gr-gsm.links new file mode 100644 index 0000000..5774366 --- /dev/null +++ b/dists/debian/gr-gsm.links @@ -0,0 +1 @@ +/usr/share/javascript/jquery/jquery.min.js /usr/share/doc/gr-gsm/html/jquery.js diff --git a/debian/rules b/dists/debian/rules index cb59406..d99b9e5 100755 --- a/debian/rules +++ b/dists/debian/rules @@ -1,4 +1,5 @@ #!/usr/bin/make -f + DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) export DEB_HOST_MULTIARCH @@ -10,6 +11,12 @@ override_dh_auto_configure: override_dh_auto_install: dh_auto_install - rm -f debian/gr-gsm/usr/lib/python2.7/dist-packages/grgsm/*pyc - rm -f debian/gr-gsm/usr/lib/python2.7/dist-packages/grgsm/*pyo + # Remove compiled python files + rm -f debian/gr-gsm/usr/lib/python2.7/dist-packages/grgsm/*py[co] + + # Use jquery.js file from libjs-jquery instead, see gr-gsm.links + rm -f debian/gr-gsm/usr/share/doc/gr-gsm/html/jquery.js + +debian/copyright: + cme update dpkg-copyright diff --git a/dists/debian/source/format b/dists/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/dists/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) |