[Fusionforge-commits] FusionForge branch Branch_5_3 updated. 7389e64de0aff5d658ac9d67fb3d677b6dad5f03
Roland Mas
lolando at fusionforge.org
Fri Mar 28 14:08:34 CET 2014
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, Branch_5_3 has been updated
via 7389e64de0aff5d658ac9d67fb3d677b6dad5f03 (commit)
from 6d79420774ac0dde68c2e442d7bab084ab2b0a42 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 7389e64de0aff5d658ac9d67fb3d677b6dad5f03
Author: Roland Mas <lolando at debian.org>
Date: Fri Mar 28 14:08:30 2014 +0100
Reducing Debian diff
diff --git a/.bzrignore b/.bzrignore
deleted file mode 100644
index 6f8803b..0000000
--- a/.bzrignore
+++ /dev/null
@@ -1,11 +0,0 @@
-fusionforge_*.dsc
-fusionforge_*.tar.gz
-fusionforge_*.orig.tar.gz
-fusionforge_*.diff.gz
-fusionforge_*.build
-fusionforge_*_source.changes
-tarballs
-gforge_*_all.deb
-gforge-*_*_all.deb
-fusionforge-*_*_all.deb
-.pc
diff --git a/src/packaging/control/035web-apache2-vhosts b/src/packaging/control/035web-apache2-vhosts
index e16f6d8..0e20dbb 100644
--- a/src/packaging/control/035web-apache2-vhosts
+++ b/src/packaging/control/035web-apache2-vhosts
@@ -1,4 +1,4 @@
Package: @OLDPACKAGE at -web-apache2-vhosts
Architecture: all
-Depends: @OLDPACKAGE at -web-apache2, ${misc:Depends}
+Depends: @OLDPACKAGE at -web-apache2, php5-cli, ${misc:Depends}
Description: collaborative development tool - web vhosts (using Apache)
diff --git a/src/packaging/control/090shell-postgresql b/src/packaging/control/090shell-postgresql
index ec4845b..3ae747d 100644
--- a/src/packaging/control/090shell-postgresql
+++ b/src/packaging/control/090shell-postgresql
@@ -1,6 +1,6 @@
Package: @OLDPACKAGE at -shell-postgresql
Architecture: all
-Depends: @OLDPACKAGE at -common, @OLDPACKAGE at -db-postgresql | @OLDPACKAGE at -db-remote, perl, debianutils (>= 1.7), debconf (>= 1.0.32) | debconf-2.0, ucf, openssh-server, libnss-pgsql2, unscd | nscd, ${misc:Depends}
+Depends: @OLDPACKAGE at -common, @OLDPACKAGE at -db-postgresql | @OLDPACKAGE at -db-remote, perl, debianutils (>= 1.7), debconf (>= 1.0.32) | debconf-2.0, ucf, openssh-server, libnss-pgsql2, unscd | nscd, php5-cli, ${misc:Depends}
Provides: @OLDPACKAGE at -shell
Conflicts: @OLDPACKAGE at -shell
Description: collaborative development tool - shell accounts (using PostgreSQL)
diff --git a/tests/scripts/fusionforge-build-and-test-deb.sh b/tests/scripts/fusionforge-build-and-test-deb.sh
index c23368f..0c5a305 100755
--- a/tests/scripts/fusionforge-build-and-test-deb.sh
+++ b/tests/scripts/fusionforge-build-and-test-deb.sh
@@ -57,6 +57,7 @@ cp -r src/ $BUILDPLACE/$PKGNAME-$MAJOR
cd $BUILDPLACE/$PKGNAME-$MAJOR
dch -b -v $MAJOR$MINOR -D UNRELEASED "This is $DIST-$ARCH autobuild"
sed -i -e "1s/UNRELEASED/$DIST/" debian/changelog
+debian/rules debian/control
pdebuild --configfile $COWBUILDERCONFIG --buildresult $BUILDRESULT
cd $BUILDRESULT
-----------------------------------------------------------------------
Summary of changes:
.bzrignore | 11 -----------
src/packaging/control/035web-apache2-vhosts | 2 +-
src/packaging/control/090shell-postgresql | 2 +-
tests/scripts/fusionforge-build-and-test-deb.sh | 1 +
4 files changed, 3 insertions(+), 13 deletions(-)
delete mode 100644 .bzrignore
hooks/post-receive
--
FusionForge
More information about the Fusionforge-commits
mailing list