[Pkg-voip-commits] r6797 - in /gnugk/trunk/debian: changelog control copyright gnugk.install gnugk.lintian-overrides rules
msp at alioth.debian.org
msp at alioth.debian.org
Sun Feb 22 15:47:18 UTC 2009
Author: msp
Date: Sun Feb 22 15:47:18 2009
New Revision: 6797
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6797
Log:
* Clarify debian/copyright - copyright-refers-to-versionless-license-file
* Add lintian-overrides for possible-gpl-code-linked-with-openssl
* Switch to cdbs
Added:
gnugk/trunk/debian/gnugk.install
gnugk/trunk/debian/gnugk.lintian-overrides
Modified:
gnugk/trunk/debian/changelog
gnugk/trunk/debian/control
gnugk/trunk/debian/copyright
gnugk/trunk/debian/rules
Modified: gnugk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/gnugk/trunk/debian/changelog?rev=6797&op=diff
==============================================================================
--- gnugk/trunk/debian/changelog (original)
+++ gnugk/trunk/debian/changelog Sun Feb 22 15:47:18 2009
@@ -1,8 +1,10 @@
gnugk (2:2.2.8-2) UNRELEASED; urgency=low
- * NOT RELEASED YET
-
- -- Mark Purcell <msp at debian.org> Mon, 16 Feb 2009 22:04:55 +1100
+ * Clarify debian/copyright - copyright-refers-to-versionless-license-file
+ * Add lintian-overrides for possible-gpl-code-linked-with-openssl
+ * Switch to cdbs
+
+ -- Mark Purcell <msp at debian.org> Mon, 23 Feb 2009 02:29:47 +1100
gnugk (2:2.2.8-1) unstable; urgency=low
Modified: gnugk/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/gnugk/trunk/debian/control?rev=6797&op=diff
==============================================================================
--- gnugk/trunk/debian/control (original)
+++ gnugk/trunk/debian/control Sun Feb 22 15:47:18 2009
@@ -3,7 +3,10 @@
Priority: optional
Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
Uploaders: Kilian Krause <kilian at debian.org>, Mark Purcell <msp at debian.org>, Faidon Liambotis <paravoid at debian.org>
-Build-Depends: debhelper (>> 4.0.0), libopenh323-dev, libspeex-dev, libsdl1.2-dev, libldap2-dev, libpq-dev, libmysql++-dev, linuxdoc-tools, firebird2.0-dev [amd64 i386 powerpc sparc kfreebsd-amd64 kfreebsd-i386]
+Build-Depends: debhelper (>> 4.0.0), cdbs,
+ libopenh323-dev, libspeex-dev,
+ libsdl1.2-dev, linuxdoc-tools,
+ libldap2-dev, libpq-dev, libmysql++-dev, firebird2.0-dev [amd64 i386 powerpc sparc kfreebsd-amd64 kfreebsd-i386]
Standards-Version: 3.8.0
Homepage: http://www.gnugk.org/
Vcs-Svn: svn://svn.debian.org/pkg-voip/gnugk/trunk/
@@ -11,7 +14,7 @@
Package: gnugk
Architecture: any
-Depends: ${shlibs:Depends}, adduser
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
Suggests: ekiga, ohphone, ohphone-basic, simph323
Description: OpenH323 Gatekeeper - The GNU Gatekeeper
GNU Gatekeeper is an open-source project that implements an H.323
Modified: gnugk/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-voip/gnugk/trunk/debian/copyright?rev=6797&op=diff
==============================================================================
--- gnugk/trunk/debian/copyright (original)
+++ gnugk/trunk/debian/copyright Sun Feb 22 15:47:18 2009
@@ -1,19 +1,25 @@
This package was debianized by Mark Purcell <msp at debian.org> on
Wed, 21 Nov 2001 22:05:04 +1100.
-It was downloaded from http://www.willamowius.com/openh323gk.html
+It was downloaded from http://www.gnugk.org
Upstream Authors: Jan Willamowius <jan at willamowius.com>
Copyright:
- It is covered by the GNU Public License (GPL).
+ [Copyright: 2005-2008, Jan Willamowius]
+
+Licence:
+
+gk.cxx:
+ 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 2
+ of the License, or (at your option) any later version.
+
+readme.txt:
In addition to that, we explicitely grant
the right to link this code to the OpenH323 and OpenSSL library.
-
- This package 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; version 2 dated June, 1991.
This package is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -30,14 +36,10 @@
Other Portions:
- Copyright (c) 2005, Michal Zygmuntowicz
- Copyright (c) Citron Network Inc. 2003
- Copyright (c) 2003, Quarcom FHU, Michal Zygmuntowicz
- Copyright (c) 2003, eWorld Com, Tamas Jalsovszky
- Copyright (c) 1995-1998 SuSE GmbH Nuernberg, Germany.
- Copyright (c) 2000 telos Systementwicklung GmbH
- Copyright (c) 2000 Jan Willamowius
- Copyright (c) 1993-1998 Equivalence Pty. Ltd.
- Portions are Copyright (C) 1993 Free Software Foundation, Inc.
- Copyright (C) 2003 Nils.Bokermann at mediaways.net
- Copyright (C) 2002 Dr.-Ing. Martin Froehlich <Martin.Froehlich at mediaWays.net>
+ [Copyright: 1993 Free Software Foundation, Inc / 1993-1998 Equivalence Pty. Ltd]
+ [Copyright: 2002 Dr.-Ing. Martin Froehlich <Martin.Froehlich at mediaWays.net>]
+ [Copyright: 2003 Nils.Bokermann at mediaways.net]
+ [Copyright: 2003, Quarcom FHU, Michal Zygmuntowicz]
+ [Copyright: 2004-2006, Michal Zygmuntowicz]
+ [Copyright: Citron Network Inc. 2001-2003]
+ [Copyright: Data Tech Labs]
Added: gnugk/trunk/debian/gnugk.install
URL: http://svn.debian.org/wsvn/pkg-voip/gnugk/trunk/debian/gnugk.install?rev=6797&op=file
==============================================================================
--- gnugk/trunk/debian/gnugk.install (added)
+++ gnugk/trunk/debian/gnugk.install Sun Feb 22 15:47:18 2009
@@ -1,0 +1,2 @@
+obj*/addpasswd usr/sbin
+obj*/gnugk usr/sbin
Added: gnugk/trunk/debian/gnugk.lintian-overrides
URL: http://svn.debian.org/wsvn/pkg-voip/gnugk/trunk/debian/gnugk.lintian-overrides?rev=6797&op=file
==============================================================================
--- gnugk/trunk/debian/gnugk.lintian-overrides (added)
+++ gnugk/trunk/debian/gnugk.lintian-overrides Sun Feb 22 15:47:18 2009
@@ -1,0 +1,1 @@
+gnugk: possible-gpl-code-linked-with-openssl
Modified: gnugk/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/gnugk/trunk/debian/rules?rev=6797&op=diff
==============================================================================
--- gnugk/trunk/debian/rules (original)
+++ gnugk/trunk/debian/rules Sun Feb 22 15:47:18 2009
@@ -1,111 +1,30 @@
#!/usr/bin/make -f
-# GNU copyright 1997 to 1999 by Joey Hess.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-export OPENH323DIR=/usr/share/openh323
-export PWLIBDIR=/usr/share/pwlib
-export PREFIX=/usr
-export RELATED_PKG_MAKEFILE=1
-
-# pwlib_compat.h does not set this on OpenH323 >= 1.19 by mistake
-export STDCCFLAGS+= -DhasSRV=1
-
-# 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 (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -g
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
-endif
-
-PACKAGE=gnugk
-
-DEBVERSION:=$(shell head -n 1 debian/changelog \
- | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
-UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/.dfsg$$//')
FILENAME := $(PACKAGE)_$(UPVERSION).orig.tar.gz
URL := http://qa.debian.org/watch/sf.php/openh323gk/gnugk-$(UPVERSION).tar.gz
+## pwlib_compat.h does not set this on OpenH323 >= 1.19 by mistake
+export STDCCFLAGS+= -DhasSRV=1
-config.status:
- dh_testdir
- ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
- --prefix=/usr \
- --mandir=\$${prefix}/share/man \
- --infodir=\$${prefix}/share/info \
- --with-pgsql-include-dir=`/usr/bin/pg_config --includedir`
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
-build: config.status
- dh_testdir
- $(MAKE) opt addpasswd doc
- touch build-stamp
-clean:
- dh_testdir
- dh_testroot
- [ ! -f Makefile ]||$(MAKE) clean
- -rm -f Makefile
- rm -f build-stamp config.status
- dh_clean
+DEB_INSTALL_CHANGELOGS_ALL := changes.txt
+DEB_CONFIGURE_EXTRA_FLAGS := --with-pgsql-include-dir=`/usr/bin/pg_config --includedir`
+DEB_DH_INSTALLINIT_ARGS := -- defaults 90 10
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
- $(MAKE) install DESTDIR=$(CURDIR)/debian/gnugk \
- INSTALL_DIR=$(CURDIR)/debian/gnugk/usr \
- INSTALLBIN_DIR=$(CURDIR)/debian/gnugk/usr/sbin
- cp obj*/addpasswd $(CURDIR)/debian/gnugk/usr/sbin
-
+DEB_MAKE_BUILD_TARGET := opt addpasswd doc
+#DEB_DH_ALWAYS_EXCLUDE += copying .cvsignore gnugk.1
+DEB_MAKE_CHECK_TARGET := obj*/gnugk -h > /dev/null
+
+
+install/gnugk::
install --mode=640 --owner=root --group=root \
etc/complete.ini $(CURDIR)/debian/gnugk/etc/gatekeeper.ini
+binary/gnugk::
+ chmod -x $(CURDIR)/debian/gnugk/usr/share/doc/gnugk/examples/odbc.ini
- # Testcase - was our build good ??
- obj*/gnugk --help > /dev/null
- obj*/addpasswd --help > /dev/null
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installdocs -Xcopying -X.cvsignore -Xgnugk.1
- dh_installexamples
- dh_installmenu
- dh_installinit -- defaults 90 10
- dh_installchangelogs changes.txt
- dh_installman
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
-# dh_makeshlibs
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-print-version:
- @@echo "Debian version: $(DEBVERSION)"
- @@echo "Upstream version: $(UPVERSION)"
-
-get-orig-source:
- @@dh_testdir
- @@[ -d ../tarballs/. ]||mkdir -p ../tarballs
- @@echo Downloading $(FILENAME) from $(URL) ...
- @@wget -nv -T10 -t3 -O ../tarballs/$(FILENAME) $(URL)
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+# # Testcase - was our build good ??
+# obj*/gnugk --help > /dev/null
+# obj*/addpasswd --help > /dev/null
More information about the Pkg-voip-commits
mailing list