diff -Nru cciss-vol-status-1.09/debian/changelog cciss-vol-status-1.09/debian/changelog --- cciss-vol-status-1.09/debian/changelog 2011-06-02 16:34:00.000000000 +0000 +++ cciss-vol-status-1.09/debian/changelog 2011-08-28 23:47:50.000000000 +0000 @@ -1,3 +1,13 @@ +cciss-vol-status (1.09-2) unstable; urgency=low + + * Switched to minimal rules file, to fix lintian warning + debian-rules-missing-recommended-target. + * Reformatted debian/copyright. Also fixes lintian pedantic check + copyright-refers-to-symlink-license. + * Add patch so the short form of the --persnickety is accepted. + + -- Christian Hofstaedtler Mon, 29 Aug 2011 01:23:05 +0200 + cciss-vol-status (1.09-1) unstable; urgency=low * New Upstream release 1.09 diff -Nru cciss-vol-status-1.09/debian/compat cciss-vol-status-1.09/debian/compat --- cciss-vol-status-1.09/debian/compat 2011-06-02 15:25:25.000000000 +0000 +++ cciss-vol-status-1.09/debian/compat 2011-08-28 23:06:37.000000000 +0000 @@ -1 +1 @@ -5 +8 diff -Nru cciss-vol-status-1.09/debian/control cciss-vol-status-1.09/debian/control --- cciss-vol-status-1.09/debian/control 2011-06-02 16:34:00.000000000 +0000 +++ cciss-vol-status-1.09/debian/control 2011-08-28 23:19:00.000000000 +0000 @@ -2,7 +2,7 @@ Section: admin Priority: extra Maintainer: Christian Hofstaedtler -Build-Depends: debhelper (>= 5), autotools-dev, autoconf, automake1.11 +Build-Depends: debhelper (>= 8), autotools-dev, autoconf, automake1.11 Build-Conflicts: autoconf2.13, automake1.4 Standards-Version: 3.9.2 Homepage: http://cciss.sourceforge.net/ diff -Nru cciss-vol-status-1.09/debian/copyright cciss-vol-status-1.09/debian/copyright --- cciss-vol-status-1.09/debian/copyright 2011-06-02 16:07:44.000000000 +0000 +++ cciss-vol-status-1.09/debian/copyright 2011-08-28 23:32:52.000000000 +0000 @@ -1,13 +1,16 @@ -This package was debianized by Christian Hofstaedtler - on Wed, 27 Aug 2008 17:52:21 +0200. +This work was packaged for Debian by: -It was downloaded from + Christian Hofstaedtler on Wed, 27 Aug 2008 17:52:21 +0200 -Upstream Author: +It was downloaded from: + + http://cciss.sourceforge.net/ + +Upstream Author: Stephen M. Cameron -Copyright: +Copyright: Copyright (C) 2006,2007 Hewlett-Packard Development Company, L.P. @@ -27,8 +30,12 @@ along with cciss_vol_status; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +On Debian systems, the complete text of the GNU General +Public License version 2 can be found in `/usr/share/common-licenses/GPL-2'. + +The Debian packaging is: -The Debian packaging is Copyright 2008,2009,2010,2011 Christian Hofstaedtler - and is licensed under the GPL, see -`/usr/share/common-licenses/GPL'. + Copyright 2008,2009,2010,2011 Christian Hofstaedtler +and is licensed under the GPL version 2 or (at your option) any later version, +see above. diff -Nru cciss-vol-status-1.09/debian/patches/allow_short_persnickety_option cciss-vol-status-1.09/debian/patches/allow_short_persnickety_option --- cciss-vol-status-1.09/debian/patches/allow_short_persnickety_option 1970-01-01 00:00:00.000000000 +0000 +++ cciss-vol-status-1.09/debian/patches/allow_short_persnickety_option 2011-08-28 23:42:13.000000000 +0000 @@ -0,0 +1,18 @@ +Description: short version of --persnickety didn't work +Author: Christian Hofstaedtler +Forwarded: no +Last-Update: 2011-08-29 + +diff --git a/cciss_vol_status.c b/cciss_vol_status.c +index 8d73ea6..f5e75ef 100644 +--- a/cciss_vol_status.c ++++ b/cciss_vol_status.c +@@ -2286,7 +2286,7 @@ int main(int argc, char *argv[]) + + do { + +- opt = getopt_long(argc, argv, "dqusvxC", longopts, NULL ); ++ opt = getopt_long(argc, argv, "dpqusvxC", longopts, NULL ); + switch (opt) { + case 'd': debug = 1; + continue; diff -Nru cciss-vol-status-1.09/debian/patches/series cciss-vol-status-1.09/debian/patches/series --- cciss-vol-status-1.09/debian/patches/series 2011-06-02 15:35:43.000000000 +0000 +++ cciss-vol-status-1.09/debian/patches/series 2011-08-28 23:47:50.000000000 +0000 @@ -1 +1,2 @@ fix-manpage +allow_short_persnickety_option diff -Nru cciss-vol-status-1.09/debian/rules cciss-vol-status-1.09/debian/rules --- cciss-vol-status-1.09/debian/rules 2011-06-02 15:25:25.000000000 +0000 +++ cciss-vol-status-1.09/debian/rules 2011-08-28 23:32:52.000000000 +0000 @@ -1,100 +1,12 @@ #!/usr/bin/make -f # -*- makefile -*- -# Sample debian/rules that uses debhelper. -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=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) - -confflags= -# FOR AUTOCONF 2.52 AND NEWER ONLY -ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) - confflags += --build $(DEB_HOST_GNU_TYPE) -else - confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) -endif - -configure-stamp: - dh_testdir - -ifneq "$(wildcard /usr/share/misc/config.sub)" "" - cp -f /usr/share/misc/config.sub config.sub -endif -ifneq "$(wildcard /usr/share/misc/config.guess)" "" - cp -f /usr/share/misc/config.guess config.guess -endif +%: + dh $@ --with autotools_dev +override_dh_auto_configure: AUTOMAKE=automake-1.11 autoreconf -i + dh_auto_configure - ./configure $(confflags) \ - --prefix=/usr --mandir=\$${prefix}/share/man \ - --infodir=\$${prefix}/share/info \ - CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" - - touch $@ - -build: build-stamp -build-stamp: configure-stamp - dh_testdir - - $(MAKE) - - touch $@ - -clean: - dh_testdir - dh_testroot - rm -f build-stamp configure-stamp - - [ ! -f Makefile ] || $(MAKE) distclean - rm -f config.sub config.guess configure config.log - rm -fr autom4te.cache - - rm -f Makefile.in aclocal.m4 - rm -f Makefile - rm -f depcomp install-sh missing config.h.in - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - $(MAKE) DESTDIR=$(CURDIR)/debian/cciss-vol-status install - - -# 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_installchangelogs ChangeLog +override_dh_installdocs: dh_installdocs -XREADME - dh_installexamples - dh_installman - dh_link - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install