Package: wmnet
Version: 1.06-1.2
Severity: normal
Tags: patch  pending

Dear maintainer,

I've prepared an salvaging upload for wmnet (versioned as 1.06-2) and
uploaded it to DELAYED/7. Please feel free to tell me if I
should delay it longer.

Regards.

-- 
`What a good friend you are to him, Dr. Maturin. His other friends are
so grateful to you.'
`I sew his ears on from time to time, sure'
diff -Nru wmnet-1.06/debian/changelog wmnet-1.06/debian/changelog
--- wmnet-1.06/debian/changelog	2022-01-06 14:13:30.000000000 +0100
+++ wmnet-1.06/debian/changelog	2022-01-29 15:18:41.000000000 +0100
@@ -1,3 +1,18 @@
+wmnet (1.06-2) unstable; urgency=medium
+
+  * Adopt/salvage package under Debian Window Maker Team umbrella.
+    Closes: #1003227
+  * Run wrap-and-sort -ast.
+  * Bump to dh level 13.
+  * Use dh sequencer.
+  * Set Rules-Requires-Root: no.
+  * Update watchfile and homepage, point to www.dockapps.net.
+  * Add Vcs-* fields to control.
+  * Add DEP5 copyright.
+  * Fix hardening build. Closes: #668014
+
+ -- Andreas Metzler <ametz...@debian.org>  Sat, 29 Jan 2022 15:18:41 +0100
+
 wmnet (1.06-1.2) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru wmnet-1.06/debian/control wmnet-1.06/debian/control
--- wmnet-1.06/debian/control	2022-01-06 14:07:33.000000000 +0100
+++ wmnet-1.06/debian/control	2022-01-08 14:31:56.000000000 +0100
@@ -1,16 +1,30 @@
 Source: wmnet
 Section: x11
 Priority: optional
-Maintainer: Martin Lazar <mla...@email.cz>
-Standards-Version: 3.9.3
-Build-Depends: debhelper-compat (= 12), libx11-dev, libxext-dev, xutils-dev
-Homepage: http://www.katharineosborne.com/wmnet/
+Maintainer: Debian Window Maker Team <team+wma...@tracker.debian.org>
+Uploaders:
+ Andreas Metzler <ametz...@debian.org>,
+Standards-Version: 4.6.0
+Build-Depends:
+ debhelper-compat (= 13),
+ libx11-dev,
+ libxext-dev,
+ xutils-dev,
+Rules-Requires-Root: no
+Homepage: https://www.dockapps.net/wmnet
+Vcs-Browser: https://salsa.debian.org/wmaker-team/wmnet
+Vcs-Git: https://salsa.debian.org/wmaker-team/wmnet.git
 
 Package: wmnet
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, netbase
-Recommends: xfonts-base
-Suggests: wmaker
+Depends:
+ netbase,
+ ${misc:Depends},
+ ${shlibs:Depends},
+Recommends:
+ xfonts-base,
+Suggests:
+ wmaker,
 Description: network monitor for WindowMaker
  This little  program polls network  statistics and does a  few things
  with the  data it  gets. The speedometer  keeps track of  the current
diff -Nru wmnet-1.06/debian/copyright wmnet-1.06/debian/copyright
--- wmnet-1.06/debian/copyright	2012-03-11 13:12:50.000000000 +0100
+++ wmnet-1.06/debian/copyright	2022-01-08 14:52:52.000000000 +0100
@@ -1,27 +1,46 @@
-This package was debianized by Philipp Frauenfelder <pfrau...@debian.org> on
-Wed, 29 Jul 1998 21:53:48 +0200.
-
-It is now maintained by Martin Lazar <mla...@email.cz>
-
-It was downloaded from http://isufug.ee.iastate.edu/~joff/wmnet.html,
-then http://www.katharineosborne.com/wmnet/,
-now at http://dockapps.windowmaker.org/file.php/id/77
-
-wmnet was created by Jesse B. Off <j...@iastate.edu> and is upstream
-maintained by Katharine Osborne <kaos@dig‐italkaos.net>.
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: wmnet
+Upstream-Contact: Window Maker Developers Team <wmaker-...@googlegroups.com>
+Source: https://www.dockapps.net/wmnet
 
+Files: *
 Copyright:
-
     1998 Jesse B. Off  <j...@iastate.edu>
     2000 Katharine Osborne <k...@digitalkaos.net>
+License: GPL
 
-Licence:
-
-    This software is released under the GNU General Public License agreement.
-    No warranties, whatever.... you know the usuals.... this is free
-    software.  if you use it, great... if you wanna make a change to it,
-    great, but please send me the diff.  
-
-On a Debian system the complete text of the GNU General Public License
-can be found in the file `/usr/share/common-licenses/GPL'
+Files: getopt1.c getopt.c getopt.h
+Copyright: 1987,88,89,90,91,92,93,94,96,97 Free Software Foundation, Inc.
+License: GPL-2+
 
+Files: debian/*
+Copyright:
+ 1998-2006 Philipp Frauenfelder <pfrau...@debian.org>
+ 2007-2008 Sandro Tosi <matrixh...@gmail.com>
+ 2012 Martin Lazar <mla...@email.cz>
+ 2022 Andreas Metzler <ametz...@debian.org>
+License: GPL-2+
+
+License: GPL
+ This software is released under the GNU General Public License agreement.
+ No warranties, whatever.... you know the usuals.... this is free
+ software.  if you use it, great... if you wanna make a change to it,
+ great, but please send me the diff.
+ .
+ On a Debian system the complete text of the GNU General Public License
+ can be found in the file `/usr/share/common-licenses/GPL'
+
+
+License: GPL-2+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version.
+ .
+ The GNU C Library 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
+ Library General Public License for more details.
+ .
+ On a Debian system the complete text of the GNU General Public License
+ version 2 can be found in the file `/usr/share/common-licenses/GPL-2
diff -Nru wmnet-1.06/debian/dirs wmnet-1.06/debian/dirs
--- wmnet-1.06/debian/dirs	2012-03-03 20:19:16.000000000 +0100
+++ wmnet-1.06/debian/dirs	1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-usr/bin
-usr/share/man/man1
diff -Nru wmnet-1.06/debian/gbp.conf wmnet-1.06/debian/gbp.conf
--- wmnet-1.06/debian/gbp.conf	1970-01-01 01:00:00.000000000 +0100
+++ wmnet-1.06/debian/gbp.conf	2022-01-08 13:47:58.000000000 +0100
@@ -0,0 +1,8 @@
+[DEFAULT]
+  debian-branch = debian
+
+[import-orig]
+  pristine-tar = True
+
+[buildpackage]
+  pristine-tar = True
diff -Nru wmnet-1.06/debian/rules wmnet-1.06/debian/rules
--- wmnet-1.06/debian/rules	2022-01-06 14:08:58.000000000 +0100
+++ wmnet-1.06/debian/rules	2022-01-11 09:25:21.000000000 +0100
@@ -1,59 +1,11 @@
 #!/usr/bin/make -f
-# Made with the aid of debmake, by Christoph Lameter,
-# based on the sample debian/rules file for GNU hello by Ian Jackson.
-# Handmodified by P. Frauenfelder for debhelper support, 5 Sept 1998
 
-build: build-arch build-indep
-build-arch: build-stamp
-build-indep: build-stamp
-build-stamp:
-	dh_testdir
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
+override_dh_auto_build:
 	xmkmf
-	make
+	dh_auto_build --verbose -- \
+		CCLINK="$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)"
 
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
-
-	xmkmf
-	make clean
-	
-	rm Makefile
-
-	dh_prep
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep 
-	dh_installdirs
-
-	make install DESTDIR=$(CURDIR)/debian/wmnet
-
-binary-indep: build install
-# There are no architecture-independent files to be uploaded
-# generated by this package.  If there were any they would be
-# made here.
-
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs	Changelog
-	dh_installdocs		README
-	dh_installmenu
-	dh_installman		wmnet.man
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: binary binary-arch binary-indep clean build install
+%:
+	dh $@
diff -Nru wmnet-1.06/debian/watch wmnet-1.06/debian/watch
--- wmnet-1.06/debian/watch	2012-03-03 20:19:16.000000000 +0100
+++ wmnet-1.06/debian/watch	2022-01-08 14:09:12.000000000 +0100
@@ -1,2 +1,2 @@
-version=3
-http://www.katharineosborne.com/wmnet/ wmnet-([\d\.]*).tar.gz
+version=4
+https://www.dockapps.net/@PACKAGE@ /download/@PACKAGE@@ANY_VERSION@@ARCHIVE_EXT@
diff -Nru wmnet-1.06/debian/wmnet.docs wmnet-1.06/debian/wmnet.docs
--- wmnet-1.06/debian/wmnet.docs	1970-01-01 01:00:00.000000000 +0100
+++ wmnet-1.06/debian/wmnet.docs	2022-01-08 13:57:55.000000000 +0100
@@ -0,0 +1 @@
+README
diff -Nru wmnet-1.06/debian/wmnet.manpages wmnet-1.06/debian/wmnet.manpages
--- wmnet-1.06/debian/wmnet.manpages	1970-01-01 01:00:00.000000000 +0100
+++ wmnet-1.06/debian/wmnet.manpages	2022-01-08 13:56:37.000000000 +0100
@@ -0,0 +1 @@
+wmnet.man

Attachment: signature.asc
Description: PGP signature

Reply via email to