[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#767835: Bug#767567: bashburn: fails to upgrade from squeeze - trying to overwrite /usr/share/man/man1/bashburn.1.gz



Den 03. nov. 2014 20:58, skrev Andreas Beckmann:

> Next iteration for wheezy:
> use version 3.0.1-2~deb7u1 and create a separate changelog stanza on top
> of 3.0.1-2 containing something like "Upload for wheezy." No Closes needed.
> Send debdiff between 3.0.1-1 and 3.0.1-2~deb7u1 to the PU bug.
> 
> I just need to build it with -v3.0.1-1 and the .changes will contain the
> two changelog stanzas and the closes (similar to bpo builds).

Thanks. Debdiff attached.

Andreas
diff -Nru bashburn-3.0.1/debian/changelog bashburn-3.0.1/debian/changelog
--- bashburn-3.0.1/debian/changelog	2011-06-25 23:17:11.000000000 +0200
+++ bashburn-3.0.1/debian/changelog	2014-11-03 21:09:16.000000000 +0100
@@ -1,3 +1,17 @@
+bashburn (3.0.1-2+deb7u1) wheezy; urgency=medium
+
+  * Upload for Wheezy
+
+ -- Andreas Noteng <andreas@noteng.no>  Mon, 03 Nov 2014 21:03:41 +0100
+
+bashburn (3.0.1-2) unstable; urgency=medium
+
+  * Add Conflicts/Replaces: mybashburn to resolve a file conflict.
+    mybashburn from squeeze has been superseded by bashburn in wheezy,
+    but both used the same manpage. (Closes: #767567)
+
+ -- Andreas Noteng <andreas@noteng.no>  Mon, 03 Nov 2014 20:15:17 +0100
+
 bashburn (3.0.1-1) unstable; urgency=low
 
   * Initial release (Closes: #497092)
diff -Nru bashburn-3.0.1/debian/control bashburn-3.0.1/debian/control
--- bashburn-3.0.1/debian/control	2011-06-25 23:17:11.000000000 +0200
+++ bashburn-3.0.1/debian/control	2014-11-03 21:03:35.000000000 +0100
@@ -10,6 +10,8 @@
 
 Package: bashburn
 Architecture: all
+Replaces: mybashburn
+Conflicts: mybashburn
 Depends: ${shlibs:Depends}, ${misc:Depends}, bash (>= 3.0), cdrdao, wodim, dvd+rw-tools, cdparanoia,
  vorbis-tools, flac, eject, normalize-audio, mpg123, sudo, genisoimage
 Description: simplify cd/dvd burning at the command line

Attachment: signature.asc
Description: OpenPGP digital signature


Reply to: