tags 663685 - moreinfo thanks I managed to upload the package to mentors and attach the corrected debdiff. Thanks for taking a look.
Helmut
diff -u openvpn-auth-radius-2.1/debian/compat
openvpn-auth-radius-2.1/debian/compat
--- openvpn-auth-radius-2.1/debian/compat
+++ openvpn-auth-radius-2.1/debian/compat
@@ -1 +1 @@
-7
+8
diff -u openvpn-auth-radius-2.1/debian/rules
openvpn-auth-radius-2.1/debian/rules
--- openvpn-auth-radius-2.1/debian/rules
+++ openvpn-auth-radius-2.1/debian/rules
@@ -2,6 +2,11 @@
%:
dh $@
+DPKG_EXPORT_BUILDFLAGS = 1
+# use -include to support old dpkg
+-include /usr/share/dpkg/buildflags.mk
+CFLAGS += -g
+
patch-stamp:
QUILT_PATCHES=debian/patches quilt push -a
touch $@
@@ -16,17 +21,22 @@
- dh $@ --before dh_clean
- dh_clean -XUserAcct.cpp.orig
- dh $@ --after dh_clean
+ dh $@
# do not remove the next line or the diff will contain these files.
rm -f debian/openvpn-auth-radius.debhelper.log
debian/openvpn-auth-radius-dbg.debhelper.log
+override_dh_clean:
+ dh_clean -XUserAcct.cpp.orig
+
build:patch-stamp
dh $@
-binary binary-arch:
- dh $@ --until dh_auto_install
+binary binary-arch:build
+ dh $@
+
+override_dh_auto_install:
install -m755 radiusplugin.so
$(CURDIR)/debian/openvpn-auth-radius/usr/lib/openvpn/radiusplugin.so
- dh $@ --after dh_auto_install --until dh_fixperms
+
+override_dh_fixperms:
+ dh_fixperms
chmod a-x
$(CURDIR)/debian/openvpn-auth-radius/usr/share/doc/openvpn-auth-radius/examples/radiusplugin.cnf
- dh $@ --after dh_fixperms --before dh_strip
+
+override_dh_strip:
dh_strip --dbg-package=openvpn-auth-radius-dbg
- dh $@ --after dh_strip
diff -u openvpn-auth-radius-2.1/debian/control
openvpn-auth-radius-2.1/debian/control
--- openvpn-auth-radius-2.1/debian/control
+++ openvpn-auth-radius-2.1/debian/control
@@ -1,10 +1,10 @@
Source: openvpn-auth-radius
Maintainer: Cygnus Networks GmbH <[email protected]>
Uploaders: Helmut Grohne <[email protected]>
-Standards-Version: 3.9.1
+Standards-Version: 3.9.3
Section: net
Priority: extra
-Build-Depends: debhelper (>= 7), libgcrypt11-dev, quilt
+Build-Depends: debhelper (>= 8), libgcrypt11-dev, quilt
Homepage: http://www.nongnu.org/radiusplugin/
Package: openvpn-auth-radius
diff -u openvpn-auth-radius-2.1/debian/copyright
openvpn-auth-radius-2.1/debian/copyright
--- openvpn-auth-radius-2.1/debian/copyright
+++ openvpn-auth-radius-2.1/debian/copyright
@@ -1,31 +1,117 @@
-Format-Specification:
http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
-Name: radiusplugin
-Maintainer: Cygnus Networks GmbH <[email protected]>
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: radiusplugin
+Upstream-Contact: Ralf Luebben <[email protected]>
Source: http://www.nongnu.org/radiusplugin/
Files: *
Copyright: 2005, EWE TEL GmbH
2005, Ralf Luebben <[email protected]>
+License: GPL-2+
+ 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
+ any later version.
+ .
+ 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, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
+
+Files: RadiusClass/radius.h
+Copyright: 2005, EWE TEL GmbH
+ 2005, Ralf Luebben <[email protected]>
License: GPL-2
- See /usr/share/common-licenses/GPL-2
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License version 2
+ as published by the Free Software Foundation.
+ .
+ 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 (see the file COPYING included with this
+ distribution); if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
Files: openvpn-plugin.h
Copyright: 2002-2008, OpenVPN Technologies, Inc. <[email protected]>
License: GPL-2
- See /usr/share/common-licenses/GPL-2
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License version 2
+ as published by the Free Software Foundation.
+ .
+ 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 (see the file COPYING included with this
+ distribution); if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
Files: RadiusClass/vsa.h RadiusClass/utilities/vsa.h
RadiusClass/utilities/vsa_if_statements.txt RadiusClass/utilities/dictionary
Copyright: 2000-2008, The FreeRADIUS Server Project
1997-1999, Cistron Internet Services B.V.
2005, EWE TEL GmbH
2005, Ralf Luebben <[email protected]>
-License: GPL-2
- See /usr/share/common-licenses/GPL-2
+License: GPL-2+
+ 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
+ any later version.
+ .
+ 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, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
Comment: The vsa*.* files can be regenerated from the dictionary file using
vsahelper.pl. The dictionary file is derived from files from the freeradius
project which uses the same license.
Files: debian/*
-Copyright: 2010, Cygnus Networks GmbH <[email protected]>
-License: GPL-2
- See /usr/share/common-licenses/GPL-2
+Copyright: 2010-2012, Cygnus Networks GmbH <[email protected]>
+License: GPL-2+
+ 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
+ any later version.
+ .
+ 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, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
diff -u openvpn-auth-radius-2.1/debian/README.source
openvpn-auth-radius-2.1/debian/README.source
--- openvpn-auth-radius-2.1/debian/README.source
+++ openvpn-auth-radius-2.1/debian/README.source
@@ -10,0 +11,3 @@
+
+For further information please install the quilt package and read
+/usr/share/doc/quilt/README.source.
diff -u openvpn-auth-radius-2.1/debian/changelog
openvpn-auth-radius-2.1/debian/changelog
--- openvpn-auth-radius-2.1/debian/changelog
+++ openvpn-auth-radius-2.1/debian/changelog
@@ -1,3 +1,14 @@
+openvpn-auth-radius (2.1-4) unstable; urgency=low
+
+ * binary* targets need to depend on build target.
+ * Mention quilt's README.source in README.source.
+ * Bumped Standards-Version: no changes needed.
+ * Update debian/copyright to machine readable specification 1.0.
+ * Support dpkg-buildflags.
+ * Switch to debhelper 8 and use overrides.
+
+ -- Helmut Grohne <[email protected]> Tue, 10 Apr 2012 14:39:06 +0200
+
openvpn-auth-radius (2.1-3) unstable; urgency=low
* Fix binary-arch target. (Closes: #613666)
diff -u openvpn-auth-radius-2.1/debian/patches/build-with-debug-symbols
openvpn-auth-radius-2.1/debian/patches/build-with-debug-symbols
--- openvpn-auth-radius-2.1/debian/patches/build-with-debug-symbols
+++ openvpn-auth-radius-2.1/debian/patches/build-with-debug-symbols
@@ -1,16 +1,23 @@
The upstream source provides no way to extend the CFLAGS by -g which is needed
-for building the debug package. So we simply add this flag to the Makefile.
+for building the debug package. So instead of setting the variables, we add to
+them.
Index: openvpn-auth-radius/Makefile
===================================================================
---- openvpn-auth-radius.orig/Makefile 2010-12-16 17:07:06.000000000 +0100
-+++ openvpn-auth-radius/Makefile 2010-12-16 17:07:21.000000000 +0100
-@@ -12,7 +12,7 @@
- INCL=
- LDFLAGS=
- LIBS=-lgcrypt -lpthread
+--- openvpn-auth-radius.orig/Makefile 2012-03-06 15:25:18.000000000 +0100
++++ openvpn-auth-radius/Makefile 2012-03-06 16:03:29.000000000 +0100
+@@ -9,10 +9,10 @@
+
+
+
+-INCL=
+-LDFLAGS=
+-LIBS=-lgcrypt -lpthread
-CFLAGS=-Wall -shared -fPIC -DPIC
-+CFLAGS=-Wall -shared -fPIC -DPIC -g
++INCL +=
++LDFLAGS +=
++LIBS += -lgcrypt -lpthread
++CFLAGS += -Wall -shared -fPIC -DPIC
PLUGIN=radiusplugin.so
signature.asc
Description: Digital signature
