From 160598ab2e921907d64795d8c28b6260398e1e43 Mon Sep 17 00:00:00 2001
From: Petter Reinholdtsen <pere@hungry.com>
Date: Tue, 29 Aug 2017 09:31:08 +0200
Subject: Clean up Debian packaging rules a bit.

---
 dists/debian/build-package |  9 +++++++++
 dists/debian/changelog     |  2 +-
 dists/debian/compat        |  2 +-
 dists/debian/control       | 16 +++++++++++-----
 dists/debian/gr-gsm.links  |  1 +
 dists/debian/rules         | 11 +++++++++--
 dists/debian/source/format |  2 +-
 7 files changed, 33 insertions(+), 10 deletions(-)
 create mode 100644 dists/debian/gr-gsm.links

(limited to 'dists')

diff --git a/dists/debian/build-package b/dists/debian/build-package
index 2d928de..8056187 100755
--- a/dists/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/dists/debian/changelog b/dists/debian/changelog
index 11c86a9..a8596b0 100644
--- a/dists/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
index f11c82a..ec63514 100644
--- a/dists/debian/compat
+++ b/dists/debian/compat
@@ -1 +1 @@
-9
\ No newline at end of file
+9
diff --git a/dists/debian/control b/dists/debian/control
index a513300..e97d542a 100644
--- a/dists/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/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/dists/debian/rules b/dists/debian/rules
index cb59406..d99b9e5 100755
--- a/dists/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
index 46ebe02..163aaf8 100644
--- a/dists/debian/source/format
+++ b/dists/debian/source/format
@@ -1 +1 @@
-3.0 (quilt)
\ No newline at end of file
+3.0 (quilt)
-- 
cgit v1.2.3