Modernize Debianisation

* Convert to source 3.0 (quilt)
* debhelper 7 style debian/rules
* Upgrade to Standards-Version: 3.9.4
* Define compat
* Add Homepage: field
* A lot of cleanup
* Make lintian happy

.directory

@@ -1,4 +0,0 @@
-[Desktop Entry]
-BgImage=
-Icon=
-MiniIcon=

debian/bcrelay.dirs

@@ -1 +0,0 @@
-/usr/sbin

debian/bcrelay.install

@@ -0,0 +1,2 @@
+
+usr/sbin/bcrelay

debian/compat

@@ -0,0 +1 @@
+9

debian/conffiles

@@ -1,3 +0,0 @@
-/etc/pptpd.conf
-/etc/ppp/pptpd-options
-/etc/init.d/pptpd

debian/control

@@ -2,12 +2,21 @@ Source: pptpd
 Section: net
 Priority: optional
 Maintainer: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
-Standards-Version: 3.9.1
-Build-Depends: libwrap0-dev, debhelper (>= 4.1.16), ppp-dev (>=2.4.5-3), automake, hardening-wrapper
+Standards-Version: 3.9.4
+Build-Depends: debhelper (>= 9),
+    automake,
+    hardening-wrapper,
+    libwrap0-dev,
+    ppp-dev,
+Homepage: http://poptop.sourceforge.net/dox/
 
 Package: pptpd
 Architecture: any
-Depends: ${shlibs:Depends}, ppp (>=2.4.5-3), netbase, debconf | debconf-2.0, bcrelay
+Depends: ${misc:Depends}, ${shlibs:Depends},
+    bcrelay,
+    debconf | debconf-2.0,
+    netbase,
+    ppp,
 Description: PoPToP Point to Point Tunneling Server
  This implements a Virtual Private Networking Server (VPN) that is compatible
  with Microsoft VPN clients. It allows windows users to connect to an
@@ -15,8 +24,8 @@ Description: PoPToP Point to Point Tunneling Server
 
 Package: bcrelay
 Architecture: any
-Replaces: pptpd (<<1.2.3-1)
-Depends: ${shlibs:Depends}
+Replaces: pptpd (<< 1.2.3-1),
+Depends: ${misc:Depends}, ${shlibs:Depends},
 Description: Broadcast relay daemon
  The bcrelay daemon relays broadcasts between two interfaces. It is shipped
  with the pptpd package, but can be used for other purposes.

debian/copyright

@@ -1,11 +1,77 @@
-This package was debianized by Rene Mayrhofer rene.mayrhofer@gibraltar.at on
-Mon, 16 Aug 1999 11:27:43 +0200.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: poptop
+Source: http://poptop.sourceforge.net/dox/
 
-It was downloaded from <http://poptop.sourceforge.net/>
+Files: *
+Copyright: James Cameron <james.cameron at hp dot com> et.al.
+Comment: See AUTHORS for full list
+License: GPL-2.0+
 
-Upstream Authors: Please look at file AUTHORS
+Files:
+    getopt.c
+    out_getopt.h
+Copyright: 1987, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99
+    Free Software Foundation, Inc.
+License: GPL-2.0+
 
-Copyright:
+Files: plugins/pppd.h
+Copyright: 1984-2000 Carnegie Mellon University
+License: BSD-4-clause-like
 
-PPTPd is released under the GPL. You should find a copy of the GPL in
-'/usr/share/common-licenses/GPL' on Debian systems.
+Files: vpnstats.pl
+Copyright: Scott Merrill (skippy@skippy.net)
+License: GPL-2.0+
+
+License: GPL-2.0+
+ 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; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package 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 version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+License: BSD-4-clause-like
+ 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.
+ .
+ 3. The name "Carnegie Mellon University" must not be used to
+    endorse or promote products derived from this software without
+    prior written permission. For permission or any legal
+    details, please contact
+      Office of Technology Transfer
+      Carnegie Mellon University
+      5000 Forbes Avenue
+      Pittsburgh, PA  15213-3890
+      (412) 268-4387, fax: (412) 268-7395
+      tech-transfer@andrew.cmu.edu
+ .
+ 4. Redistributions of any form whatsoever must retain the following
+    acknowledgment:
+    "This product includes software developed by Computing Services
+     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ .
+ CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

debian/dirs

@@ -1,4 +0,0 @@
-usr/sbin
-etc
-etc/ppp
-etc/init.d

debian/docs

@@ -1,8 +0,0 @@
-AUTHORS
-ChangeLog-0.8
-ChangeLog-0.9
-README
-README.inetd
-README.slirp
-README.bcrelay
-TODO 

debian/examples

@@ -1,3 +0,0 @@
-samples/chap-secrets
-samples/options.pptpd
-samples/pptpd.conf

debian/patches/build_plugin.patch

@@ -0,0 +1,15 @@
+Description: Fix plugin/Makefile for installation
+Author: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
+Forwarded: no
+
+--- a/plugins/Makefile
++++ b/plugins/Makefile
+@@ -18,7 +18,7 @@
+ %.so: %.c
+ 	$(CC) -o $@ $(LDFLAGS) $(CFLAGS) $^ $(LDADD)
+ 
+-LIBDIR	?= $(DESTDIR)$(prefix)/lib/pptpd
++LIBDIR	= $(DESTDIR)$(prefix)/lib/pptpd
+ 
+ install: $(PLUGINS)
+ 	$(INSTALL) -d $(LIBDIR)

debian/patches/series

@@ -1,4 +1,5 @@
 build_hardening-flags.patch
+build_plugin.patch
 
 debian-000000_invalid-ip-range.patch
 debian-369714_support-ppd-2.4.4.patch

debian/pptpd.dirs

@@ -1,4 +0,0 @@
-/usr/sbin
-/etc
-/etc/ppp
-/etc/init.d

debian/pptpd.examples

@@ -1,3 +0,0 @@
-samples/chap-secrets
-samples/options.pptpd
-samples/pptpd.conf

debian/pptpd.install

@@ -0,0 +1,11 @@
+
+usr/sbin/pptpctrl
+usr/share/man/man8/pptpctrl.8
+usr/sbin/pptpd
+usr/share/man/man8/pptpd.8
+
+debian/pptpd.conf               etc/
+usr/share/man/man5/pptpd.conf.5
+debian/pptpd-options            etc/ppp/
+
+usr/lib/pptpd/pptpd-logwtmp.so

debian/rules

@@ -1,88 +1,22 @@
 #!/usr/bin/make -f
-# MAde with the aid of dh_make, by Craig Small
-# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
-# Some lines taken from debmake, by Cristoph Lameter.
 
 export DEB_BUILD_HARDENING=1
 export CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
 export LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-export DH_COMPAT=4
-
-build: build-stamp
-build-stamp:
-	dh_testdir
+%:
+	dh $@
 
+override_dh_auto_configure:
 	autoreconf
-	./configure --prefix=/usr --mandir=/usr/share/man \
-		    --with-libwrap --enable-bcrelay
-	# Add here commands to compile the package.
-	$(MAKE) 
-
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp install-stamp
-	rm -f debian/conffiles
-
-	# Add here commands to clean up after the build process.
-	-$(MAKE) distclean
-
-	dh_clean
-
-install: install-stamp
-install-stamp: build-stamp
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
-	# Add here commands to install the package into debian/tmp.
-	$(MAKE) install prefix=`pwd`/debian/pptpd/usr mandir=`pwd`/debian/pptpd/usr/share/man 	
-	cp debian/pptpd.conf `pwd`/debian/pptpd/etc
-	cp debian/pptpd-options `pwd`/debian/pptpd/etc/ppp
-	#cp debian/pptpdconfig.pl `pwd`/debian/tmp/usr/sbin
-	# split bcrelay into its own package
-	mv debian/pptpd/usr/sbin/bcrelay debian/bcrelay/usr/sbin
-	
-	touch install-stamp
-
-# 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_testversion
-	dh_testdir
-	dh_testroot
-	dh_installdocs
-	dh_installexamples -ppptpd
-#	dh_installmenu
-#	dh_installemacsen
-	dh_installinit -ppptpd
-#	dh_installcron
-	dh_installman -ppptpd
-#	dh_installdebconf
-#	dh_undocumented
-	dh_installchangelogs -k ChangeLog
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-#	dh_makeshlibs
-	dh_md5sums
-	dh_builddeb
+	dh_auto_configure -- \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		--with-libwrap \
+		--enable-bcrelay
 
-source diff:                                                                  
-	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
+override_dh_install:
+	dh_install --fail-missing
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary
+override_dh_installdocs:
+	dh_installdocs --exclude=CVS --exclude=test.txt

debian/source/format

@@ -0,0 +1 @@
+3.0 (quilt)

debian/svn-deblayout

@@ -1,8 +0,0 @@
-buildArea=/home/rene/amw/src/packages/build-area
-origDir=/home/rene/amw/src/packages/tarballs
-origUrl=svn+ssh://svn.gibraltar.at/svn/debian-packages/trunk/debian/tarballs
-tagsUrl=svn+ssh://svn.gibraltar.at/svn/debian-packages/tags/pptpd
-trunkDir=/home/rene/amw/src/packages/pptpd
-trunkUrl=svn+ssh://svn.gibraltar.at/svn/debian-packages/trunk/debian/pptpd
-upsCurrentUrl=svn+ssh://svn.gibraltar.at/svn/debian-packages/branches/source-dist/debian/pptpd
-upsTagUrl=svn+ssh://svn.gibraltar.at/svn/debian-packages/tags/pptpd