Hi Doug,
On Sun, Nov 25, 2012 at 06:16:08AM +, Doug Torrance wrote:
> I've combined all of the changelog entries. This has the effect of the
> changelog skipping from 1.0b2-10 straight to 1.0b2-15. Is this okay?
It's not a problem.
> Please let me know if you have any more suggestions!
You are making good progress, but we aren't there yet, so here are more
suggestions :
Debian-policy http://packages.qa.debian.org/d/debian-policy.html is now
3.9.4.0, and we usually only mention the three first parts of the version
number, so I'd suggest to use 3.9.4 in debian/control. Two minor errors in
debian/patches/upstream_changes are that "upgradian" should probably be
"upgrading", and debian/compat is actually increased from 4 to 9, not from 7 to
9. About "simpifying debian/rules" I suggest that you have a look at the
attached file wmtime_simplified_rules.diff. The file debian/copyright is not
complete and accurate. You may want to your website as the current download
location. The license in general is GPL2, not GPL2+, see README and COPYING.
The file wmgeneral/misc.c is copyrighted by someone else, with GPL2+ as the
license. Also the files wmgeneral/list.c and wmgeneral/list.h are copyrighted
by someone else, with GPL2+ as the license, but also with an exception. The
debian/copyright file should point to /usr/share/common-licenses/GPL-2, not
/usr/share/common-licenses/GPL. And you may want to add copyright and license
information for the debian packaging. Lintian produced these messages:
W: wmtime source: package-needs-versioned-debhelper-build-depends 9
W: wmtime: hardening-no-relro usr/bin/wmtime
W: wmtime: hardening-no-fortify-functions usr/bin/wmtime
Which version of lintian did you use ? You should always use the newest version
from unstable. Also the build environment should only have packages from
unstable.
Regards,
Bart Martens
diff -ruN mentors/wmtime-1.0b2/debian/control wmtime-1.0b2/debian/control
--- mentors/wmtime-1.0b2/debian/control 2012-11-23 21:33:17.0 +
+++ wmtime-1.0b2/debian/control 2012-11-25 12:32:39.0 +
@@ -2,7 +2,7 @@
Section: x11
Priority: optional
Maintainer: Doug Torrance
-Build-Depends: debhelper (>= 7), libx11-dev, libxpm-dev, libxext-dev
+Build-Depends: debhelper (>= 9), libx11-dev, libxpm-dev, libxext-dev
Standards-Version: 3.9.3
Homepage: http://wmaker.friedcheese.org
Vcs-Browser: http://repo.or.cz/r/dockapps.git
diff -ruN mentors/wmtime-1.0b2/debian/install wmtime-1.0b2/debian/install
--- mentors/wmtime-1.0b2/debian/install 1970-01-01 00:00:00.0 +
+++ wmtime-1.0b2/debian/install 2012-11-25 12:25:02.0 +
@@ -0,0 +1 @@
+wmtime/wmtime usr/bin/
diff -ruN mentors/wmtime-1.0b2/debian/rules wmtime-1.0b2/debian/rules
--- mentors/wmtime-1.0b2/debian/rules 2012-11-23 21:33:17.0 +
+++ wmtime-1.0b2/debian/rules 2012-11-25 12:33:05.0 +
@@ -1,97 +1,13 @@
#!/usr/bin/make -f
-#
-# debian/rules file for wmtime.
-# Copyright (C) 2003 Software in the Public Interest.
-#
-# 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.
-#
-# 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., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
-# Based on the sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+%:
+ dh $@
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -g
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
-endif
-
-build: build-arch build-indep
-
-build-arch: build-stamp
-
-build-indep: build-stamp
-
-build-stamp:
- dh_testdir
-
- cd wmtime; $(MAKE)
-
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp
-
- -cd wmtime; $(MAKE) clean
+override_dh_auto_build:
+ dh_auto_build
+ cd wmtime && make
+override_dh_clean:
dh_clean
+ cd wmtime && make clean || true
-install: build
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs
-
- install -m 755 wmtime/wmtime $(CURDIR)/debian/wmtime/usr/bin
-
-# 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_installdebconf
- dh_installdocs
- dh_installexamples
- dh_installmenu
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_installinit
-# dh_installcron
- dh_inst
