[Pkg-mozext-commits] [SCM] Debian packaging of the downthemall extension. branch, master, updated. debian/2.0.13-1-4-gef0cdb2

[Michael Meskes]

The following commit has been merged in the master branch:
commit ef0cdb2f74c414d4d7a3bb6d277a3924344a85cd
Merge: 013f6a66bc50dc4af94bc651ac55a47c15aff4b4 1bd1c1985b4df4c5807f4b6bb6ff7a4d4acd6899
Author: Michael Meskes <meskes at debian.org>
Date:   Sun Feb 19 14:12:23 2012 +0100

    Merge branch 'master' of ssh://git.debian.org/git/pkg-mozext/downthemall
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index ee0420d,1443d6e..8330ef2
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,9 +1,17 @@@
- downthemall (2.0.13-1) unstable; urgency=low
++downthemall (2.0.13-2) unstable; urgency=low
 +
-   * Imported Upstream version 2.0.13 (Closes: #660422)
 +  * Removed redundant dependency on iceweasel.
-   * Remove check for available disk space that does not work, at least on some
++  * Removed check for available disk space that does not work, at least on some
 +    systems.
 +
-  -- Michael Meskes <meskes at debian.org>  Sun, 19 Feb 2012 11:40:07 +0100
++ -- Michael Meskes <meskes at debian.org>  Sun, 19 Feb 2012 14:16:18 +0100
++
+ downthemall (2.0.13-1) unstable; urgency=low
+ 
+   * Imported Upstream version 2.0.13 (Closes: #660422)
+   * Removed no more necessary ${xpi:Breaks} from d/control
+ 
+  -- Fabrizio Regalli <fabreg at fabreg.it>  Sun, 19 Feb 2012 13:02:50 +0100
  
  downthemall (2.0.10-1) unstable; urgency=low
  
diff --combined debian/control
index 63d2d07,cc15a96..7bc3ed5
--- a/debian/control
+++ b/debian/control
@@@ -12,12 -12,11 +12,11 @@@ Vcs-Browser: http://git.debian.org/?p=p
  
  Package: xul-ext-downthemall
  Architecture: all
 -Depends: iceweasel, ${misc:Depends}, ${xpi:Depends}
 +Depends: ${misc:Depends}, ${xpi:Depends}
  Recommends: ${xpi:Recommends}
  Provides: ${xpi:Provides}
  Enhances: ${xpi:Enhances}
  Replaces: iceweasel-downthemall (<< 2.0.1-1)
- Breaks: ${xpi:Breaks}
  Description: iceweasel extension with advanced download capabilities
   DownThemAll lets you download all the links or images contained in a webpage.
   It can refine the downloads by fully customizable criteria to only get what is

-- 
Debian packaging of the downthemall extension.