Bug#670953: [PATCH] pork: Helping to update to packaging format 3.0

2012-05-07 Thread Jari Aalto

Here are some more fixes included in upload. Alternatively you
can download the archive from Debian with all the changes.

Thank you for helping with this update,
Jari

From b95f08c496067c9daae4ae3a712ebb213d3bc482 Mon Sep 17 00:00:00 2001
From: Jari Aalto jari.aa...@cante.net
Date: Sat, 5 May 2012 22:05:38 +0300
Subject: [PATCH] nmu
Organization: Private
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jari Aalto jari.aa...@cante.net
---
 debian/changelog |   10 ++
 .../{01-fix-makefile.patch = 004-fix-makefile.patch}|0
 debian/patches/series|2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)
 rename debian/patches/{01-fix-makefile.patch = 004-fix-makefile.patch} (100%)

diff --git a/debian/changelog b/debian/changelog
index 2d41be0..b5a091c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,15 +1,17 @@
 pork (0.99.8.1-2.1) unstable; urgency=low
 
-  * Non-maintainer upload.
-  * Remove deprecated dpatch and upgrade to packaging format 3.0 quilt.
+  * Non-maintainer upload; ACKed by the maintainer, see #670953.
+  * Remove deprecated dpatch and upgrade to packaging format 3.0 quilt
+(Closes: #670953).
   * Update to Standards-Version to 3.9.3 and debhelper to 9.
-  * Add build-arch and build-indep targets; use dh_prep in rules file.
+  * Add build-arch and build-indep targets; use dh_prep;
+adjust better config.* file handling in rules file.
   * Fix copyright-refers-to-symlink-license (Lintian).
   * Fix debian-rules-ignores-make-clean-error (Lintian).
   * Fix copyright-without-copyright-notice (Lintian).
   * Fix no-homepage-field (Lintian).
 
- -- Jari Aalto jari.aa...@cante.net  Mon, 30 Apr 2012 20:47:25 +0300
+ -- Jari Aalto jari.aa...@cante.net  Sat, 05 May 2012 22:05:24 +0300
 
 pork (0.99.8.1-2) unstable; urgency=low
 
diff --git a/debian/patches/01-fix-makefile.patch b/debian/patches/004-fix-makefile.patch
similarity index 100%
rename from debian/patches/01-fix-makefile.patch
rename to debian/patches/004-fix-makefile.patch
diff --git a/debian/patches/series b/debian/patches/series
index 0c8043d..e0c0568 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
 001-fix-msg-types-upstream.patch
 002-wireless-upstream.patch
 003-blist-toggle-focus-upstream.patch
-01-fix-makefile.patch
+004-fix-makefile.patch
-- 
1.7.10



Bug#670953: [PATCH] pork: Helping to update to packaging format 3.0

2012-05-01 Thread Benjamin Seidenberg
On 04/30/2012 11:00 AM, jari.aa...@cante.net wrote:
 Package: pork
 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

   
I will be unable to review this patch in a timely manner.  Please feel
free to do an NMU with the appropriate due diligence.

Benjamin



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#670953: [PATCH] pork: Helping to update to packaging format 3.0

2012-04-30 Thread jari . aalto
Package: pork
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 9e55977a6ad6f8c776a5a728a8ca47f0e5cb6b85 Mon Sep 17 00:00:00 2001
From: Jari Aalto jari.aa...@cante.net
Date: Mon, 30 Apr 2012 20:52:51 +0300
Subject: [PATCH] format-3.0
Organization: Private
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jari Aalto jari.aa...@cante.net
---
 debian/changelog   |   13 
 debian/compat  |2 +-
 debian/control |5 +--
 debian/copyright   |   12 ---
 ...eam.dpatch = 001-fix-msg-types-upstream.patch} |8 ++---
 ...upstream.dpatch = 002-wireless-upstream.patch} |8 ++---
 ...patch = 003-blist-toggle-focus-upstream.patch} |8 ++---
 debian/patches/00list  |4 ---
 ...1_fix_makefile.dpatch = 01-fix-makefile.patch} |8 ++---
 debian/patches/series  |4 +++
 debian/rules   |   33 +---
 debian/source/format   |1 +
 12 files changed, 45 insertions(+), 61 deletions(-)
 rename debian/patches/{001_fix-msg-types_upstream.dpatch = 001-fix-msg-types-upstream.patch} (76%)
 rename debian/patches/{002_wireless_upstream.dpatch = 002-wireless-upstream.patch} (93%)
 rename debian/patches/{003_blist_toggle_focus_upstream.dpatch = 003-blist-toggle-focus-upstream.patch} (83%)
 delete mode 100644 debian/patches/00list
 rename debian/patches/{01_fix_makefile.dpatch = 01-fix-makefile.patch} (81%)
 create mode 100644 debian/patches/series
 create mode 100644 debian/source/format

diff --git a/debian/changelog b/debian/changelog
index 99dae3d..2d41be0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+pork (0.99.8.1-2.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 build-arch and build-indep targets; use dh_prep in rules file.
+  * Fix copyright-refers-to-symlink-license (Lintian).
+  * Fix debian-rules-ignores-make-clean-error (Lintian).
+  * Fix copyright-without-copyright-notice (Lintian).
+  * Fix no-homepage-field (Lintian).
+
+ -- Jari Aalto jari.aa...@cante.net  Mon, 30 Apr 2012 20:47:25 +0300
+
 pork (0.99.8.1-2) unstable; urgency=low
 
   * Remove dependency on automake1.8 (Closes: #473353) 
diff --git a/debian/compat b/debian/compat
index b8626c4..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+9
diff --git a/debian/control b/debian/control
index b129fac..ee77d58 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,9 @@ Source: pork
 Section: net
 Priority: optional
 Maintainer: Benjamin Seidenberg benja...@debian.org
-Build-Depends: debhelper ( 4.0.0), libncurses5-dev, libperl-dev, dpatch, automake, autoconf
-Standards-Version: 3.7.0
+Build-Depends: debhelper (= 9), libncurses5-dev, libperl-dev, automake, autoconf
+Standards-Version: 3.9.3
+Homepage: http://freecode.com/projects/pork
 
 Package: pork
 Architecture: any
diff --git a/debian/copyright b/debian/copyright
index f091762..0481f28 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,17 +1,19 @@
 This package was debianized by Ari Pollak a...@debian.org on
 Sat, 19 Apr 2003 21:21:51 -0400.
 
-It was downloaded from http//dev.ojnk.net
+It was downloaded from http://dev.ojnk.net
 
 The package was adopted by Benjamin Seidenberg astro...@dlgeek.net on
 Mon, 1 May 2006 22:25:25 -0400. Any changes past version 0.99.7-2 are his.
 
 Upstream Authors:
-Ryan McCabe r...@numb.org
-Amber Adams am...@ojnk.net
+
+Copyright (C) 2002-2005 Ryan McCabe r...@numb.org
+Copyright (C) 2002-2004 Amber Adams am...@ojnk.net
 
 Copyright:
 
-Its license is GPLv2, which, on Debian systems, is available at:
-/usr/share/common-licenses/GPL.
+Its license is GPL-2+.
 
+On Debian systems, the complete text of the GNU General
+Public License can be found in /usr/share/common-licenses/GPL-2.
diff --git a/debian/patches/001_fix-msg-types_upstream.dpatch b/debian/patches/001-fix-msg-types-upstream.patch
similarity index 76%
rename from debian/patches/001_fix-msg-types_upstream.dpatch
rename to