[vhffs-dev] [1459] Lintian should be happy now |
[ Thread Index |
Date Index
| More vhffs.org/vhffs-dev Archives
]
Revision: 1459
Author: beuss
Date: 2009-06-20 17:11:04 +0200 (Sat, 20 Jun 2009)
Log Message:
-----------
Lintian should be happy now
Modified Paths:
--------------
trunk/debian/control
trunk/debian/copyright
trunk/debian/rules
trunk/debian/vhffs-fs.files
trunk/debian/vhffs-panel-members.dirs
trunk/vhffs-fs/Makefile.am
trunk/vhffs-panel/Makefile.am
Added Paths:
-----------
trunk/vhffs-fs/vhffsfs_run
Removed Paths:
-------------
trunk/debian/README.Debian
trunk/vhffs-fs/vhffsfs_run.sh
Deleted: trunk/debian/README.Debian
===================================================================
--- trunk/debian/README.Debian 2009-06-20 01:04:27 UTC (rev 1458)
+++ trunk/debian/README.Debian 2009-06-20 15:11:04 UTC (rev 1459)
@@ -1,6 +0,0 @@
-vhffs for Debian
-----------------
-
-<possible notes regarding this package - if none, delete this file>
-
- -- Sébastien Le Ray <sebastien-vhffs@xxxxxxxxx> Fri, 12 Jun 2009 08:43:39 +0200
Modified: trunk/debian/control
===================================================================
--- trunk/debian/control 2009-06-20 01:04:27 UTC (rev 1458)
+++ trunk/debian/control 2009-06-20 15:11:04 UTC (rev 1459)
@@ -9,9 +9,9 @@
Package: vhffs
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, perl, vhffs-api, vhffs-panel
+Depends: perl, vhffs-api, vhffs-panel
Suggests: mydns-pgsql, postgresql (>=8.1), exim4-daemon-heavy, mysql, subversion, apache2, git, cvs
-Description: VHFFS - Virtual Hosting For Free Software
+Description: Virtual Hosting For Free Software
VHFFS is a tool to manage hosting platforms handling
a huge number of users. It provides a web panel,
SVN/GIT/CVS services, Web, MySQL, PostgreSQL
@@ -22,7 +22,7 @@
Package: vhffs-api
Architecture: all
Depends: perl
-Description: VHFFS - API Part.
+Description: VHFFS - API Part
This package is required for most VHFFS components
to work. You'll also need it if you want to develop
for VHFFS.
@@ -31,6 +31,8 @@
Architecture: all
Depends: vhffs-panel-members, vhffs-panel-public
Description: Meta package for vhffs panel (public & members part).
+ Empty package installing vhffs-panel-mmembers and
+ vhffs-panel-public.
Package: vhffs-panel-members
Architecture: all
@@ -42,20 +44,20 @@
Package: vhffs-panel-public
Architecture: all
Depends: vhffs-api,apache2,perl
-Description: VHFFS - Web panel for VHFFS. Public part.
+Description: VHFFS - Web panel for VHFFS. Public part
Provides a public web interface to consult hosted
projects
Package: vhffs-robots
Architecture: all
Depends: vhffs-api,perl
-Description: VHFFS - Services robots.
+Description: VHFFS - Services robots
This package contains robots needed by VHFFS for
services creation/deletion/update.
Package: vhffs-fs
Architecture: any
-Depends: libfuse
+Depends: ${shlibs:Depends}
Description: VHFFS - VHFFS Fuse File System
Use VHFFS database to provide a custom view of user
home directory.
@@ -108,4 +110,4 @@
Package: vhffs-l10n
Architecture: all
Description: VHFFS - Localisation
- Contains french, spanish and english translations.
+ Contains French, Spanish and English translations.
Modified: trunk/debian/copyright
===================================================================
--- trunk/debian/copyright 2009-06-20 01:04:27 UTC (rev 1458)
+++ trunk/debian/copyright 2009-06-20 15:11:04 UTC (rev 1459)
@@ -3,7 +3,7 @@
It was downloaded from <svn://svn.tuxfamily.org/svnroot/vhffs4/vhffs/trunk>
-Upstream Author(s):
+Upstream Authors:
Developpers :
- Julien Delange <god at gunnm dot org> : API, Panel, Listengine, documentation, website, robots, tools, shells and backend
@@ -23,7 +23,7 @@
License:
- GPLv2
+ BSD, GPLv2
The Debian packaging is:
@@ -32,5 +32,3 @@
and is licensed under the GPL version 3,
see `/usr/share/common-licenses/GPL-3'.
-# Please also look if there are files or directories which have a
-# different copyright/license attached and list them here.
Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules 2009-06-20 01:04:27 UTC (rev 1458)
+++ trunk/debian/rules 2009-06-20 15:11:04 UTC (rev 1459)
@@ -26,11 +26,10 @@
CROSS= --build $(DEB_BUILD_GNU_TYPE)
endif
-CONFIGURE_EXTRA_OPTIONS=--enable-vhffs-fs --enable-backend \
- --enable-irc --enable-extra --enable-jabber \
- --enable-fssync
+CONFIGURE_EXTRA_OPTIONS=--enable-backend --enable-extra --enable-irc --enable-panel \
+ --enable-tools --enable-compat --enable-jabber --enable-public --enable-vhffs-fs \
+ --enable-fssync --enable-listengine --enable-robots
-
# Multi-packages stuff
BASEDIR=$(CURDIR)
TMP=debian/tmp/
@@ -57,9 +56,11 @@
build-arch-stamp: config.status
# Add here commands to compile the arch part of the package.
- $(MAKE) -C $(BASEDIR)/vhffs-autokill/ -C $(BASEDIR)/vhffs-fs/ \
- -C $(BASEDIR)/vhffs-fssync/ -C $(BASEDIR)/vhffs-shells/ \
- -C $(BASEDIR)/vhffs-stsmon DESTDIR=$(BASEDIR)/$(TMP)/
+ $(MAKE) -C $(BASEDIR)/vhffs-autokill/ DESTDIR=$(BASEDIR)/$(TMP)/
+ $(MAKE) -C $(BASEDIR)/vhffs-fs/ DESTDIR=$(BASEDIR)/$(TMP)/
+ $(MAKE) -C $(BASEDIR)/vhffs-fssync/ DESTDIR=$(BASEDIR)/$(TMP)/
+ $(MAKE) -C $(BASEDIR)/vhffs-shells/ DESTDIR=$(BASEDIR)/$(TMP)/
+ $(MAKE) -C $(BASEDIR)/vhffs-stsmon DESTDIR=$(BASEDIR)/$(TMP)/
build-indep: build-indep-stamp
build-indep-stamp: config.status
@@ -88,14 +89,18 @@
# Add here commands to install the indep part of the package into
# debian/indep
- $(MAKE) -C $(BASEDIR)/ vhffs-api/ -C $(BASEDIR)/ vhffs-backend/ \
- -C $(BASEDIR)/ vhffs-doc/ -C $(BASEDIR)/ vhffs-forum/ \
- -C $(BASEDIR)/ vhffs-intl/ -C $(BASEDIR)/ vhffs-irc/ \
- -C $(BASEDIR)/ vhffs-jabber/ -C $(BASEDIR)/ vhffs-listengine/ \
- -C $(BASEDIR)/ vhffs-mw/ -C $(BASEDIR)/ vhffs-panel/ \
- -C $(BASEDIR)/ vhffs-public/ -C $(BASEDIR)/ vhffs-robots/ \
- -C $(BASEDIR)/ vhffs-themes/ -C $(BASEDIR)/ vhffs-tools/ \
- install DESTDIR=$(BASEDIR)/$(TMP_INDEP)/
+ $(MAKE) -C $(BASEDIR)/vhffs-api/ install DESTDIR=$(BASEDIR)/$(TMP_INDEP)/
+ $(MAKE) -C $(BASEDIR)/vhffs-backend/ install DESTDIR=$(BASEDIR)/$(TMP_INDEP)/
+ $(MAKE) -C $(BASEDIR)/vhffs-doc/ install DESTDIR=$(BASEDIR)/$(TMP_INDEP)/
+ $(MAKE) -C $(BASEDIR)/vhffs-intl/ install DESTDIR=$(BASEDIR)/$(TMP_INDEP)/
+ $(MAKE) -C $(BASEDIR)/vhffs-irc/ install DESTDIR=$(BASEDIR)/$(TMP_INDEP)/
+ $(MAKE) -C $(BASEDIR)/vhffs-jabber/ install DESTDIR=$(BASEDIR)/$(TMP_INDEP)/
+ $(MAKE) -C $(BASEDIR)/vhffs-listengine/ install DESTDIR=$(BASEDIR)/$(TMP_INDEP)/
+ $(MAKE) -C $(BASEDIR)/vhffs-panel/ install DESTDIR=$(BASEDIR)/$(TMP_INDEP)/
+ $(MAKE) -C $(BASEDIR)/vhffs-public/ install DESTDIR=$(BASEDIR)/$(TMP_INDEP)/
+ $(MAKE) -C $(BASEDIR)/vhffs-robots/ install DESTDIR=$(BASEDIR)/$(TMP_INDEP)/
+ $(MAKE) -C $(BASEDIR)/vhffs-themes/ install DESTDIR=$(BASEDIR)/$(TMP_INDEP)/
+ $(MAKE) -C $(BASEDIR)/vhffs-tools/ install DESTDIR=$(BASEDIR)/$(TMP_INDEP)/
dh_movefiles -i --sourcedir=$(TMP_INDEP)/
@@ -112,6 +117,10 @@
$(MAKE) -C vhffs-fssync/ install DESTDIR=$(BASEDIR)/$(TMP)/
$(MAKE) -C vhffs-shells/ install DESTDIR=$(BASEDIR)/$(TMP)/
$(MAKE) -C vhffs-stsmon/ install DESTDIR=$(BASEDIR)/$(TMP)/
+ # vhffs-extra is arch dependant, even if it contains some php/pl files
+ $(MAKE) -C vhffs-mw/ install DESTDIR=$(BASEDIR)/$(TMP)/
+ $(MAKE) -C $(BASEDIR)/vhffs-forum/ install DESTDIR=$(BASEDIR)/$(TMP)/
+ $(MAKE) -C $(BASEDIR)/vhffs-backend/ install DESTDIR=$(BASEDIR)/$(TMP)/
dh_movefiles -a
@@ -141,8 +150,8 @@
dh_fixperms
# dh_perl
dh_makeshlibs
+ dh_shlibdeps
dh_installdeb
- dh_shlibdeps
dh_gencontrol
dh_md5sums
dh_builddeb
Modified: trunk/debian/vhffs-fs.files
===================================================================
--- trunk/debian/vhffs-fs.files 2009-06-20 01:04:27 UTC (rev 1458)
+++ trunk/debian/vhffs-fs.files 2009-06-20 15:11:04 UTC (rev 1459)
@@ -1,4 +1,4 @@
usr/sbin/vhffsfs
-usr/sbin/vhffsfs_run.sh
+usr/sbin/vhffsfs_run
etc/vhffs/vhffsfs.conf
etc/vhffs/vhffsfs.conf.dist
Modified: trunk/debian/vhffs-panel-members.dirs
===================================================================
--- trunk/debian/vhffs-panel-members.dirs 2009-06-20 01:04:27 UTC (rev 1458)
+++ trunk/debian/vhffs-panel-members.dirs 2009-06-20 15:11:04 UTC (rev 1459)
@@ -34,65 +34,7 @@
usr/share/vhffs/panel/js/dijit
usr/share/vhffs/panel/js/vhffs
usr/share/vhffs/panel/js/dojo
-usr/share/vhffs/panel/js/dojo/dnd
-usr/share/vhffs/panel/js/dojo/_base
-usr/share/vhffs/panel/js/dojo/_base/_loader
-usr/share/vhffs/panel/js/dojo/_firebug
-usr/share/vhffs/panel/js/dojo/rpc
-usr/share/vhffs/panel/js/dojo/io
-usr/share/vhffs/panel/js/dojo/cldr
-usr/share/vhffs/panel/js/dojo/cldr/nls
-usr/share/vhffs/panel/js/dojo/cldr/nls/es
-usr/share/vhffs/panel/js/dojo/cldr/nls/en
-usr/share/vhffs/panel/js/dojo/cldr/nls/en-ca
-usr/share/vhffs/panel/js/dojo/cldr/nls/en-us
-usr/share/vhffs/panel/js/dojo/cldr/nls/en-au
-usr/share/vhffs/panel/js/dojo/cldr/nls/it
-usr/share/vhffs/panel/js/dojo/cldr/nls/ko
-usr/share/vhffs/panel/js/dojo/cldr/nls/en-gb
-usr/share/vhffs/panel/js/dojo/cldr/nls/zh-cn
-usr/share/vhffs/panel/js/dojo/cldr/nls/de-de
-usr/share/vhffs/panel/js/dojo/cldr/nls/it-it
-usr/share/vhffs/panel/js/dojo/cldr/nls/ja
-usr/share/vhffs/panel/js/dojo/cldr/nls/de
-usr/share/vhffs/panel/js/dojo/cldr/nls/zh
-usr/share/vhffs/panel/js/dojo/cldr/nls/pt-br
-usr/share/vhffs/panel/js/dojo/cldr/nls/ja-jp
-usr/share/vhffs/panel/js/dojo/cldr/nls/ko-kr
-usr/share/vhffs/panel/js/dojo/cldr/nls/zh-tw
-usr/share/vhffs/panel/js/dojo/cldr/nls/pt
-usr/share/vhffs/panel/js/dojo/cldr/nls/es-es
-usr/share/vhffs/panel/js/dojo/cldr/nls/fr
-usr/share/vhffs/panel/js/dojo/date
-usr/share/vhffs/panel/js/dojo/nls
-usr/share/vhffs/panel/js/dojo/nls/ru
-usr/share/vhffs/panel/js/dojo/nls/es
-usr/share/vhffs/panel/js/dojo/nls/pt-pt
-usr/share/vhffs/panel/js/dojo/nls/tr
-usr/share/vhffs/panel/js/dojo/nls/it
-usr/share/vhffs/panel/js/dojo/nls/el
-usr/share/vhffs/panel/js/dojo/nls/ko
-usr/share/vhffs/panel/js/dojo/nls/pl
-usr/share/vhffs/panel/js/dojo/nls/sv
-usr/share/vhffs/panel/js/dojo/nls/ar
-usr/share/vhffs/panel/js/dojo/nls/hu
-usr/share/vhffs/panel/js/dojo/nls/cs
-usr/share/vhffs/panel/js/dojo/nls/ja
-usr/share/vhffs/panel/js/dojo/nls/de
-usr/share/vhffs/panel/js/dojo/nls/zh
-usr/share/vhffs/panel/js/dojo/nls/nl
-usr/share/vhffs/panel/js/dojo/nls/da
-usr/share/vhffs/panel/js/dojo/nls/zh-tw
-usr/share/vhffs/panel/js/dojo/nls/fi
-usr/share/vhffs/panel/js/dojo/nls/pt
-usr/share/vhffs/panel/js/dojo/nls/he
-usr/share/vhffs/panel/js/dojo/nls/fr
-usr/share/vhffs/panel/js/dojo/nls/nb
usr/share/vhffs/panel/js/dojo/resources
-usr/share/vhffs/panel/js/dojo/resources/images
-usr/share/vhffs/panel/js/dojo/data
-usr/share/vhffs/panel/js/dojo/data/util
-usr/share/vhffs/panel/js/dojo/data/api
usr/share/vhffs/panel/dns
usr/share/vhffs/panel/cvs
usr/share/vhffs/panel/group
Modified: trunk/vhffs-fs/Makefile.am
===================================================================
--- trunk/vhffs-fs/Makefile.am 2009-06-20 01:04:27 UTC (rev 1458)
+++ trunk/vhffs-fs/Makefile.am 2009-06-20 15:11:04 UTC (rev 1459)
@@ -1,7 +1,7 @@
vhffsfsdir=@VHFFSFSDIR@
vhffsfs_SOURCES=rquota_xdr.c rquota_clnt.c rquota.h md5.h rquota.x md5c.c vhffsfs.c
vhffsfs_PROGRAMS=vhffsfs
-dist_vhffsfs_SCRIPTS=vhffsfs_run.sh
+dist_vhffsfs_SCRIPTS=vhffsfs_run
vhffsfsconfdir=@CONFDIR@
dist_vhffsfsconf_DATA=vhffsfs.conf.dist
Copied: trunk/vhffs-fs/vhffsfs_run (from rev 1453, trunk/vhffs-fs/vhffsfs_run.sh)
===================================================================
--- trunk/vhffs-fs/vhffsfs_run (rev 0)
+++ trunk/vhffs-fs/vhffsfs_run 2009-06-20 15:11:04 UTC (rev 1459)
@@ -0,0 +1,2 @@
+#!/bin/sh
+./vhffsfs -o allow_other,default_permissions,kernel_cache /mnt/fuse/
Property changes on: trunk/vhffs-fs/vhffsfs_run
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mergeinfo
+
Deleted: trunk/vhffs-fs/vhffsfs_run.sh
===================================================================
--- trunk/vhffs-fs/vhffsfs_run.sh 2009-06-20 01:04:27 UTC (rev 1458)
+++ trunk/vhffs-fs/vhffsfs_run.sh 2009-06-20 15:11:04 UTC (rev 1459)
@@ -1 +0,0 @@
-./vhffsfs -o allow_other,default_permissions,kernel_cache /mnt/fuse/
Modified: trunk/vhffs-panel/Makefile.am
===================================================================
--- trunk/vhffs-panel/Makefile.am 2009-06-20 01:04:27 UTC (rev 1458)
+++ trunk/vhffs-panel/Makefile.am 2009-06-20 15:11:04 UTC (rev 1459)
@@ -17,11 +17,11 @@
nobase_dist_paneljs_DATA = $(javascripts)
paneldir = @PANELDIR@
+nobase_dist_panel_DATA = favicon.ico
nobase_dist_panel_SCRIPTS = alert_submit.pl \
alert.pl \
auth.pl \
auth.pl \
- favicon.ico \
getavatar.pl \
history.pl \
lost.pl \