[Debian-iot-packaging] [radlib] 02/03: Import Debian changes 2.12.0-2
Thorsten Alteholz
alteholz at moszumanska.debian.org
Sun May 14 10:24:26 UTC 2017
This is an automated email from the git hooks/post-receive script.
alteholz pushed a commit to branch master
in repository radlib.
commit 0fb5752314659dda14f928be3d43759fea2e7c19
Author: Thorsten Alteholz <debian at alteholz.de>
Date: Thu May 11 19:12:00 2017 +0200
Import Debian changes 2.12.0-2
radlib (2.12.0-2) unstable; urgency=medium
* upload to Debian
* debian/control: move to dh10
* debian/control: move standards to 3.9.8
radlib (2.12.0-1) wheezy; urgency=low
* New upstream release.
radlib (2.11.3-1) wheezy; urgency=low
* New upstream release.
radlib (2.11.2-1) wheezy; urgency=low
* New upstream release.
radlib (2.11.1-1) wheezy; urgency=low
* New upstream release.
radlib (2.11.0-1) wheezy; urgency=low
* New upstream release.
radlib (2.10.3-1) wheezy; urgency=low
* New upstream release.
radlib (2.10.2-1) wheezy; urgency=low
* New upstream release.
radlib (2.10.1-1) wheezy; urgency=low
* New upstream release.
radlib (2.10.0-1) wheezy; urgency=low
* New upstream release.
radlib (2.9.0-1) wheezy; urgency=low
* Initial Release.
---
debian/changelog | 4 +-
debian/control | 27 ++++++-
debian/copyright | 55 +++++++++++---
debian/doc-base | 9 +++
debian/docs | 2 +-
debian/librad0-tools.install | 1 +
debian/librad0-tools.manpages | 3 +
debian/librad0.dirs | 1 -
debian/librad0.install | 2 +-
debian/patches/compile-errors.patch | 15 ++++
debian/patches/series | 1 +
debian/radlib-dev.dirs | 2 -
debian/radlib-dev.install | 8 +-
debian/rules | 141 ++++++------------------------------
debian/source/format | 1 +
15 files changed, 125 insertions(+), 147 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index bba098b..26412c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,10 +3,8 @@ radlib (2.12.0-2) unstable; urgency=medium
* upload to Debian
* debian/control: move to dh10
* debian/control: move standards to 3.9.8
- * TODO: check copyright
- rules vereinfachen
- -- Thorsten Alteholz <debian at alteholz.de> Thu, 11 May 2017 10:00:00 +0200
+ -- Thorsten Alteholz <debian at alteholz.de> Thu, 11 May 2017 19:12:00 +0200
radlib (2.12.0-1) wheezy; urgency=low
diff --git a/debian/control b/debian/control
index e288c7a..9ea66e0 100644
--- a/debian/control
+++ b/debian/control
@@ -1,6 +1,6 @@
Source: radlib
Priority: extra
-Maintainer: Thorsten Aleteholz <debian at alteholz.de>
+Maintainer: Thorsten Alteholz <debian at alteholz.de>
Build-Depends: debhelper (>= 10), autotools-dev, libc6, libsqlite3-dev
Standards-Version: 3.9.8
Section: libs
@@ -9,8 +9,24 @@ Homepage: http://www.radlib.teel.ws
Package: radlib-dev
Section: libdevel
Architecture: any
-Depends: librad0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, libsqlite3-dev
-Description: rapid application development library
+Multi-Arch: same
+Depends: librad0 (= ${binary:Version}), ${misc:Depends}, libsqlite3-dev
+Description: development file for librad0
+ radlib is a C language library developed to abstract details of interprocess
+ communications and common linux/unix system facilities so that application
+ developers can concentrate on application solutions. It encourages developers
+ (whether expert or novice) to use a proven paradigm of event-driven,
+ asynchronous design. By abstracting interprocess messaging, events, timers,
+ and any I/O device that can be represented as a file descriptor, radlib
+ simplifies the implementation of multi-purpose processes, as well as multi-
+ process applications.
+ .
+ This is the package needed for development.
+
+Package: librad0-tools
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, libsqlite3-0, librad0 (= ${binary:Version})
+Description: tools for rapid application development library
radlib is a C language library developed to abstract details of interprocess
communications and common linux/unix system facilities so that application
developers can concentrate on application solutions. It encourages developers
@@ -19,10 +35,13 @@ Description: rapid application development library
and any I/O device that can be represented as a file descriptor, radlib
simplifies the implementation of multi-purpose processes, as well as multi-
process applications.
+ .
+ This is a package containing some tools.
Package: librad0
-Section: libs
Architecture: any
+Multi-Arch: same
+Suggests: librad0-tools (= ${binary:Version})
Depends: ${shlibs:Depends}, ${misc:Depends}, libsqlite3-0
Description: rapid application development library
radlib is a C language library developed to abstract details of interprocess
diff --git a/debian/copyright b/debian/copyright
index 53c4648..9c23560 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,16 +1,49 @@
-This package was debianized by: Mark Teel <mteel2005 at gmail.com> on
-Mon, 16 Nov 2009 21:09:51 -0600
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: radlib
+Source: http://radlib.teel.ws
-It was downloaded from: http://radlib.teel.ws
+Files: *
+Copyright: (C) 2001-2009 Mark Teel <mteel2005 at gmail.com>
+License: BSD2
-Upstream Author: Mark Teel <mteel2005 at gmail.com>
+Files: debian/*
+Copyright: 2009 Mark Teel <mteel2005 at gmail.com>
+ 2016 Thorsten Alteholz <debian at alteholz.de>
+License: GPL-3
-Copyright (C) 2001-2009 Mark Teel <mteel2005 at gmail.com>
+License: BSD2
+ Redistribution and use in source and binary forms, with or without modification,
+ are permitted provided that the following conditions are met:
+ .
+ 1. Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+ .
+ THIS SOFTWARE IS PROVIDED BY Mark Teel ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+ EVENT SHALL MARK TEEL OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-You are free to distribute this software under the terms of the BSD License.
-On Debian systems, the complete text of the BSD License can be found in the
-file `/usr/share/common-licenses/BSD'.
+License: GPL-3
+ This program is free software: you can redistribute it and/or modify it under
+ the terms of the GNU General Public License as published by the Free Software
+ Foundation, either version 3 of the License.
+ .
+ This program is distributed in the hope that it will be useful, but WITHOUT ANY
+ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License along with
+ this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ can be found in `/usr/share/common-licenses/GPL-3'.
-The Debian packaging is Copyright (C) 2009 Mark Teel <mteel2005 at gmail.com>
-and is licensed under the GPL version 3, and can be found in the file
-`/usr/share/common-licenses/GPL-3'.
diff --git a/debian/doc-base b/debian/doc-base
new file mode 100644
index 0000000..32aa228
--- /dev/null
+++ b/debian/doc-base
@@ -0,0 +1,9 @@
+Document: radlib
+Title: API reference for radlib
+Author: Mark Teel
+Abstract: API reference for radlib
+Section: Programming/C
+
+Format: HTML
+Index: /usr/share/doc/radlib-dev/radlib-api-reference.html
+Files: /usr/share/doc/radlib-dev/radlib-api-reference.html
diff --git a/debian/docs b/debian/docs
index 1427e4f..51e94fb 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,4 +1,4 @@
NEWS
README
radlib-api-reference.html
-ChangeLog
+#ChangeLog
diff --git a/debian/librad0-tools.install b/debian/librad0-tools.install
new file mode 100644
index 0000000..e772481
--- /dev/null
+++ b/debian/librad0-tools.install
@@ -0,0 +1 @@
+usr/bin
diff --git a/debian/librad0-tools.manpages b/debian/librad0-tools.manpages
new file mode 100644
index 0000000..6a8aec9
--- /dev/null
+++ b/debian/librad0-tools.manpages
@@ -0,0 +1,3 @@
+debian/raddebug.1
+debian/radmrouted.1
+
diff --git a/debian/librad0.dirs b/debian/librad0.dirs
deleted file mode 100644
index 6845771..0000000
--- a/debian/librad0.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib
diff --git a/debian/librad0.install b/debian/librad0.install
index d0dbfd1..3ddde58 100644
--- a/debian/librad0.install
+++ b/debian/librad0.install
@@ -1 +1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*
diff --git a/debian/patches/compile-errors.patch b/debian/patches/compile-errors.patch
new file mode 100644
index 0000000..fcfaa0f
--- /dev/null
+++ b/debian/patches/compile-errors.patch
@@ -0,0 +1,15 @@
+Description: take care of some compile warnings
+Author: Thorsten Alteholz <debian at alteholz.de>
+Index: radlib-2.12.0/src/radmsgLog.c
+===================================================================
+--- radlib-2.12.0.orig/src/radmsgLog.c 2012-03-17 13:59:17.000000000 +0100
++++ radlib-2.12.0/src/radmsgLog.c 2017-05-11 14:22:00.040830310 +0200
+@@ -134,7 +134,7 @@
+ vsprintf (&temp1[index], format, argList);
+ va_end (argList);
+
+- syslog (priority, temp1);
++ syslog (priority, "%s", temp1);
+
+ return OK;
+ }
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..666e09d
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+compile-errors.patch
diff --git a/debian/radlib-dev.dirs b/debian/radlib-dev.dirs
index fe68c34..e43b95c 100644
--- a/debian/radlib-dev.dirs
+++ b/debian/radlib-dev.dirs
@@ -1,3 +1 @@
-usr/lib
usr/include
-usr/bin
diff --git a/debian/radlib-dev.install b/debian/radlib-dev.install
index 7ba80d8..0e1798f 100644
--- a/debian/radlib-dev.install
+++ b/debian/radlib-dev.install
@@ -1,5 +1,5 @@
usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.so
-usr/lib/*.la
-usr/bin/*
+usr/lib/*/lib*.a
+usr/lib/*/lib*.so
+# don't use la file
+#usr/lib/*.la
diff --git a/debian/rules b/debian/rules
index 4c3df78..2c876f2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,125 +1,26 @@
#!/usr/bin/make -f
-%:
- dh $@ --with autoreconf
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
+CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+else
+CROSS= --build $(DEB_BUILD_GNU_TYPE)
+endif
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+%:
+ dh $@ --with autoreconf
-#XXX#
-#XXX# #!/usr/bin/make -f
-#XXX# # -*- makefile -*-
-#XXX# # Sample debian/rules that uses debhelper.
-#XXX# # This file was originally written by Joey Hess and Craig Small.
-#XXX# # As a special exception, when this file is copied by dh-make into a
-#XXX# # dh-make output file, you may use that output file without restriction.
-#XXX# # This special exception was added by Craig Small in version 0.37 of dh-make.
-#XXX#
-#XXX# # Uncomment this to turn on verbose mode.
-#XXX# #export DH_VERBOSE=1
-#XXX#
-#XXX#
-#XXX# # These are used for cross-compiling and for saving the configure script
-#XXX# # from having to guess our platform (since we know it already)
-#XXX# DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-#XXX# DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-#XXX# ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
-#XXX# CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
-#XXX# else
-#XXX# CROSS= --build $(DEB_BUILD_GNU_TYPE)
-#XXX# endif
-#XXX#
-#XXX# export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib
-#XXX#
-#XXX#
-#XXX# # shared library versions, option 1
-#XXX# version=0.0.0
-#XXX# major=0
-#XXX# # option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
-#XXX# #version=`ls src/.libs/lib*.so.* | \
-#XXX# # awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
-#XXX# #major=`ls src/.libs/lib*.so.* | \
-#XXX# # awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
-#XXX#
-#XXX# config.status: configure
-#XXX# dh_testdir
-#XXX# # Add here commands to configure the package.
-#XXX# ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-#XXX# cp -f /usr/share/misc/config.sub config.sub
-#XXX# endif
-#XXX# ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-#XXX# cp -f /usr/share/misc/config.guess config.guess
-#XXX# endif
-#XXX# ./configure $(CROSS) --prefix=/usr --enable-sqlite \
-#XXX# --mandir=\$${prefix}/share/man \
-#XXX# --infodir=\$${prefix}/share/info \
-#XXX# CFLAGS="$(CFLAGS)" \
-#XXX# LDFLAGS="-Wl,-z,defs -L\$${prefix}/lib -lsqlite3 -lpthread"
-#XXX#
-#XXX#
-#XXX# build: build-stamp
-#XXX# build-stamp: config.status
-#XXX# dh_testdir
-#XXX#
-#XXX# # Add here commands to compile the package.
-#XXX# $(MAKE) LIBS=""
-#XXX#
-#XXX# touch $@
-#XXX#
-#XXX# clean:
-#XXX# dh_testdir
-#XXX# dh_testroot
-#XXX# rm -f build-stamp
-#XXX#
-#XXX# # Add here commands to clean up after the build process.
-#XXX# [ ! -f Makefile ] || $(MAKE) distclean
-#XXX# rm -f config.sub config.guess
-#XXX#
-#XXX# dh_clean
-#XXX#
-#XXX# install: build
-#XXX# dh_testdir
-#XXX# dh_testroot
-#XXX# dh_prep
-#XXX# dh_installdirs
-#XXX#
-#XXX# # Add here commands to install the package into debian/tmp
-#XXX# $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
-#XXX#
-#XXX#
-#XXX# # Build architecture-independent files here.
-#XXX# binary-indep: install
-#XXX# # We have nothing to do by default.
-#XXX#
-#XXX# # Build architecture-dependent files here.
-#XXX# binary-arch: install
-#XXX# dh_testdir
-#XXX# dh_testroot
-#XXX# dh_installchangelogs ChangeLog
-#XXX# dh_installdocs
-#XXX# dh_installexamples
-#XXX# dh_install
-#XXX# # dh_installmenu
-#XXX# dh_installdebconf
-#XXX# # dh_installlogrotate
-#XXX# # dh_installemacsen
-#XXX# # dh_installpam
-#XXX# # dh_installmime
-#XXX# # dh_installinit
-#XXX# # dh_installcron
-#XXX# # dh_installinfo
-#XXX# dh_installman debian/raddebug.1 debian/radmrouted.1
-#XXX# dh_link
-#XXX# dh_strip
-#XXX# dh_compress
-#XXX# dh_fixperms
-#XXX# # dh_perl
-#XXX# # dh_python
-#XXX# dh_makeshlibs
-#XXX# dh_installdeb
-#XXX# dh_shlibdeps -- --ignore-missing-info debian/tmp/usr/bin/* debian/tmp/usr/sbin/* debian/tmp/usr/lib/*
-#XXX# dh_gencontrol
-#XXX# dh_md5sums
-#XXX# dh_builddeb
-#XXX#
-#XXX# binary: binary-indep binary-arch
-#XXX# #XXX# #XXX# #XXX# .PHONY: build clean binary-indep binary-arch binary install
+override_dh_auto_configure:
+ # ./configure $(CROSS) --prefix=/usr --enable-sqlite
+ ./configure --prefix=/usr --enable-sqlite \
+ --mandir=\$${prefix}/share/man \
+ --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
+ --infodir=\$${prefix}/share/info \
+ CFLAGS="$(CFLAGS)" \
+ LDFLAGS="-Wl,-z,defs -Wl,-z,now -L\$${prefix}/lib -lsqlite3 -lpthread"
+
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-iot/radlib.git
More information about the Debian-iot-packaging
mailing list