reassign 655616 src:acetoneiso 2.3-1
tags 655616 + patch
quit

peter green wrote:

> Currently acetoneiso has a build-depends on
>
> libqt4-dev (<< 4:4.7.0~beta2) | libqtwebkit-dev
>
> This makes it impossible to install the build-depends with tools
> that only look at the first option for a build-depends

Good catch.  Here's a patch (untested) for convenience.  I couldn't
resist sneaking in an unrelated change. ;-)
---
 debian/changelog |   12 +++++++++++-
 debian/control   |    2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d05b3ce..b986ad0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+acetoneiso (2.3-1.1) local; urgency=low
+
+  * debian/control:
+    - swapped order of alternatives that satisfy QtWebKit build-time
+      dependency to help sbuild (Closes: #655616) [Thanks to Peter Green]
+  * debian/changelog:
+    - corrected spelling of "MS"
+
+ -- Jonathan Nieder <jrnie...@gmail.com>  Thu, 19 Jan 2012 18:58:52 -0600
+
 acetoneiso (2.3-1) unstable; urgency=low
 
   * New upstream release
@@ -9,7 +19,7 @@ acetoneiso (2.3-1) unstable; urgency=low
     - fixed segmentation fault in erase cd/dvd function when no cd/dvd device
       is found
     - notice user if mounting an UDF ISO image providing him correct linux
-      command to mount the image as root user (tested with M$ Windows7 isos)
+      command to mount the image as root user (tested with MS Windows7 isos)
     - small gui changes, most important is that the gui window size is not
       locked anymore to a minimum value
     - updated some i18n translations
diff --git a/debian/control b/debian/control
index 83b3e12..e181866 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: otherosfs
 Priority: optional
 Maintainer: Nick Andrik <nick.and...@gmail.com>
 Build-Depends: cdbs, debhelper (>= 7),
-  libqt4-dev (<< 4:4.7.0~beta2) | libqtwebkit-dev,
+  libqtwebkit-dev | libqt4-dev (<< 4:4.7.0~beta2),
   libphonon-dev
 Standards-Version: 3.9.1
 Homepage: http://www.acetoneteam.org/
-- 
1.5.6.5




-- 
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Reply via email to