Your message dated Wed, 27 Jun 2012 18:36:11 +0000
with message-id <[email protected]>
and subject line Bug#670729: fixed in starplot 0.95.5-5
has caused the Debian Bug report #670729,
regarding [PATCH] starplot: 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.)
--
670729: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=670729
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: starplot
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
I had some free time; see attached patch to migrate to new package
format. Note that all files in debian/patches/* are canocalized to
*.patch.
Let me know if there is anything that needs adjusting or if it is ok
to upload this version in a NMU in case you are working on other
issues needing attention.
Thanks,
Jari
>From c1a227a28b9a36f021dfc4cadbd8b497359e1c00 Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Sat, 28 Apr 2012 17:33:12 +0300
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 | 26 --------------------
debian/changelog | 10 ++++++++
debian/compat | 2 +-
debian/control | 4 +--
debian/copyright | 2 +-
debian/patches/00list | 2 --
..._file.dpatch => 01-starplot-desktop-file.patch} | 13 +++-------
...patch => 02-fix-ftbfs-and-hrdiagram-opts.patch} | 16 ++++--------
debian/patches/series | 2 ++
debian/rules | 14 +++++------
debian/source/format | 1 +
11 files changed, 31 insertions(+), 61 deletions(-)
delete mode 100644 debian/README.source
delete mode 100644 debian/patches/00list
rename debian/patches/{01-starplot_desktop_file.dpatch => 01-starplot-desktop-file.patch} (56%)
rename debian/patches/{02-fix-ftbfs-and-hrdiagram-opts.dpatch => 02-fix-ftbfs-and-hrdiagram-opts.patch} (86%)
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 b59f078..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,26 +0,0 @@
-This package uses dpatch to manage all modifications to the upstream
-source. Changes are stored in the source package as diffs in
-debian/patches and applied during the build.
-
-To get the fully patched source after unpacking the source package, cd
-to the root level of the source package and run:
-
- debian/rules patch
-
-Removing a patch is as simple as removing its entry from the
-debian/patches/00list file, and please also remove the patch file
-itself.
-
-Creating a new patch is done with "dpatch-edit-patch patch XX_patchname"
-where you should replace XX with a new number and patchname with a
-descriptive shortname of the patch. You can then simply edit all the
-files your patch wants to edit, and then simply "exit 0" from the shell
-to actually create the patch file.
-
-To tweak an already existing patch, call "dpatch-edit-patch XX_patchname"
-and replace XX_patchname with the actual filename from debian/patches
-you want to use.
-
-To clean up afterwards again, "debian/rules unpatch" will do the
-work for you - or you can of course choose to call
-"fakeroot debian/rules clean" all together.
diff --git a/debian/changelog b/debian/changelog
index 199d792..879ee6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+starplot (0.95.5-4.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt".
+ * Update to Standards-Version to 3.9.3 and debhelper to 9.
+ * Add required build-arch and build-indep targets to rules file.
+ * Fix copyright-refers-to-symlink-license (Lintian).
+
+ -- Jari Aalto <[email protected]> Sat, 28 Apr 2012 17:20:51 +0300
+
starplot (0.95.5-4) unstable; urgency=low
* Updated to Debian policy 3.8.3
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 5789513..17700ad 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: science
Priority: optional
Maintainer: Francisco Manuel Garcia Claramonte <[email protected]>
Uploaders: Javier Fernandez-Sanguino Pen~a <[email protected]>, Kevin B. McCarty <[email protected]>
-Build-Depends: debhelper (>> 7.0.0), libgtk2.0-dev, dpatch
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 9), libgtk2.0-dev
+Standards-Version: 3.9.3
Homepage: http://starplot.org
Package: starplot
diff --git a/debian/copyright b/debian/copyright
index 4f28dc0..736e3de 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -10,4 +10,4 @@ This software is copyright (c) 2000-2002 by Kevin B. McCarty.
You are free to distribute this software under the terms of
the GNU General Public License.
On Debian systems, the complete text of the GNU General Public
-License can be found in /usr/share/common-licenses/GPL file.
+License can be found in /usr/share/common-licenses/GPL-2 file.
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 32f01f9..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-01-starplot_desktop_file.dpatch
-02-fix-ftbfs-and-hrdiagram-opts.dpatch
diff --git a/debian/patches/01-starplot_desktop_file.dpatch b/debian/patches/01-starplot-desktop-file.patch
similarity index 56%
rename from debian/patches/01-starplot_desktop_file.dpatch
rename to debian/patches/01-starplot-desktop-file.patch
index db457a9..38386fa 100644
--- a/debian/patches/01-starplot_desktop_file.dpatch
+++ b/debian/patches/01-starplot-desktop-file.patch
@@ -1,14 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01-starplot_desktop_file.dpatch by Francisco Manuel García Claramonte
-## <[email protected]>
-##
-## DP: This patch updates the starplot.desktop file, with the with the
-## non-localized comment field.
-##
-## License: This patch is licensed under terms of GPL2, or (at your option)
-## any later version.
+From: Francisco Manuel García Claramonte
+Subject: This patch updates the starplot.desktop file, with the with the
+ non-localized comment field.
-@DPATCH@
diff -urNad starplot-0.95.5~/starplot.desktop starplot-0.95.5/starplot.desktop
--- starplot-0.95.5~/starplot.desktop 2008-03-05 00:05:42.000000000 +0100
+++ starplot-0.95.5/starplot.desktop 2008-12-03 13:22:02.000000000 +0100
diff --git a/debian/patches/02-fix-ftbfs-and-hrdiagram-opts.dpatch b/debian/patches/02-fix-ftbfs-and-hrdiagram-opts.patch
similarity index 86%
rename from debian/patches/02-fix-ftbfs-and-hrdiagram-opts.dpatch
rename to debian/patches/02-fix-ftbfs-and-hrdiagram-opts.patch
index ca166b8..84d4f06 100644
--- a/debian/patches/02-fix-ftbfs-and-hrdiagram-opts.dpatch
+++ b/debian/patches/02-fix-ftbfs-and-hrdiagram-opts.patch
@@ -1,15 +1,9 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02-fix-ftbfs-and-hrdiagram-opts.dpatch by Kamal Mostafa <[email protected]>
-##
-## DP: Fixes:
-## DP: - FTBFS - must call set_*_item() accessors, not set_item() template
-## DP: - Make HR Diagram window Options menu correctly reflect the state of
-## DP: the main window opts for Labels and Diameters on HR window startup.
-##
-## License: This patch is licensed under terms of GPL2, or (at your option)
-## any later version.
+From: Kamal Mostafa <[email protected]>
+Subject: FTBFS and HR diagram fixes
+ - FTBFS - must call set_*_item() accessors, not set_item() template
+ - Make HR Diagram window Options menu correctly reflect the state of
+ the main window opts for Labels and Diameters on HR window startup.
-@DPATCH@
=== modified file 'src/gui/hrdiagram.cc'
--- a/src/gui/hrdiagram.cc 2008-05-17 11:52:11 +0000
+++ b/src/gui/hrdiagram.cc 2010-01-07 18:17:30 +0000
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..65d35c2
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+01-starplot-desktop-file.patch
+02-fix-ftbfs-and-hrdiagram-opts.patch
diff --git a/debian/rules b/debian/rules
index 23e8c6b..b364702 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,9 +2,6 @@
# Sample debian/rules that uses debhelper.
# GNU copyright 1997 to 1999 by Joey Hess.
-include /usr/share/dpatch/dpatch.make
-
-
# DEB_BUILD_OPTIONS support
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS=-Wall -pedantic -O0 -g
@@ -13,7 +10,6 @@ else
endif
# "nostrip" is seen automatically by dh_strip
-# configure options as per autotools-dev usr/share/doc/README.Debian
export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -36,8 +32,12 @@ configure-stamp:
--htmldir=/usr/share/doc/starplot
touch configure-stamp
+
+build-arch: build
+build-indep: build
+
build: configure-stamp build-stamp
-build-stamp: patch-stamp
+build-stamp:
dh_testdir
# Add here commands to compile the package.
@@ -46,7 +46,7 @@ build-stamp: patch-stamp
docdir=/usr/share/doc/starplot mandir=/usr/share/man sysconfdir=/etc
touch build-stamp
-clean: unpatch
+clean:
dh_testdir
dh_testroot
# Add here commands to clean up after the build process.
@@ -67,8 +67,6 @@ install: build
mkdir -p $(CURDIR)/debian/starplot/usr/share/starplot/specfiles
install -m 0664 $(CURDIR)/debian/*.spec $(CURDIR)/debian/starplot/usr/share/starplot/specfiles
mv $(CURDIR)/debian/starplot/usr/share/doc/examples $(CURDIR)/debian/starplot/usr/share/doc/starplot/examples
- install $(CURDIR)/debian/README.source $(CURDIR)/debian/starplot/usr/share/doc/starplot/
-
binary-indep: build install
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.10
--- End Message ---
--- Begin Message ---
Source: starplot
Source-Version: 0.95.5-5
We believe that the bug you reported is fixed in the latest version of
starplot, which is due to be installed in the Debian FTP archive:
starplot_0.95.5-5.debian.tar.gz
to main/s/starplot/starplot_0.95.5-5.debian.tar.gz
starplot_0.95.5-5.dsc
to main/s/starplot/starplot_0.95.5-5.dsc
starplot_0.95.5-5_i386.deb
to main/s/starplot/starplot_0.95.5-5_i386.deb
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Francisco Manuel Garcia Claramonte <[email protected]> (supplier of updated
starplot package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.8
Date: Mon, 25 Jun 2012 11:25:50 +0200
Source: starplot
Binary: starplot
Architecture: source i386
Version: 0.95.5-5
Distribution: unstable
Urgency: low
Maintainer: Francisco Manuel Garcia Claramonte <[email protected]>
Changed-By: Francisco Manuel Garcia Claramonte <[email protected]>
Description:
starplot - 3-dimensional perspective star map viewer
Closes: 670729
Changes:
starplot (0.95.5-5) unstable; urgency=low
.
* Updated to Debian Policy 3.9.3
* Updated debhelper dependency to version 9
* Added build-arch and build-indep debian/rules targets
* Added source/format, 3.0 (quilt) file. Thanks to Jari Aalto
(Closes: #670729).
* Removed the unneeded dependency on dpatch.
* Updated debian/patches to quilt.
Checksums-Sha1:
6c25a781e9b095c7ba9e33f44267dcb81a42eee0 1207 starplot_0.95.5-5.dsc
d28b69f04c628bf3dd4417df79624418f717e0e8 14311 starplot_0.95.5-5.debian.tar.gz
7e0996219f5ca721a20d04a2e28ca3e684945a36 678226 starplot_0.95.5-5_i386.deb
Checksums-Sha256:
5a131b0ee19f502f55803856557eaddc255966e53077b4cebe23c4000e8421b0 1207
starplot_0.95.5-5.dsc
47ebf6f33d3bdaa1de8a247387a5181f207955fa5f533e2c852b80fc137c2743 14311
starplot_0.95.5-5.debian.tar.gz
275338a31c9c41bedc5809a6c4405ea9a4ae3254f55df39b562cbb8402447efc 678226
starplot_0.95.5-5_i386.deb
Files:
194a79ea6b811e89b90dedea406244ff 1207 science optional starplot_0.95.5-5.dsc
582f1b0dc4cda016e4b250b768833e29 14311 science optional
starplot_0.95.5-5.debian.tar.gz
20e81f091cf7d367fedb7f57815cdb30 678226 science optional
starplot_0.95.5-5_i386.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iEYEARECAAYFAk/rTpkACgkQmpU8glVqulHrqACgl2UiB6GaCnHin7gJQJVZDYPx
YtAAn1huvJlDjKVQeU2/wBY8cGKpopm4
=Q0JF
-----END PGP SIGNATURE-----
--- End Message ---
