[Fusionforge-commits] FusionForge branch debian-unstable updated. v6.0.5-16-gee5f31c

Roland Mas lolando at libremir.placard.fr.eu.org
Sat Dec 2 17:04:20 CET 2017


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, debian-unstable has been updated
       via  ee5f31c94c3054b6f427f3146fc2aabc1b92de02 (commit)
       via  74b2cc724135839c5eba3bb2d48fef47e4f35a0d (commit)
      from  ea1273a82d6f58b5f6f9f42bc790a7d8025aed7b (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 -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=ee5f31c94c3054b6f427f3146fc2aabc1b92de02

commit ee5f31c94c3054b6f427f3146fc2aabc1b92de02
Author: Roland Mas <lolando at debian.org>
Date:   Sat Dec 2 17:03:48 2017 +0100

    Use Debian patches rather than modifying files inline

diff --git a/src/patches/disable-maintscripts.patch b/src/patches/disable-maintscripts.patch
new file mode 100644
index 0000000..204d582
--- /dev/null
+++ b/src/patches/disable-maintscripts.patch
@@ -0,0 +1,205 @@
+Index: src/debian/fusionforge-common.postinst
+===================================================================
+--- src.orig/debian/fusionforge-common.postinst
++++ src/debian/fusionforge-common.postinst
+@@ -1,4 +1,5 @@
+ #!/bin/sh
++exit 0 # Disabled in packages uploaded to Debian
+ # postinst script for fusionforge
+ #
+ # see: dh_installdeb(1)
+Index: src/debian/fusionforge-common.postrm
+===================================================================
+--- src.orig/debian/fusionforge-common.postrm
++++ src/debian/fusionforge-common.postrm
+@@ -1,4 +1,5 @@
+ #!/bin/sh
++exit 0 # Disabled in packages uploaded to Debian
+ # postrm script for fusionforge
+ #
+ # see: dh_installdeb(1)
+Index: src/debian/fusionforge-common.prerm
+===================================================================
+--- src.orig/debian/fusionforge-common.prerm
++++ src/debian/fusionforge-common.prerm
+@@ -1,4 +1,5 @@
+ #!/bin/sh
++exit 0 # Disabled in packages uploaded to Debian
+ # prerm script for fusionforge
+ #
+ # see: dh_installdeb(1)
+Index: src/debian/fusionforge-db-local.postinst
+===================================================================
+--- src.orig/debian/fusionforge-db-local.postinst
++++ src/debian/fusionforge-db-local.postinst
+@@ -1,4 +1,5 @@
+ #!/bin/sh
++exit 0 # Disabled in packages uploaded to Debian
+ # postinst script for fusionforge
+ #
+ # see: dh_installdeb(1)
+Index: src/debian/fusionforge-db-local.prerm
+===================================================================
+--- src.orig/debian/fusionforge-db-local.prerm
++++ src/debian/fusionforge-db-local.prerm
+@@ -1,4 +1,5 @@
+ #!/bin/sh
++exit 0 # Disabled in packages uploaded to Debian
+ # prerm script for fusionforge
+ #
+ # see: dh_installdeb(1)
+Index: src/debian/fusionforge-lists.postinst
+===================================================================
+--- src.orig/debian/fusionforge-lists.postinst
++++ src/debian/fusionforge-lists.postinst
+@@ -1,4 +1,5 @@
+ #!/bin/bash
++exit 0 # Disabled in packages uploaded to Debian
+ # postinst script for fusionforge
+ #
+ # see: dh_installdeb(1)
+Index: src/debian/fusionforge-lists.prerm
+===================================================================
+--- src.orig/debian/fusionforge-lists.prerm
++++ src/debian/fusionforge-lists.prerm
+@@ -1,4 +1,5 @@
+ #!/bin/sh
++exit 0 # Disabled in packages uploaded to Debian
+ # prerm script for fusionforge
+ #
+ # see: dh_installdeb(1)
+Index: src/debian/fusionforge-mta-exim4.postinst
+===================================================================
+--- src.orig/debian/fusionforge-mta-exim4.postinst
++++ src/debian/fusionforge-mta-exim4.postinst
+@@ -1,4 +1,5 @@
+ #!/bin/bash
++exit 0 # Disabled in packages uploaded to Debian
+ # postinst script for fusionforge
+ #
+ # see: dh_installdeb(1)
+Index: src/debian/fusionforge-mta-exim4.prerm
+===================================================================
+--- src.orig/debian/fusionforge-mta-exim4.prerm
++++ src/debian/fusionforge-mta-exim4.prerm
+@@ -1,4 +1,5 @@
+ #!/bin/sh
++exit 0 # Disabled in packages uploaded to Debian
+ # prerm script for fusionforge
+ #
+ # see: dh_installdeb(1)
+Index: src/debian/fusionforge-mta-postfix.postinst
+===================================================================
+--- src.orig/debian/fusionforge-mta-postfix.postinst
++++ src/debian/fusionforge-mta-postfix.postinst
+@@ -1,4 +1,5 @@
+ #!/bin/bash
++exit 0 # Disabled in packages uploaded to Debian
+ # postinst script for fusionforge
+ #
+ # see: dh_installdeb(1)
+Index: src/debian/fusionforge-mta-postfix.prerm
+===================================================================
+--- src.orig/debian/fusionforge-mta-postfix.prerm
++++ src/debian/fusionforge-mta-postfix.prerm
+@@ -1,4 +1,5 @@
+ #!/bin/sh
++exit 0 # Disabled in packages uploaded to Debian
+ # prerm script for fusionforge
+ #
+ # see: dh_installdeb(1)
+Index: src/debian/fusionforge-shell.postinst
+===================================================================
+--- src.orig/debian/fusionforge-shell.postinst
++++ src/debian/fusionforge-shell.postinst
+@@ -1,4 +1,5 @@
+ #!/bin/bash
++exit 0 # Disabled in packages uploaded to Debian
+ # postinst script for fusionforge
+ #
+ # see: dh_installdeb(1)
+Index: src/debian/fusionforge-shell.postrm
+===================================================================
+--- src.orig/debian/fusionforge-shell.postrm
++++ src/debian/fusionforge-shell.postrm
+@@ -1,4 +1,5 @@
+ #!/bin/sh
++exit 0 # Disabled in packages uploaded to Debian
+ # postrm script for fusionforge
+ #
+ # see: dh_installdeb(1)
+Index: src/debian/fusionforge-shell.prerm
+===================================================================
+--- src.orig/debian/fusionforge-shell.prerm
++++ src/debian/fusionforge-shell.prerm
+@@ -1,4 +1,5 @@
+ #!/bin/sh
++exit 0 # Disabled in packages uploaded to Debian
+ # prerm script for fusionforge
+ #
+ # see: dh_installdeb(1)
+Index: src/debian/fusionforge-web.postinst
+===================================================================
+--- src.orig/debian/fusionforge-web.postinst
++++ src/debian/fusionforge-web.postinst
+@@ -1,4 +1,5 @@
+ #!/bin/sh
++exit 0 # Disabled in packages uploaded to Debian
+ # postinst script for fusionforge
+ #
+ # see: dh_installdeb(1)
+Index: src/debian/fusionforge-web.postrm
+===================================================================
+--- src.orig/debian/fusionforge-web.postrm
++++ src/debian/fusionforge-web.postrm
+@@ -1,4 +1,5 @@
+ #!/bin/sh
++exit 0 # Disabled in packages uploaded to Debian
+ # postrm script for fusionforge
+ #
+ # see: dh_installdeb(1)
+Index: src/debian/fusionforge-web.prerm
+===================================================================
+--- src.orig/debian/fusionforge-web.prerm
++++ src/debian/fusionforge-web.prerm
+@@ -1,4 +1,5 @@
+ #!/bin/sh
++exit 0 # Disabled in packages uploaded to Debian
+ # prerm script for fusionforge
+ #
+ # see: dh_installdeb(1)
+Index: src/debian/plugin.postinst
+===================================================================
+--- src.orig/debian/plugin.postinst
++++ src/debian/plugin.postinst
+@@ -1,4 +1,5 @@
+ #!/bin/sh -e
++exit 0 # Disabled in packages uploaded to Debian
+ 
+ pluginctl=$(forge_get_config source_path)/post-install.d/common/plugin.sh
+ 
+Index: src/debian/plugin.prerm
+===================================================================
+--- src.orig/debian/plugin.prerm
++++ src/debian/plugin.prerm
+@@ -1,4 +1,5 @@
+ #!/bin/sh -e
++exit 0 # Disabled in packages uploaded to Debian
+ 
+ # Skip if -common was already removed
+ if ! which forge_get_config >/dev/null; then exit 0; fi
+Index: src/debian/fusionforge-common.README.Debian
+===================================================================
+--- /dev/null
++++ src/debian/fusionforge-common.README.Debian
+@@ -0,0 +1,10 @@
++Due to unreasonable demands from the Debian QA Team (namely to stop
++auto-configuring other packages), post-install scripts are disabled.
++
++You can run them manually on each upgrade with:
++
++  /usr/share/fusionforge/bin/post-install.sh
++ 
++Alternatively see the Debian packages from the official project:
++
++  https://fusionforge.org/plugins/mediawiki/wiki/fusionforge/index.php/DEB_Installation
diff --git a/src/patches/disable-plugins.patch b/src/patches/disable-plugins.patch
new file mode 100644
index 0000000..0de2404
--- /dev/null
+++ b/src/patches/disable-plugins.patch
@@ -0,0 +1,23 @@
+Index: src/debian/plugins
+===================================================================
+--- src.orig/debian/plugins
++++ src/debian/plugins
+@@ -6,18 +6,10 @@ Package: fusionforge-plugin-scmsvn
+ Depends: subversion, subversion-tools, viewvc, python, python-pycurl, xinetd, rsync, libapache2-mod-svn
+ Recommends: fusionforge-scm
+ 
+-Package: fusionforge-plugin-scmbzr
+-Depends: bzr, libapache2-mod-wsgi, loggerhead (>= 1.19~bzr477~), python-pastedeploy
+-Recommends: fusionforge-scm
+-
+ Package: fusionforge-plugin-scmarch
+ Depends:
+ Recommends: fusionforge-scm
+ 
+-Package: fusionforge-plugin-scmcvs
+-Depends: php-cli | php5-cli, cvs, viewvc, libphp-snoopy, xinetd, libipc-run-perl, liburi-perl, ${perl:Depends}
+-Recommends: fusionforge-scm
+-
+ Package: fusionforge-plugin-scmdarcs
+ Depends: darcs, darcsweb
+ Recommends: fusionforge-scm
diff --git a/src/patches/series b/src/patches/series
new file mode 100644
index 0000000..9ec4873
--- /dev/null
+++ b/src/patches/series
@@ -0,0 +1,2 @@
+disable-plugins.patch
+disable-maintscripts.patch

https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=74b2cc724135839c5eba3bb2d48fef47e4f35a0d

commit 74b2cc724135839c5eba3bb2d48fef47e4f35a0d
Author: Roland Mas <lolando at debian.org>
Date:   Sat Dec 2 16:56:37 2017 +0100

    Revert "Run fixup_upload.sh to make Debian packages comply with policy"
    
    This reverts commit ea1273a82d6f58b5f6f9f42bc790a7d8025aed7b.

diff --git a/src/debian/fusionforge-common.README.Debian b/src/debian/fusionforge-common.README.Debian
deleted file mode 100644
index 1fbb55e..0000000
--- a/src/debian/fusionforge-common.README.Debian
+++ /dev/null
@@ -1,10 +0,0 @@
-Due to unreasonable demands from the Debian QA Team (namely to stop
-auto-configuring other packages), post-install scripts are disabled.
-
-You can run them manually on each upgrade with:
-
-  /usr/share/fusionforge/bin/post-install.sh
- 
-Alternatively see the Debian packages from the official project:
-
-  https://fusionforge.org/plugins/mediawiki/wiki/fusionforge/index.php/DEB_Installation
diff --git a/src/debian/fusionforge-common.postinst b/src/debian/fusionforge-common.postinst
index 261b7b8..c2402da 100644
--- a/src/debian/fusionforge-common.postinst
+++ b/src/debian/fusionforge-common.postinst
@@ -1,5 +1,4 @@
 #!/bin/sh
-exit 0 # Disabled in packages uploaded to Debian
 # postinst script for fusionforge
 #
 # see: dh_installdeb(1)
diff --git a/src/debian/fusionforge-common.postrm b/src/debian/fusionforge-common.postrm
index 70d843c..9707fac 100644
--- a/src/debian/fusionforge-common.postrm
+++ b/src/debian/fusionforge-common.postrm
@@ -1,5 +1,4 @@
 #!/bin/sh
-exit 0 # Disabled in packages uploaded to Debian
 # postrm script for fusionforge
 #
 # see: dh_installdeb(1)
diff --git a/src/debian/fusionforge-common.prerm b/src/debian/fusionforge-common.prerm
index 85a3992..231c05f 100644
--- a/src/debian/fusionforge-common.prerm
+++ b/src/debian/fusionforge-common.prerm
@@ -1,5 +1,4 @@
 #!/bin/sh
-exit 0 # Disabled in packages uploaded to Debian
 # prerm script for fusionforge
 #
 # see: dh_installdeb(1)
diff --git a/src/debian/fusionforge-db-local.postinst b/src/debian/fusionforge-db-local.postinst
index 094e76e..2f31eb3 100644
--- a/src/debian/fusionforge-db-local.postinst
+++ b/src/debian/fusionforge-db-local.postinst
@@ -1,5 +1,4 @@
 #!/bin/sh
-exit 0 # Disabled in packages uploaded to Debian
 # postinst script for fusionforge
 #
 # see: dh_installdeb(1)
diff --git a/src/debian/fusionforge-db-local.prerm b/src/debian/fusionforge-db-local.prerm
index 72210a8..b2c0af9 100644
--- a/src/debian/fusionforge-db-local.prerm
+++ b/src/debian/fusionforge-db-local.prerm
@@ -1,5 +1,4 @@
 #!/bin/sh
-exit 0 # Disabled in packages uploaded to Debian
 # prerm script for fusionforge
 #
 # see: dh_installdeb(1)
diff --git a/src/debian/fusionforge-lists.postinst b/src/debian/fusionforge-lists.postinst
index 9f3454a..112c437 100644
--- a/src/debian/fusionforge-lists.postinst
+++ b/src/debian/fusionforge-lists.postinst
@@ -1,5 +1,4 @@
 #!/bin/bash
-exit 0 # Disabled in packages uploaded to Debian
 # postinst script for fusionforge
 #
 # see: dh_installdeb(1)
diff --git a/src/debian/fusionforge-lists.prerm b/src/debian/fusionforge-lists.prerm
index 4d1d445..5c367fe 100644
--- a/src/debian/fusionforge-lists.prerm
+++ b/src/debian/fusionforge-lists.prerm
@@ -1,5 +1,4 @@
 #!/bin/sh
-exit 0 # Disabled in packages uploaded to Debian
 # prerm script for fusionforge
 #
 # see: dh_installdeb(1)
diff --git a/src/debian/fusionforge-mta-exim4.postinst b/src/debian/fusionforge-mta-exim4.postinst
index 2a0ae24..2ab3c70 100644
--- a/src/debian/fusionforge-mta-exim4.postinst
+++ b/src/debian/fusionforge-mta-exim4.postinst
@@ -1,5 +1,4 @@
 #!/bin/bash
-exit 0 # Disabled in packages uploaded to Debian
 # postinst script for fusionforge
 #
 # see: dh_installdeb(1)
diff --git a/src/debian/fusionforge-mta-exim4.prerm b/src/debian/fusionforge-mta-exim4.prerm
index 00973fa..e773eeb 100644
--- a/src/debian/fusionforge-mta-exim4.prerm
+++ b/src/debian/fusionforge-mta-exim4.prerm
@@ -1,5 +1,4 @@
 #!/bin/sh
-exit 0 # Disabled in packages uploaded to Debian
 # prerm script for fusionforge
 #
 # see: dh_installdeb(1)
diff --git a/src/debian/fusionforge-mta-postfix.postinst b/src/debian/fusionforge-mta-postfix.postinst
index 98cfcb0..1e08231 100644
--- a/src/debian/fusionforge-mta-postfix.postinst
+++ b/src/debian/fusionforge-mta-postfix.postinst
@@ -1,5 +1,4 @@
 #!/bin/bash
-exit 0 # Disabled in packages uploaded to Debian
 # postinst script for fusionforge
 #
 # see: dh_installdeb(1)
diff --git a/src/debian/fusionforge-mta-postfix.prerm b/src/debian/fusionforge-mta-postfix.prerm
index b7e1acc..7292e83 100644
--- a/src/debian/fusionforge-mta-postfix.prerm
+++ b/src/debian/fusionforge-mta-postfix.prerm
@@ -1,5 +1,4 @@
 #!/bin/sh
-exit 0 # Disabled in packages uploaded to Debian
 # prerm script for fusionforge
 #
 # see: dh_installdeb(1)
diff --git a/src/debian/fusionforge-shell.postinst b/src/debian/fusionforge-shell.postinst
index 3acf7f3..aece140 100644
--- a/src/debian/fusionforge-shell.postinst
+++ b/src/debian/fusionforge-shell.postinst
@@ -1,5 +1,4 @@
 #!/bin/bash
-exit 0 # Disabled in packages uploaded to Debian
 # postinst script for fusionforge
 #
 # see: dh_installdeb(1)
diff --git a/src/debian/fusionforge-shell.postrm b/src/debian/fusionforge-shell.postrm
index 70ff38d..d791fc3 100644
--- a/src/debian/fusionforge-shell.postrm
+++ b/src/debian/fusionforge-shell.postrm
@@ -1,5 +1,4 @@
 #!/bin/sh
-exit 0 # Disabled in packages uploaded to Debian
 # postrm script for fusionforge
 #
 # see: dh_installdeb(1)
diff --git a/src/debian/fusionforge-shell.prerm b/src/debian/fusionforge-shell.prerm
index 5ac54c6..709d6b4 100644
--- a/src/debian/fusionforge-shell.prerm
+++ b/src/debian/fusionforge-shell.prerm
@@ -1,5 +1,4 @@
 #!/bin/sh
-exit 0 # Disabled in packages uploaded to Debian
 # prerm script for fusionforge
 #
 # see: dh_installdeb(1)
diff --git a/src/debian/fusionforge-web.postinst b/src/debian/fusionforge-web.postinst
index 53d60ba..1e6ebcc 100644
--- a/src/debian/fusionforge-web.postinst
+++ b/src/debian/fusionforge-web.postinst
@@ -1,5 +1,4 @@
 #!/bin/sh
-exit 0 # Disabled in packages uploaded to Debian
 # postinst script for fusionforge
 #
 # see: dh_installdeb(1)
diff --git a/src/debian/fusionforge-web.postrm b/src/debian/fusionforge-web.postrm
index c52919b..946d9be 100644
--- a/src/debian/fusionforge-web.postrm
+++ b/src/debian/fusionforge-web.postrm
@@ -1,5 +1,4 @@
 #!/bin/sh
-exit 0 # Disabled in packages uploaded to Debian
 # postrm script for fusionforge
 #
 # see: dh_installdeb(1)
diff --git a/src/debian/fusionforge-web.prerm b/src/debian/fusionforge-web.prerm
index 2c56781..148648c 100644
--- a/src/debian/fusionforge-web.prerm
+++ b/src/debian/fusionforge-web.prerm
@@ -1,5 +1,4 @@
 #!/bin/sh
-exit 0 # Disabled in packages uploaded to Debian
 # prerm script for fusionforge
 #
 # see: dh_installdeb(1)
diff --git a/src/debian/plugin.postinst b/src/debian/plugin.postinst
index a1b1425..5e44114 100644
--- a/src/debian/plugin.postinst
+++ b/src/debian/plugin.postinst
@@ -1,5 +1,4 @@
 #!/bin/sh -e
-exit 0 # Disabled in packages uploaded to Debian
 
 pluginctl=$(forge_get_config source_path)/post-install.d/common/plugin.sh
 
diff --git a/src/debian/plugin.prerm b/src/debian/plugin.prerm
index af16a66..861ff63 100644
--- a/src/debian/plugin.prerm
+++ b/src/debian/plugin.prerm
@@ -1,5 +1,4 @@
 #!/bin/sh -e
-exit 0 # Disabled in packages uploaded to Debian
 
 # Skip if -common was already removed
 if ! which forge_get_config >/dev/null; then exit 0; fi
diff --git a/src/debian/plugins b/src/debian/plugins
index db37469..3c88b8a 100644
--- a/src/debian/plugins
+++ b/src/debian/plugins
@@ -6,10 +6,18 @@ Package: fusionforge-plugin-scmsvn
 Depends: subversion, subversion-tools, viewvc, python, python-pycurl, xinetd, rsync, libapache2-mod-svn
 Recommends: fusionforge-scm
 
+Package: fusionforge-plugin-scmbzr
+Depends: bzr, libapache2-mod-wsgi, loggerhead (>= 1.19~bzr477~), python-pastedeploy
+Recommends: fusionforge-scm
+
 Package: fusionforge-plugin-scmarch
 Depends:
 Recommends: fusionforge-scm
 
+Package: fusionforge-plugin-scmcvs
+Depends: php-cli | php5-cli, cvs, viewvc, libphp-snoopy, xinetd, libipc-run-perl, liburi-perl, ${perl:Depends}
+Recommends: fusionforge-scm
+
 Package: fusionforge-plugin-scmdarcs
 Depends: darcs, darcsweb
 Recommends: fusionforge-scm

-----------------------------------------------------------------------

Summary of changes:
 src/debian/fusionforge-common.README.Debian |  10 --
 src/debian/fusionforge-common.postinst      |   1 -
 src/debian/fusionforge-common.postrm        |   1 -
 src/debian/fusionforge-common.prerm         |   1 -
 src/debian/fusionforge-db-local.postinst    |   1 -
 src/debian/fusionforge-db-local.prerm       |   1 -
 src/debian/fusionforge-lists.postinst       |   1 -
 src/debian/fusionforge-lists.prerm          |   1 -
 src/debian/fusionforge-mta-exim4.postinst   |   1 -
 src/debian/fusionforge-mta-exim4.prerm      |   1 -
 src/debian/fusionforge-mta-postfix.postinst |   1 -
 src/debian/fusionforge-mta-postfix.prerm    |   1 -
 src/debian/fusionforge-shell.postinst       |   1 -
 src/debian/fusionforge-shell.postrm         |   1 -
 src/debian/fusionforge-shell.prerm          |   1 -
 src/debian/fusionforge-web.postinst         |   1 -
 src/debian/fusionforge-web.postrm           |   1 -
 src/debian/fusionforge-web.prerm            |   1 -
 src/debian/plugin.postinst                  |   1 -
 src/debian/plugin.prerm                     |   1 -
 src/debian/plugins                          |   8 ++
 src/patches/disable-maintscripts.patch      | 205 ++++++++++++++++++++++++++++
 src/patches/disable-plugins.patch           |  23 ++++
 src/patches/series                          |   2 +
 24 files changed, 238 insertions(+), 29 deletions(-)
 delete mode 100644 src/debian/fusionforge-common.README.Debian
 create mode 100644 src/patches/disable-maintscripts.patch
 create mode 100644 src/patches/disable-plugins.patch
 create mode 100644 src/patches/series


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list