Followup-For: Bug #696369
Control: tag -1 patch

Hi,

I'm attaching a patch that should fix this file conflict. I checked the
packages on snapshot.d.o to find the point where the files were moved
around.
I also asked to fix this issue via PU: http://bugs.debian.org/700675

I'd offer to NMU, but I prefer not to do this since I have no experience
with fusionforce and don't know how I can properly test it. I'm currently
verifying installability and upgradability with piuparts ... but that's
all I can do here.
Could anything break due to appending "+squeeze1" to the version number?

Note that p-u-NEW for the next stable point release (scheduled for 23rd)
will close on Monday.


Andreas
diffstat for fusionforge_5.0.2-5 fusionforge_5.0.2-5+squeeze1

 debian/control                     |    2 ++
 fusionforge-5.0.2/debian/changelog |    9 +++++++++
 2 files changed, 11 insertions(+)

diff -u fusionforge-5.0.2/debian/changelog fusionforge-5.0.2/debian/changelog
--- fusionforge-5.0.2/debian/changelog
+++ fusionforge-5.0.2/debian/changelog
@@ -1,3 +1,12 @@
+fusionforge (5.0.2-5+squeeze1) stable; urgency=low
+
+  * Non-maintainer upload.
+  * gforge-web-apache2: Add Breaks/Replaces: gforge-common (<< 4.8).
+    Avoid a file conflict during upgrades from lenny due to files being moved
+    around between packages.  (Closes: #696369)
+
+ -- Andreas Beckmann <a...@debian.org>  Sat, 16 Feb 2013 01:03:46 +0100
+
 fusionforge (5.0.2-5) unstable; urgency=low
 
   * Stop trying to copy libcap into chroot, since it's not used by PAM
only in patch2:
unchanged:
--- fusionforge-5.0.2.orig/debian/control
+++ fusionforge-5.0.2/debian/control
@@ -88,6 +88,8 @@
 Recommends: libphp-jpgraph, locales | locales-all
 Provides: gforge-web
 Conflicts: gforge-web
+Breaks: gforge-common (<< 4.8)
+Replaces: gforge-common (<< 4.8)
 Description: collaborative development tool - web part (using Apache)
  FusionForge provides many tools to aid collaboration in a
  development project, such as bug-tracking, task management,

Reply via email to