Signed-off-by: Max max.suraev@fairwaves.co --- debian/README.source | 1 + debian/control | 17 ++++++++++++++--- debian/copyright | 15 ++------------- 3 files changed, 17 insertions(+), 16 deletions(-) create mode 100644 debian/README.source
diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 0000000..982a696 --- /dev/null +++ b/debian/README.source @@ -0,0 +1 @@ +We do some Debian-specific source patching magic. See debian/patches for clarification. diff --git a/debian/control b/debian/control index 7de6358..1470e73 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: libosmocore Section: libs Priority: optional Maintainer: Harald Welte laforge@gnumonks.org -Build-Depends: debhelper (>= 9), autotools-dev, autoconf, automake, libtool, dh-autoreconf, libdpkg-perl, git, doxygen, libpcsclite-dev, pkg-config +Build-Depends: debhelper (>= 9), autotools-dev, autoconf, automake, libtool, dh-autoreconf, libdpkg-perl, git, doxygen, libpcsclite-dev, pkg-config, quilt Standards-Version: 3.9.6 Homepage: http://bb.osmocom.org/trac/wiki/libosmocore Vcs-Git: git://git.osmocom.org/libosmocore.git @@ -14,6 +14,7 @@ Architecture: any Depends: libosmocodec0, libosmocore6, libosmogb3, libosmogsm5, libosmovty1, ${misc:Depends} Multi-Arch: foreign Description: Open Source MObile COMmunications CORE library + Metapackage for Open Source MObile COMmunications CORE library.
Package: libosmocodec0 Section: libs @@ -21,6 +22,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Multi-Arch: same Description: Osmo codec library + Open Source MObile COMmunications codec library.
Package: libosmocore6 Section: libs @@ -28,6 +30,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Multi-Arch: same Description: Osmo Core library + Open Source MObile COMmunications CORE library.
Package: libosmogb3 Section: libs @@ -35,6 +38,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Multi-Arch: same Description: Osmo GPRS GB library + Open Source MObile COMmunications library containing GPRS support functions.
Package: libosmogsm5 Section: libs @@ -42,6 +46,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Multi-Arch: same Description: Osmo GSM utility library + Open Source MObile COMmunications library implementing various GSM routines.
Package: libosmovty1 Section: libs @@ -49,6 +54,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Multi-Arch: same Description: Osmo VTY library + Open Source MObile COMmunications library implementing VTY interface.
Package: libosmoctrl0 Section: libs @@ -56,6 +62,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Multi-Arch: same Description: Osmo control library + Open Source MObile COMmunications control library.
Package: libosmosim0 Section: libs @@ -63,19 +70,22 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Multi-Arch: same Description: Osmo SIM library - + Open Source MObile COMmunications SIM library. + Package: libosmocore-dev Section: libdevel Architecture: any -Depends: ${misc:Depends}, libosmocore +Depends: ${misc:Depends}, libosmocore, libjs-jquery Multi-Arch: same Description: Development headers for Open Source MObile COMmunications CORE library + Open Source MObile COMmunications library development files.
Package: libosmocore-utils Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libosmocore Multi-Arch: same Description: Utilities for gsm + Open Source MObile COMmunications library utilities.
Package: libosmocore-dbg Architecture: any @@ -84,3 +94,4 @@ Priority: extra Depends: libosmocore (= ${binary:Version}), ${misc:Depends} Multi-Arch: same Description: Debug symbols for Open Source MObile COMmunications CORE library + Debug version of Open Source MObile COMmunications CORE library. diff --git a/debian/copyright b/debian/copyright index c450be5..c2bfe66 100644 --- a/debian/copyright +++ b/debian/copyright @@ -6,7 +6,7 @@ It was downloaded from:
git://git.osmocom.org/libosmocore.git
-Upstream Author(s): +Upstream Authors:
Harald Welte laforge@gnumonks.org Holger Hans Peter Freyther zecke@selfish.org @@ -36,19 +36,8 @@ Copyright: License:
GNU General Public License, Version 2 or later + see "/usr/share/common-licenses/GPL-2"
The Debian packaging is:
Copyright (C) 2010 Harald Welte laforge@gnumonks.org - -# Please chose a license for your packaging work. If the program you package -# uses a mainstream license, using the same license is the safest choice. -# Please avoid to pick license terms that are more restrictive than the -# packaged work, as it may make Debian's contributions unacceptable upstream. -# If you just want it to be GPL version 3, leave the following lines in. - -and is licensed under the GPL version 3, -see "/usr/share/common-licenses/GPL-3". - -# Please also look if there are files or directories which have a -# different copyright/license attached and list them here.
Parts of the previous patch http://patchwork.ozlabs.org/patch/367967/ were incorporated already. Adjusted the rest - hopefully it will be pulled-in as well.
cheers, Max.
On Wed, Mar 25, 2015 at 06:06:01PM +0100, Max wrote:
-Build-Depends: debhelper (>= 9), autotools-dev, autoconf, automake, libtool, dh-autoreconf, libdpkg-perl, git, doxygen, libpcsclite-dev, pkg-config +Build-Depends: debhelper (>= 9), autotools-dev, autoconf, automake, libtool, dh-autoreconf, libdpkg-perl, git, doxygen, libpcsclite-dev, pkg-config, quilt
yes.
Description: Open Source MObile COMmunications CORE library
- Metapackage for Open Source MObile COMmunications CORE library.
 
Well, this description is not up to standard of Debian. So we simply fix a warning for the sake of fixing the warning. Is this really an improvement?
+Upstream Authors:
sure.
GNU General Public License, Version 2 or later
- see "/usr/share/common-licenses/GPL-2"
 
no idea.
The Debian packaging is:
Copyright (C) 2010 Harald Welte <laforge@gnumonks.org>
-# Please chose a license for your packaging work. If the program you package -# uses a mainstream license, using the same license is the safest choice. -# Please avoid to pick license terms that are more restrictive than the -# packaged work, as it may make Debian's contributions unacceptable upstream. -# If you just want it to be GPL version 3, leave the following lines in.
-and is licensed under the GPL version 3, -see "/usr/share/common-licenses/GPL-3".
-# Please also look if there are files or directories which have a -# different copyright/license attached and list them here.
The copyright file is not up to standards with debian. We silent the warning without doing the work needed for a debian package. Can we do it properly?
holger
03.04.2015 19:37, Holger Hans Peter Freyther пишет:
On Thu, Mar 26, 2015 at 12:44:23AM +0100, Holger Hans Peter Freyther wrote:
On Wed, Mar 25, 2015 at 06:06:01PM +0100, Max wrote:
max, could you please provide an updated/separated patch to at least improve the parts that are obviously correct and needed?
Sure that's on my TODO alongside with writing better descriptions based on wiki pages. Can't give any ETA though so if anyone is willing to step in - go ahead.
baseband-devel@lists.osmocom.org