[SCM] proftpd-dfsg branch, master, updated. debian/1.3.3a-6-28-g1cad2a6

[Mahyuddin Susanto]

The following commit has been merged in the master branch:
commit 1cad2a664e2d4da64de8d8f1c7260cc61d84d0d1
Author: Mahyuddin Susanto <udienz at ubuntu.com>
Date:   Sat Mar 12 17:29:44 2011 +0700

    Add prxs manpage, install lintian overrive in d/rules
    Signed-off-by: Mahyuddin Susanto <udienz at ubuntu.com>

diff --git a/debian/patches/use_hypen_in_manpage.patch b/debian/patches/use_hypen_in_manpage.patch
index 218fefb..d9d96ee 100644
--- a/debian/patches/use_hypen_in_manpage.patch
+++ b/debian/patches/use_hypen_in_manpage.patch
@@ -1,6 +1,6 @@
-## Description: add some description
-## Origin/Author: add some origin or author
-## Bug: bug URL
+Description: Use hypen instead of minus-sign
+Author: Mahyuddin Susanto <udienz at ubuntu.com>
+
 Index: proftpd-dfsg/utils/ftpshut.8.in
 ===================================================================
 --- proftpd-dfsg.orig/utils/ftpshut.8.in	2011-03-11 13:58:00.929381734 +0700
diff --git a/debian/proftpd-basic.lintian-overrides b/debian/proftpd-basic.lintian-overrides
index f82bec7..4583d87 100644
--- a/debian/proftpd-basic.lintian-overrides
+++ b/debian/proftpd-basic.lintian-overrides
@@ -1,7 +1,4 @@
-proftpd-basic: syntax-error-in-debian-news-file line 6 "badly formatted trailer line"
-proftpd-basic: syntax-error-in-debian-news-file line 8 "found start of entry where expected more change data or trailer"
-proftpd-basic: binary-without-manpage usr/sbin/ftpquota
-proftpd-basic: binary-without-manpage usr/sbin/in.proftpd
-proftpd-basic: binary-without-manpage usr/sbin/proftpd-gencert
-proftpd-basic: shlib-calls-exit usr/lib/proftpd/mod_rewrite.so
+proftpd-basic: syntax-error-in-debian-news-file
+proftpd-basic: binary-without-manpage
 proftpd-basic: shlib-calls-exit usr/lib/proftpd/mod_sftp_pam.so
+proftpd-basic: shlib-calls-exit usr/lib/proftpd/mod_rewrite.so
diff --git a/debian/proftpd-dev.lintian-overrides b/debian/proftpd-dev.lintian-overrides
deleted file mode 100644
index 48e48c3..0000000
--- a/debian/proftpd-dev.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-proftpd-basic: binary-without-manpage usr/bin/prxs
diff --git a/debian/proftpd-dev.manpages b/debian/proftpd-dev.manpages
new file mode 100644
index 0000000..dc55e70
--- /dev/null
+++ b/debian/proftpd-dev.manpages
@@ -0,0 +1 @@
+debian/prxs.8
diff --git a/debian/prxs.8 b/debian/prxs.8
new file mode 100644
index 0000000..24a7259
--- /dev/null
+++ b/debian/prxs.8
@@ -0,0 +1,79 @@
+.\"Created with GNOME Manpages Editor Wizard
+.\"http://sourceforge.net/projects/gmanedit2
+.TH prxs 3 "March 11, 2011" "" "PRoFTPD EXtensionS Tool"
+
+.SH NAME
+prxs \-  proFTPD Extension tool
+
+.SH SYNOPSIS
+.TP 8
+\fBpxrs\fR [options] [actions] mod-custom.c\fR
+.TP 8
+\fBpxrs\fR \-c \-i \-d mod_custom.c
+.TP 8
+\fBprxs\fR \-c \-i \-D USE_CUSTOM \-I /path/to/custom/include \-L /path/to/custom/lib \-l custom mod_custom.c
+.br
+
+.SH DESCRIPTION
+This manual page explains the compailing with
+.B prxs
+.PP
+\fBprxs\fP is for This program for compile and install third\-party modules from source code as DSO modules for your installed proftpd. 
+
+.SH ACTIONS
+.PP
+The following actions describe the type of operation to be performed:
+.TP
+\fB\-c,\ -\-compile\fR
+Compiles the listed .c source files into a proftpd DSO module
+
+.TP
+\fB\-i, \-\-install\fR
+Installs a compiled proftpd DSO module into the directory where proftpd expects to find loadable
+DSO modules.
+
+.TP
+\fB\-d, \-\-clean\fR
+Removes any generated files, returning the build directory to clean state.
+
+.SH OPTIONS
+.PP
+The following options describe the type of operation to be performed:
+.TP
+\fB\-n, \-\-name
+Tells prxs the name of the module being compiled.
+.br
+By default, prxs determines the module name from the list of .c files listed, expecting to see a
+"mod_name.c" file.
+.TP
+\fB\-D key
+Passes these macros through to the compilation step.
+.TP
+\fB\-D key=value 
+Note that the space before the key is important.
+.TP
+\fB\-I includedir
+Specify additional include file search directories.
+Note that the space before the directory is important.
+.TP
+\fB\-L libdir
+Specify additional library file search directories.
+Note that the space before the directory is important.
+.TP
+\fB\-l library
+Specify additional libraries for linking.
+Note that the space before the library name is important.
+
+.SH AUTHORS
+The Proftpd team. See http://www.proftpd.org/ for information.
+.SH COPYRIGHT
+
+Copyright (C) 2008-2009 TJ Saunders <tj at castaglia.org>.
+.P
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version. 
+.SH NOTES
+Manual page written for Debian GNU/Linux and/or derivatives by
+Mahyuddin Susanto <udienz at ubuntu.com>, March 2011
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index 4f54b66..a040d0c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -115,11 +115,12 @@ myclean:
 	find contrib -name "*.la" -exec rm -f {} \;
 
 binary-indep: checkroot build
-	dh_installdirs -i 
-	dh_install -i 
+	dh_installdirs -i
+	dh_install -i
 	dh_installdocs -i 
 	dh_installchangelogs -i ChangeLog
-	dh_installexamples -i 
+	dh_installexamples -i
+	dh_lintian -i
 	
 	dh_compress -i
 	dh_fixperms -i
@@ -137,7 +138,7 @@ binary-arch: checkroot build install
 	dh_installman -a
 	dh_installlogrotate -a
 	dh_installpam -a --name=$(NAME)
-	
+	dh_lintian -a
 	# removes proftpd.conf installed by upstream
 	rm -f debian/$(PACKAGE)/etc/$(NAME)/$(NAME).conf
 	

-- 
ProFTPD core package