[osmo-trx] 02/02: Changes to debian dir for new package

[Ruben Undheim]

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osmo-trx.

commit 2d8e1cc3385fb656b48a9705afe7412aff5f9ee5
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Sat Apr 1 07:38:26 2017 +0000

    Changes to debian dir for new package
    
    Changelog entry added
    Patches fixed
    Copyright updated
    Vcs and std version updated
---
 debian/changelog                         | 13 +++++++++++++
 debian/control                           |  7 ++++---
 debian/copyright                         |  4 +++-
 debian/patches/01_not_embed_sqlite.patch | 27 ---------------------------
 debian/patches/02_no_march_native.patch  | 11 ++++++-----
 debian/patches/series                    |  1 -
 6 files changed, 26 insertions(+), 37 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ad3ae3a..72aefe9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+osmo-trx (0~20170323git2af1440+dfsg-1) experimental; urgency=medium
+
+  * New upstream version (Closes: #858594)
+  * Refreshed patches. Removed patch applied upstream.
+  * debian/control:
+    - New standards version: 3.9.8
+    - Some more build-dependencies
+    - Vcs now using secure URL
+  * debian/copyright:
+    - Updated copyright
+
+ -- Ruben Undheim <ruben.undheim at gmail.com>  Sat, 01 Apr 2017 07:37:10 +0000
+
 osmo-trx (0~20150325gitf147b17+dfsg-3) unstable; urgency=medium
 
   * Uploaded to unstable
diff --git a/debian/control b/debian/control
index 71c7a1c..de42c3f 100644
--- a/debian/control
+++ b/debian/control
@@ -10,10 +10,11 @@ Build-Depends: debhelper (>= 9),
                libuhd-dev,
                libusb-1.0-0-dev,
                libboost-dev,
-               libsqlite3-dev
-Standards-Version: 3.9.6
+               libsqlite3-dev,
+               libfftw3-dev
+Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/osmo-trx.git
-Vcs-Git: git://anonscm.debian.org/debian-science/packages/osmo-trx.git
+Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/osmo-trx.git
 Homepage: http://openbsc.osmocom.org/trac/wiki/OsmoTRX
 
 Package: osmo-trx
diff --git a/debian/copyright b/debian/copyright
index 45d0e6d..7823fd2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,6 +7,8 @@ Files: *
 Copyright: 2008-2013 Free Software Foundation
            2010 Kestrel Signal Processing, Inc.
            2010-2012 Range Networks, Inc.
+           2012-2014 Tom Tsou <tom at tsou.cc>
+           2015-2016 Ettus Research LLC
 License: AGPL-3+
 
 Files: Transceiver52M/arm/*
@@ -67,7 +69,7 @@ Comment: In the previous version of the file in the git repository
  https://github.com/osmocom/osmo-trx
 
 Files: debian/*
-Copyright: 2015 Ruben Undheim <ruben.undheim at gmail.com>
+Copyright: 2015,2017 Ruben Undheim <ruben.undheim at gmail.com>
 License: GPL-3+
 
 
diff --git a/debian/patches/01_not_embed_sqlite.patch b/debian/patches/01_not_embed_sqlite.patch
deleted file mode 100644
index 73ed238..0000000
--- a/debian/patches/01_not_embed_sqlite.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: Do not embed sqlite3 when building. Use debian
- version instead.
-Author: Ruben Undheim <ruben.undheim at gmail.com>
-Index: osmo-trx/Makefile.am
-===================================================================
---- osmo-trx.orig/Makefile.am	2015-02-06 23:31:31.316944097 +0100
-+++ osmo-trx/Makefile.am	2015-02-07 13:01:36.197792681 +0100
-@@ -28,7 +28,6 @@
- 
- # Order must be preserved
- SUBDIRS = \
--	sqlite3 \
- 	CommonLibs \
- 	GSM \
- 	Transceiver52M
-Index: osmo-trx/Makefile.common
-===================================================================
---- osmo-trx.orig/Makefile.common	2015-02-06 23:31:31.316944097 +0100
-+++ osmo-trx/Makefile.common	2015-02-07 13:01:19.373792297 +0100
-@@ -33,6 +33,6 @@
- 
- COMMON_LA = $(top_builddir)/CommonLibs/libcommon.la
- GSM_LA = $(top_builddir)/GSM/libGSM.la
--SQLITE_LA = $(top_builddir)/sqlite3/libsqlite.la -ldl
-+SQLITE_LA = -lsqlite3
- 
- MOSTLYCLEANFILES = *~
diff --git a/debian/patches/02_no_march_native.patch b/debian/patches/02_no_march_native.patch
index 3ba6498..a5952bd 100644
--- a/debian/patches/02_no_march_native.patch
+++ b/debian/patches/02_no_march_native.patch
@@ -3,13 +3,14 @@ Description: -march=native will cause problem since it may optimize
 Author: Ruben Undheim <ruben.undheim at gmail.com>
 Index: osmo-trx/Transceiver52M/x86/Makefile.am
 ===================================================================
---- osmo-trx.orig/Transceiver52M/x86/Makefile.am	2015-10-23 20:33:50.478724007 +0200
-+++ osmo-trx/Transceiver52M/x86/Makefile.am	2015-10-23 20:34:07.986452054 +0200
-@@ -1,5 +1,6 @@
+--- osmo-trx.orig/Transceiver52M/x86/Makefile.am
++++ osmo-trx/Transceiver52M/x86/Makefile.am
+@@ -1,5 +1,7 @@
  if !ARCH_ARM
--AM_CFLAGS = -Wall -std=gnu99 -march=native -I../common
-+AM_CFLAGS = -Wall -std=gnu99 -I../common
+-AM_CFLAGS = -Wall -std=gnu99 -march=native -I${srcdir}/../common
++AM_CFLAGS = -Wall -std=gnu99 -I${srcdir}/../common
 +AM_CFLAGS += $(SIMD_FLAGS)
++
  
  noinst_LTLIBRARIES = libarch.la
  
diff --git a/debian/patches/series b/debian/patches/series
index 7575b27..31c2fba 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-01_not_embed_sqlite.patch
 02_no_march_native.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/osmo-trx.git