[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#664324: marked as done ([PATCH] popfile: Helping to update to packaging format 3.0)

Your message dated Tue, 20 Mar 2012 10:54:08 +0000
with message-id <[🔎] E1S9whc-0003Ha-32@franck.debian.org>
and subject line Bug#664503: Removed package(s) from unstable
has caused the Debian Bug report #664324,
regarding [PATCH] popfile: 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 owner@bugs.debian.org
immediately.)


-- 
664324: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=664324
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: popfile
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 434b63526c9577a12d2b6dc75ca379346b505964 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aalto@cante.net>
Date: Sun, 26 Feb 2012 17:00:25 -0500
Subject: [PATCH] format-3.0
Organization: Private
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit

Signed-off-by: Jari Aalto <jari.aalto@cante.net>
---
 Makefile                                           |   27 --------------
 debian/changelog                                   |   13 +++++++
 debian/compat                                      |    2 +-
 debian/control                                     |    4 +-
 debian/patches/00list                              |    2 -
 ...n_config.dpatch => 01_fullpath_in_config.patch} |    9 +----
 debian/patches/01_logdir.dpatch                    |   20 -----------
 debian/patches/01_logdir.patch                     |   19 ++++++++++
 ...rator.dpatch => 01_server_user_separator.patch} |    9 +----
 debian/patches/02_sqlite2.dpatch                   |   30 ----------------
 debian/patches/02_sqlite2.patch                    |   28 +++++++++++++++
 debian/patches/10_makefile.patch                   |   37 ++++++++++++++++++++
 debian/patches/series                              |    3 ++
 debian/popfile.manpages                            |    6 ++--
 debian/rules                                       |    7 ++--
 debian/source/format                               |    1 +
 {debian_wrappers => debian/wrappers}/popfile-bayes |    0
 .../wrappers}/popfile-bayes.8                      |    0
 .../wrappers}/popfile-insert                       |    0
 .../wrappers}/popfile-insert.8                     |    0
 {debian_wrappers => debian/wrappers}/popfile-pipe  |    0
 .../wrappers}/popfile-pipe.8                       |    0
 .../wrappers/start_popfile.sh                      |    0
 23 files changed, 114 insertions(+), 103 deletions(-)
 delete mode 100644 Makefile
 delete mode 100644 debian/patches/00list
 rename debian/patches/{01_fullpath_in_config.dpatch => 01_fullpath_in_config.patch} (96%)
 delete mode 100644 debian/patches/01_logdir.dpatch
 create mode 100644 debian/patches/01_logdir.patch
 rename debian/patches/{01_server_user_separator.dpatch => 01_server_user_separator.patch} (77%)
 delete mode 100644 debian/patches/02_sqlite2.dpatch
 create mode 100644 debian/patches/02_sqlite2.patch
 create mode 100644 debian/patches/10_makefile.patch
 create mode 100644 debian/patches/series
 create mode 100644 debian/source/format
 rename {debian_wrappers => debian/wrappers}/popfile-bayes (100%)
 rename {debian_wrappers => debian/wrappers}/popfile-bayes.8 (100%)
 rename {debian_wrappers => debian/wrappers}/popfile-insert (100%)
 rename {debian_wrappers => debian/wrappers}/popfile-insert.8 (100%)
 rename {debian_wrappers => debian/wrappers}/popfile-pipe (100%)
 rename {debian_wrappers => debian/wrappers}/popfile-pipe.8 (100%)
 rename start_popfile.sh => debian/wrappers/start_popfile.sh (100%)

diff --git a/Makefile b/Makefile
deleted file mode 100644
index e6b34a9..0000000
--- a/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-
-.PHONY: all install clean
-
-all:
-	cp v*.change changelog
-
-install:
-	cp *.gif *.pl *.sh $(DESTDIR)/usr/share/popfile/
-	cp stopwords popfile.pck $(DESTDIR)/usr/share/popfile/
-	chmod +x $(DESTDIR)/usr/share/popfile/*.pl \
-		$(DESTDIR)/usr/share/popfile/*.sh
-	cp -Rf Classifier $(DESTDIR)/usr/share/popfile/
-	cp -Rf POPFile $(DESTDIR)/usr/share/popfile/
-	cp -Rf Proxy $(DESTDIR)/usr/share/popfile/
-	cp -Rf UI $(DESTDIR)/usr/share/popfile/
-	cp -Rf languages $(DESTDIR)/usr/share/popfile/
-	cp -Rf manual $(DESTDIR)/usr/share/doc/popfile/
-	cp -Rf skins $(DESTDIR)/usr/share/popfile/
-	cp -Rf debian_wrappers/popfile-bayes $(DESTDIR)/usr/sbin/
-	cp -Rf debian_wrappers/popfile-insert $(DESTDIR)/usr/sbin/
-	cp -Rf debian_wrappers/popfile-pipe $(DESTDIR)/usr/sbin/
-	chmod +x $(DESTDIR)/usr/sbin/*
-
-clean:
-	rm -f changelog
-
-
diff --git a/debian/changelog b/debian/changelog
index efa7434..9916ffd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+popfile (0.22.4-3) unstable; urgency=low
+
+  * QA upload.
+  * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt".
+  * Update to Standards-Version to 3.9.3 and debhelper to 9.
+  * Note: some patches were updated with "quilt refresh" to make patches
+    apply cleanly. Converted in-line patches to debian/patches.
+  * Relocate all files that were added to sources: wrappers, manual
+    pages and binaries under debian/wrappers. Convert added Makefile into
+    patch 10.
+
+ -- Jari Aalto <jari.aalto@cante.net>  Sun, 26 Feb 2012 16:59:31 -0500
+
 popfile (0.22.4-2) unstable; urgency=low
 
   * QA upload  
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index 869ff27..cba1943 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: popfile
 Section: mail
 Priority: optional
 Maintainer: Debian QA Group <packages@qa.debian.org>
-Build-Depends: debhelper (>> 8), dpatch, po-debconf
-Standards-Version: 3.6.2
+Build-Depends: debhelper (>= 9), po-debconf
+Standards-Version: 3.9.3
 Homepage: http://popfile.sourceforge.net/
 
 Package: popfile
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 782e24e..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-01_logdir
-02_sqlite2
diff --git a/debian/patches/01_fullpath_in_config.dpatch b/debian/patches/01_fullpath_in_config.patch
similarity index 96%
rename from debian/patches/01_fullpath_in_config.dpatch
rename to debian/patches/01_fullpath_in_config.patch
index b80d76f..6419fb3 100644
--- a/debian/patches/01_fullpath_in_config.dpatch
+++ b/debian/patches/01_fullpath_in_config.patch
@@ -1,11 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-# vim: ft=diff
-## 01_fullpath_in_config.dpatch by Lucas Wall <kthulhu@kadath.com.ar>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Allows full paths to dirs in config file (bug: #268410)
+From: Lucas Wall <kthulhu@kadath.com.ar>
+Subject: Allows full paths to dirs in config file (bug: #268410)
 
-@DPATCH@
 diff -urNad /home/kthulhu/linux/svndeb/popfile/UI/HTML.pm popfile/UI/HTML.pm
 --- /home/kthulhu/linux/svndeb/popfile/UI/HTML.pm	2004-04-22 22:56:30.000000000 -0300
 +++ popfile/UI/HTML.pm	2004-08-28 02:12:55.000000000 -0300
diff --git a/debian/patches/01_logdir.dpatch b/debian/patches/01_logdir.dpatch
deleted file mode 100644
index 5ecf2e3..0000000
--- a/debian/patches/01_logdir.dpatch
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-# vim: ft=diff
-## 01_logdir.dpatch by Lucas Wall <kthulhu@kadath.com.ar>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Changes log directory
-
-@DPATCH@
-
---- popfile-0.21.1.orig/POPFile/Logger.pm
-+++ popfile-0.21.1/POPFile/Logger.pm
-@@ -79,7 +79,7 @@
- 
-     # The default location for log files
- 
--    $self->config_( 'logdir', './' );
-+    $self->config_( 'logdir', '/var/log/popfile/' );
- 
-     # The output format for log files, can be default, tabbed or csv
- 
diff --git a/debian/patches/01_logdir.patch b/debian/patches/01_logdir.patch
new file mode 100644
index 0000000..d7331da
--- /dev/null
+++ b/debian/patches/01_logdir.patch
@@ -0,0 +1,19 @@
+From: Lucas Wall <kthulhu@kadath.com.ar>
+Subject: Changes log directory
+
+
+---
+ POPFile/Logger.pm |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/POPFile/Logger.pm
++++ b/POPFile/Logger.pm
+@@ -82,7 +82,7 @@
+ 
+     # The default location for log files
+ 
+-    $self->config_( 'logdir', './' );
++    $self->config_( 'logdir', '/var/log/popfile/' );
+ 
+     # The output format for log files, can be default, tabbed or csv
+ 
diff --git a/debian/patches/01_server_user_separator.dpatch b/debian/patches/01_server_user_separator.patch
similarity index 77%
rename from debian/patches/01_server_user_separator.dpatch
rename to debian/patches/01_server_user_separator.patch
index ea14130..29dc241 100644
--- a/debian/patches/01_server_user_separator.dpatch
+++ b/debian/patches/01_server_user_separator.patch
@@ -1,11 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-# vim: ft=diff
-## 01_server_user_separator.dpatch by Lucas Wall <kthulhu@kadath.com.ar>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix server/username separator bug
+From: Lucas Wall <kthulhu@kadath.com.ar>
+Subject: Fix server/username separator bug
 
-@DPATCH@
 diff -urNad /home/kthulhu/svndeb/popfile/Proxy/POP3.pm popfile/Proxy/POP3.pm
 --- /home/kthulhu/svndeb/popfile/Proxy/POP3.pm	2004-09-09 07:12:34.000000000 -0300
 +++ popfile/Proxy/POP3.pm	2004-09-09 07:25:52.000000000 -0300
diff --git a/debian/patches/02_sqlite2.dpatch b/debian/patches/02_sqlite2.dpatch
deleted file mode 100644
index 05be43f..0000000
--- a/debian/patches/02_sqlite2.dpatch
+++ /dev/null
@@ -1,30 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-# vim: ft=diff
-## 02_sqlite2.dpatch by Lucas Wall <kthulhu@kadath.com.ar>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Debian libdbd-sqlite-perl calls sqlite 2 module SQLite2 (bug: #284520)
-
-@DPATCH@
-diff -urNad popfile/Classifier/Bayes.pm /tmp/dpep.J38tLr/popfile/Classifier/Bayes.pm
---- popfile/Classifier/Bayes.pm	2004-12-07 01:48:47.000000000 -0300
-+++ /tmp/dpep.J38tLr/popfile/Classifier/Bayes.pm	2004-12-07 01:50:07.000000000 -0300
-@@ -211,7 +211,7 @@
-     # it resolves to the full path to the database named in the
-     # database parameter above.
- 
--    $self->config_( 'dbconnect', 'dbi:SQLite:dbname=$dbname' );
-+    $self->config_( 'dbconnect', 'dbi:SQLite2:dbname=$dbname' );
-     $self->config_( 'dbuser', '' ); $self->config_( 'dbauth', '' );
-     
-     # SQLite 1.05+ have some problems we are resolving. 
-@@ -614,6 +614,9 @@
-         $dbpresent = 1;
-     }
- 
-+    # HACK: Debian's sqlite version 2 perl module is SQLite2
-+    $dbconnect =~ s/SQLite:/SQLite2:/;
-+
-     # Now perform the connect, note that this is database independent
-     # at this point, the actual database that we connect to is defined
-     # by the dbconnect parameter.
diff --git a/debian/patches/02_sqlite2.patch b/debian/patches/02_sqlite2.patch
new file mode 100644
index 0000000..01bceb5
--- /dev/null
+++ b/debian/patches/02_sqlite2.patch
@@ -0,0 +1,28 @@
+From: Lucas Wall <kthulhu@kadath.com.ar>
+Subject: Debian libdbd-sqlite-perl calls sqlite 2 module SQLite2 (bug: #284520)
+
+---
+ Classifier/Bayes.pm |    5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+--- a/Classifier/Bayes.pm
++++ b/Classifier/Bayes.pm
+@@ -217,7 +217,7 @@
+     # $dbname can be used within it and it resolves to the full path
+     # to the database named in the database parameter above.
+ 
+-    $self->config_( 'dbconnect', 'dbi:SQLite:dbname=$dbname' );
++    $self->config_( 'dbconnect', 'dbi:SQLite2:dbname=$dbname' );
+     $self->config_( 'dbuser', '' ); $self->config_( 'dbauth', '' );
+ 
+     # SQLite 1.05+ have some problems we are resolving.  This lets us
+@@ -724,6 +724,9 @@
+     $self->{db_is_sqlite__} = $sqlite;
+     $self->{db_name__}      = $dbname;
+ 
++    # HACK: Debian's sqlite version 2 perl module is SQLite2
++    $dbconnect =~ s/SQLite:/SQLite2:/;
++
+     # Now perform the connect, note that this is database independent
+     # at this point, the actual database that we connect to is defined
+     # by the dbconnect parameter.
diff --git a/debian/patches/10_makefile.patch b/debian/patches/10_makefile.patch
new file mode 100644
index 0000000..00442d1
--- /dev/null
+++ b/debian/patches/10_makefile.patch
@@ -0,0 +1,37 @@
+From: Lucas Wall <kthulhu@usa.net>
+Subject: New file
+
+ Makefile |   28 ++++++++++++++++++++++++++++
+ 1 file changed, 28 insertions(+)
+
+--- /dev/null
++++ b/Makefile
+@@ -0,0 +1,28 @@
++
++.PHONY: all install clean
++
++all:
++	cp v*.change changelog
++
++install:
++	cp *.gif *.pl $(DESTDIR)/usr/share/popfile/
++	cp debian/wrappers/*.sh $(DESTDIR)/usr/share/popfile/
++	cp stopwords popfile.pck $(DESTDIR)/usr/share/popfile/
++	chmod +x $(DESTDIR)/usr/share/popfile/*.pl \
++		$(DESTDIR)/usr/share/popfile/*.sh
++	cp -Rf Classifier $(DESTDIR)/usr/share/popfile/
++	cp -Rf POPFile $(DESTDIR)/usr/share/popfile/
++	cp -Rf Proxy $(DESTDIR)/usr/share/popfile/
++	cp -Rf UI $(DESTDIR)/usr/share/popfile/
++	cp -Rf languages $(DESTDIR)/usr/share/popfile/
++	cp -Rf manual $(DESTDIR)/usr/share/doc/popfile/
++	cp -Rf skins $(DESTDIR)/usr/share/popfile/
++	cp -Rf debian/wrappers/popfile-bayes $(DESTDIR)/usr/sbin/
++	cp -Rf debian/wrappers/popfile-insert $(DESTDIR)/usr/sbin/
++	cp -Rf debian/wrappers/popfile-pipe $(DESTDIR)/usr/sbin/
++	chmod +x $(DESTDIR)/usr/sbin/*
++
++clean:
++	rm -f changelog
++
++
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..3e19678
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+01_logdir.patch
+02_sqlite2.patch
+10_makefile.patch
diff --git a/debian/popfile.manpages b/debian/popfile.manpages
index d58b046..544a374 100644
--- a/debian/popfile.manpages
+++ b/debian/popfile.manpages
@@ -1,3 +1,3 @@
-debian_wrappers/popfile-bayes.8
-debian_wrappers/popfile-insert.8
-debian_wrappers/popfile-pipe.8
+debian/wrappers/popfile-bayes.8
+debian/wrappers/popfile-insert.8
+debian/wrappers/popfile-pipe.8
diff --git a/debian/rules b/debian/rules
index ae4e74b..bc31e16 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,17 +7,16 @@
 
 PACKAGE=popfile
 
-include /usr/share/dpatch/dpatch.make
 
 build: build-arch build-indep
 build-arch: build-stamp
 build-indep: build-stamp
-build-stamp: patch-stamp 
+build-stamp: 
 	dh_testdir
 	$(MAKE)
 	touch build-stamp
 
-clean: clean1 unpatch
+clean: clean1
 clean1:
 	dh_testdir
 	dh_testroot
@@ -59,5 +58,5 @@ binary-arch: build install
 # We have nothing to do by default.
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install patch unpatch \
+.PHONY: build clean binary-indep binary-arch binary install \
 	clean1
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)
diff --git a/debian_wrappers/popfile-bayes b/debian/wrappers/popfile-bayes
similarity index 100%
rename from debian_wrappers/popfile-bayes
rename to debian/wrappers/popfile-bayes
diff --git a/debian_wrappers/popfile-bayes.8 b/debian/wrappers/popfile-bayes.8
similarity index 100%
rename from debian_wrappers/popfile-bayes.8
rename to debian/wrappers/popfile-bayes.8
diff --git a/debian_wrappers/popfile-insert b/debian/wrappers/popfile-insert
similarity index 100%
rename from debian_wrappers/popfile-insert
rename to debian/wrappers/popfile-insert
diff --git a/debian_wrappers/popfile-insert.8 b/debian/wrappers/popfile-insert.8
similarity index 100%
rename from debian_wrappers/popfile-insert.8
rename to debian/wrappers/popfile-insert.8
diff --git a/debian_wrappers/popfile-pipe b/debian/wrappers/popfile-pipe
similarity index 100%
rename from debian_wrappers/popfile-pipe
rename to debian/wrappers/popfile-pipe
diff --git a/debian_wrappers/popfile-pipe.8 b/debian/wrappers/popfile-pipe.8
similarity index 100%
rename from debian_wrappers/popfile-pipe.8
rename to debian/wrappers/popfile-pipe.8
diff --git a/start_popfile.sh b/debian/wrappers/start_popfile.sh
similarity index 100%
rename from start_popfile.sh
rename to debian/wrappers/start_popfile.sh
-- 
1.7.9

--- End Message ---
--- Begin Message --- 
Version: 0.22.4-2+rm

Dear submitter,

as the package popfile has just been removed from the Debian archive
unstable we hereby close the associated bug reports.  We are sorry
that we couldn't deal with your issue properly.

For details on the removal, please see http://bugs.debian.org/664503

The version of this package that was in Debian prior to this removal
can still be found using http://snapshot.debian.org/.

This message was generated automatically; if you believe that there is
a problem with it please contact the archive administrators by mailing
ftpmaster@debian.org.

Debian distribution maintenance software
pp.
Luca Falavigna (the ftpmaster behind the curtain)

--- End Message ---
Reply to: