[SCM] ark packaging branch, master, updated. debian/14.12.2-1-17-gc6a3286

Maximiliano Curia maxy at moszumanska.debian.org
Thu Mar 26 20:04:54 UTC 2015


Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ark.git;a=commitdiff;h=2465272

The following commit has been merged in the master branch:
commit 2465272047e47ebcc0b70236914d94d20f0704b9
Merge: 5d927b367df39c2c5ede621c33a504716dea31f2 80ad155225817e2e8f45350ad9f7815451ca4c02
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Mar 26 16:01:28 2015 +0100

    Merge commit '80ad155225817e2e8f45350ad9f7815451ca4c02'
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/watch

 debian/changelog | 23 +++++++++--------------
 debian/control   |  2 +-
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --cc debian/changelog
index bcc8807,ee1f300..cadf5d0
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,9 +1,29 @@@
 +ark (4:14.12.3-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (14.12.3).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Thu, 26 Mar 2015 13:18:46 +0100
 +
+ ark (4:14.12.3-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 13 Mar 2015 14:15:02 -0700
+ 
 +ark (4:14.12.2-1) experimental; urgency=medium
 +
 +  * New upstream release (4.14.3).
 +  * New upstream release (14.12.2).
 +  * Bump Standards-Version to 3.9.6, no changes needed.
++  * New upstream patch: upstream_stop_crashing_on_exit properly fixes
++    upstream_remove_part_from_KXMLGUIFactory_on_exit (Closes: #770840)
++    Thanks to Tsu Jan
 +  * Remove upstream patch:
 +    upstream_remove_part_from_KXMLGUIFactory_on_exit
 +  * Remove upstream patch: upstream_stop_crashing_on_exit
 +
 + -- Maximiliano Curia <maxy at debian.org>  Mon, 23 Feb 2015 22:36:03 +0100
 +
  ark (4:14.12.2-0ubuntu1) vivid; urgency=medium
  
    * New upstream release
@@@ -49,22 -38,6 +58,14 @@@ ark (4:14.11.95-0ubuntu1) vivid; urgenc
  
   -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 21 Nov 2014 20:53:15 +0000
  
- ark (4:4.14.2-3~) UNRELEASED; urgency=medium
- 
-   * New upstream patch: upstream_stop_crashing_on_exit properly fixes
-     upstream_remove_part_from_KXMLGUIFactory_on_exit (Closes: #770840)
-     Thanks to Tsu Jan
- 
-  -- Maximiliano Curia <maxy at debian.org>  Mon, 08 Dec 2014 20:58:06 +0100
- 
 +ark (4:4.14.2-2) unstable; urgency=medium
 +
 +  * New upstream patch: upstream_remove_part_from_KXMLGUIFactory_on_exit
 +  * Update patch: use_libarchive_for_zip_files, handle adding and
 +    deleting files from a zip file (Closes: #769099)
 +
 + -- Maximiliano Curia <maxy at debian.org>  Thu, 13 Nov 2014 16:39:11 +0100
 +
  ark (4:4.14.2-1) unstable; urgency=medium
  
    * New upstream release (4.14.2).
@@@ -177,12 -150,12 +178,6 @@@ ark (4:4.12.90-0ubuntu1) trusty; urgenc
  
   -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 19 Mar 2014 10:29:32 +0000
  
--ark (4:4.12.4-2) UNRELEASED; urgency=low
--
--  * Fix use_libarchive_for_zip_files. Thanks to Augusto Beiro for noticing.
--
-- -- Sune Vuorela <sune at debian.org>  Fri, 16 May 2014 21:32:12 +0200
--
  ark (4:4.12.4-1) unstable; urgency=medium
  
    * New patch: use_libarchive_for_zip_files (Closes: #723963)

-- 
ark packaging



More information about the pkg-kde-commits mailing list