Your message dated Fri, 27 Jun 2014 15:02:03 +0200 with message-id <[email protected]> and subject line Re: Bug#664434: [PATCH] opensm: Helping to update to packaging format 3.0 has caused the Debian Bug report #664434, regarding [PATCH] opensm: Helping to update to packaging format 3.0 to be marked as done.
This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact [email protected] immediately.) -- 664434: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=664434 Debian Bug Tracking System Contact [email protected] with problems
--- Begin Message ---Package: opensm Severity: wishlist Tags: patch Hi, The dpatch patch management system has been deprecated for some time. The Lintian currently flags use of dpatch packages as an error. The new 3.0 packaging format is an improved version which, among other things, contains patch management built-in. For more information, see: http://wiki.debian.org/Projects/DebSrc3.0 Benoit, as we spoke before, here is the proposed NMU patch. Let me know if there is anything that needs adjusting or if it is ok to upload with these changes. Thanks, Jari>From 33188eeb6a47ee176ba24bb9255ed30800db8b04 Mon Sep 17 00:00:00 2001 From: Jari Aalto <[email protected]> Date: Wed, 29 Feb 2012 13:01:16 -0500 Subject: [PATCH] format-3.0 Organization: Private Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Signed-off-by: Jari Aalto <[email protected]> --- debian/README.source | 1 - debian/changelog | 9 ++++ debian/compat | 2 +- debian/control | 4 +- debian/patches/00list | 1 - ....dpatch => 01_gcc_4.4_else_in_place_elif.patch} | 8 +--- debian/patches/series | 1 + debian/rules | 43 ++++++++++++------- debian/source/format | 1 + 9 files changed, 43 insertions(+), 27 deletions(-) delete mode 100644 debian/README.source delete mode 100644 debian/patches/00list rename debian/patches/{01_gcc_4.4_else_in_place_elif.dpatch => 01_gcc_4.4_else_in_place_elif.patch} (61%) create mode 100644 debian/patches/series create mode 100644 debian/source/format diff --git a/debian/README.source b/debian/README.source deleted file mode 100644 index 1c919f0..0000000 --- a/debian/README.source +++ /dev/null @@ -1 +0,0 @@ -/usr/share/doc/dpatch/README.source.gz diff --git a/debian/changelog b/debian/changelog index db6a0c3..392980a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +opensm (3.2.6-20090317-2.2) unstable; urgency=low + + * Non-maintainer upload. + * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt". + * in debian/rules save and restore changed original files. + * Update to Standards-Version to 3.9.3 and debhelper to 9. + + -- Jari Aalto <[email protected]> Wed, 29 Feb 2012 12:57:05 -0500 + opensm (3.2.6-20090317-2.1) unstable; urgency=low * Non-maintainer upload. diff --git a/debian/compat b/debian/compat index 7f8f011..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +9 diff --git a/debian/control b/debian/control index c5264ed..e9f553c 100644 --- a/debian/control +++ b/debian/control @@ -3,8 +3,8 @@ Section: net Priority: extra Maintainer: OFED and Debian Developement and Discussion <[email protected]> Uploaders: Benoit Mortier <[email protected]>, Guy Coates <[email protected]>, Mario Lang <[email protected]> -Build-Depends: debhelper (>= 7), autotools-dev, dpatch, flex, bison, libibumad-dev, libibcommon-dev -Standards-Version: 3.8.3 +Build-Depends: debhelper (>= 9), autotools-dev, flex, bison, libibumad-dev, libibcommon-dev +Standards-Version: 3.9.3 Homepage: http://www.openfabrics.org Package: opensm diff --git a/debian/patches/00list b/debian/patches/00list deleted file mode 100644 index bab3561..0000000 --- a/debian/patches/00list +++ /dev/null @@ -1 +0,0 @@ -01_gcc_4.4_else_in_place_elif diff --git a/debian/patches/01_gcc_4.4_else_in_place_elif.dpatch b/debian/patches/01_gcc_4.4_else_in_place_elif.patch similarity index 61% rename from debian/patches/01_gcc_4.4_else_in_place_elif.dpatch rename to debian/patches/01_gcc_4.4_else_in_place_elif.patch index e687120..db8d209 100644 --- a/debian/patches/01_gcc_4.4_else_in_place_elif.dpatch +++ b/debian/patches/01_gcc_4.4_else_in_place_elif.patch @@ -1,10 +1,6 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 01_gcc_4.4_else_in_place_elif.dpatch by <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: replace solo elif by else for gcc => 4.4 +From: <[email protected]> +Subject: replace solo elif by else for gcc => 4.4 -@DPATCH@ --- trunk/include/vendor/osm_vendor.h 2009-12-21 11:16:55.000000000 +0100 +++ trunk/include/vendor/osm_vendor.h.new 2009-12-21 11:23:38.000000000 +0100 diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..179e89f --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +01_gcc_4.4_else_in_place_elif.patch diff --git a/debian/rules b/debian/rules index 026af99..61ad7bb 100755 --- a/debian/rules +++ b/debian/rules @@ -20,11 +20,27 @@ else CROSS= --build $(DEB_BUILD_GNU_TYPE) endif - - -config.status: patch configure +# Generated files +KEEP_FILES = \ + Makefile.in \ + aclocal.m4 \ + complib/Makefile.in \ + configure \ + include/Makefile.in \ + include/config.h.in \ + libvendor/Makefile.in \ + opensm/Makefile.in \ + opensm/osm_qos_parser_l.c \ + osmeventplugin/Makefile.in \ + osmtest/Makefile.in + +config.status: configure dh_testdir - # Add here commands to configure the package. + # Save original files + for f in $(KEEP_FILES); \ + do \ + cp -a $$f $$f.orig ; \ + done ./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" \ --sysconfdir=/etc --localstatedir=/var/run @@ -39,8 +55,7 @@ build-stamp: config.status touch $@ -clean: clean-patched unpatch -clean-patched: +clean: dh_testdir dh_testroot rm -f build-stamp @@ -48,24 +63,20 @@ clean-patched: # Add here commands to clean up after the build process. [ ! -f Makefile ] || $(MAKE) distclean rm -f config.sub config.guess + # Restore original files + for f in $(KEEP_FILES); \ + do \ + [ ! -f $$f.orig ] || mv $$f.orig $$f ; \ + done -find $(CURDIR) -type d -name ".svn" -exec rm -rf {} \; dh_clean -patch: patch-stamp -patch-stamp: - dpatch apply-all - dpatch cat-all >patch-stamp - -unpatch: - dpatch deapply-all - rm -rf patch-stamp debian/patched - install: build dh_testdir dh_testroot - dh_prep + dh_prep dh_installdirs # Add here commands to install the package into debian/opensm. diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) -- 1.7.9
--- End Message ---
--- Begin Message ---Source-Version: 3.3.15-2 This was fixed in the last upload to experimental. On Sat, Mar 17, 2012 at 02:49:29PM -0400, [email protected] wrote: > Package: opensm > Severity: wishlist > Tags: patch > > Hi, > > The dpatch patch management system has been deprecated for some time. The > Lintian currently flags use of dpatch packages as an error. The new 3.0 > packaging format is an improved version which, among other things, contains > patch management built-in. For more information, see: > > http://wiki.debian.org/Projects/DebSrc3.0 > > Benoit, as we spoke before, here is the proposed NMU patch. >
--- End Message ---
