Package: gpgkeys
Version: 0.3.1-4
Severity: normal
User: [EMAIL PROTECTED]
Usertag: libqt3-compat-headers

Hi,

We are currently attempting to remove the antiquated libqt3-compat-headers from 
the archive.

Here is a patch to build gpgkeys without libqt3-compat-headers.

It also adds a man page which closes #233028 and some policy updates.  I 
realize it is a little intrusive 
for an NMU, sorry.

Thank you,

Barry deFreese
diff -u gpgkeys-0.3.1/debian/changelog gpgkeys-0.3.1/debian/changelog
--- gpgkeys-0.3.1/debian/changelog
+++ gpgkeys-0.3.1/debian/changelog
@@ -1,3 +1,17 @@
+gpgkeys (0.3.1-4.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Build without libqt3-compat-headers.
+    + qapp.h -> qapplication.h.
+  * Add simple man page. (Closes: #233028).
+  * Bump debhelper build-dep and compat to 5.
+  * Move DH_COMPAT to debian/compat.
+  * Make clean not ignore errors.
+  * Bump Standards Version to 3.7.3.
+    + Menu policy transition.
+
+ -- Barry deFreese <[EMAIL PROTECTED]>  Wed, 06 Feb 2008 12:26:27 -0500
+
 gpgkeys (0.3.1-4) unstable; urgency=low
 
   * Rebuilt with GCC4.
diff -u gpgkeys-0.3.1/debian/control gpgkeys-0.3.1/debian/control
--- gpgkeys-0.3.1/debian/control
+++ gpgkeys-0.3.1/debian/control
@@ -2,8 +2,8 @@
 Section: utils
 Priority: optional
 Maintainer: Peter Mathiasson <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>> 3.0.0), libqt3-mt-dev, libqt3-compat-headers
-Standards-Version: 3.6.2
+Build-Depends: debhelper (>> 5.0.0), libqt3-mt-dev
+Standards-Version: 3.7.3
 
 Package: gpgkeys
 Architecture: any
diff -u gpgkeys-0.3.1/debian/rules gpgkeys-0.3.1/debian/rules
--- gpgkeys-0.3.1/debian/rules
+++ gpgkeys-0.3.1/debian/rules
@@ -5,9 +5,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# This is the debhelper compatability version to use.
-export DH_COMPAT=3
-
 # Qt3 Application
 export QTDIR=/usr/share/qt3
 export QMAKESPEC=linux-g++
@@ -37,7 +34,7 @@
 	rm -f build-stamp configure-stamp
 
 	# Add here commands to clean up after the build process.
-	-$(MAKE) clean
+	[ ! -f Makefile ] || $(MAKE) clean
 	rm -f Makefile .qmake.internal.cache gpgkeys
 
 	dh_clean
@@ -76,7 +73,7 @@
 #	dh_installmime
 #	dh_installinit
 #	dh_installcron
-#	dh_installman
+	dh_installman debian/gpgkeys.1
 	dh_installinfo
 	dh_installchangelogs CHANGELOG
 	dh_link
diff -u gpgkeys-0.3.1/debian/menu gpgkeys-0.3.1/debian/menu
--- gpgkeys-0.3.1/debian/menu
+++ gpgkeys-0.3.1/debian/menu
@@ -1,2 +1,2 @@
-?package(gpgkeys):needs="X11" section="Apps/Tools"\
+?package(gpgkeys):needs="X11" section="Applications/System/Security"\
   title="GPG Keys" command="/usr/bin/gpgkeys"
only in patch2:
unchanged:
--- gpgkeys-0.3.1.orig/functions.cpp
+++ gpgkeys-0.3.1/functions.cpp
@@ -8,7 +8,7 @@
  * published by the Free Software Foundation
  */
 
-#include <qapp.h>
+#include <qapplication.h>
 #include <qdir.h>
 #include <qstring.h>
 #include <qimage.h>
only in patch2:
unchanged:
--- gpgkeys-0.3.1.orig/debian/compat
+++ gpgkeys-0.3.1/debian/compat
@@ -0,0 +1 @@
+5
only in patch2:
unchanged:
--- gpgkeys-0.3.1.orig/debian/gpgkeys.1
+++ gpgkeys-0.3.1/debian/gpgkeys.1
@@ -0,0 +1,61 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH GPGKEYS 1 "February 6, 2008"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+gpgkeys \- A qt3 gui interface to GPG
+.SH SYNOPSIS
+.B gpgkeys
+.I <no_options>
+
+.SH DESCRIPTION
+This manual page documents briefly the
+.B gpgkeys
+command.
+This manual page was written for the Debian/Ubuntu distributions
+because the original program does not include them.
+.PP
+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
+.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
+.\" respectively.
+\fBgpgkeys\fP is a GUI frontend to GPG, written with Qt 3.
+
+It makes it easy to administrate your keyring.
+
+Being a GUI application, there are no command line options.  However, 
+inside the application you may:
+ Commands menu option:
+ - Import from a file.
+ - Search a keyserver.
+
+ File->Options menu option:
+ - General:
+   - Control the language and fonts utilized.
+ - Keyserver:
+   - Edit which keyserver and port is utilized.
+ - Environment:
+   - Specify gpg application and terminal application to use.
+
+ Help menu option:
+ - About:
+   - View copyright, author, and license information.
+ - About Qt:
+   - View Qt version and homepage information.
+
+.SH AUTHOR
+gpgkeys was written by Peter Mathiasson <[EMAIL PROTECTED]>.
+.PP
+This manual page was written by Barry deFreese <[EMAIL PROTECTED]>.
only in patch2:
unchanged:
--- gpgkeys-0.3.1.orig/main.cpp
+++ gpgkeys-0.3.1/main.cpp
@@ -8,7 +8,7 @@
  * published by the Free Software Foundation
  */
 
-#include <qapp.h>
+#include <qapplication.h>
 #include "cmainwindow.h"
 #include "cgpgproc.h"
 
only in patch2:
unchanged:
--- gpgkeys-0.3.1.orig/cmainwindow.cpp
+++ gpgkeys-0.3.1/cmainwindow.cpp
@@ -8,7 +8,7 @@
  * published by the Free Software Foundation
  */
 
-#include <qapp.h>
+#include <qapplication.h>
 #include <qmainwindow.h>
 #include <qlistview.h>
 #include <qprocess.h>
only in patch2:
unchanged:
--- gpgkeys-0.3.1.orig/cgpgproc.cpp
+++ gpgkeys-0.3.1/cgpgproc.cpp
@@ -8,7 +8,7 @@
  * published by the Free Software Foundation
  */
 
-#include <qapp.h>
+#include <qapplication.h>
 #include <qobject.h>
 #include <qstring.h>
 #include <qstringlist.h>

Reply via email to