[Pkg-cli-apps-commits] r3910 - in /packages/f-spot/trunk/debian: changelog patches/00list patches/debian_x-content-mimetype.dpatch patches/svn-042-3842_x-content-mimetype.dpatch

Fri Apr 25 00:14:24 UTC 2008

Author: diocles-guest
Date: Fri Apr 25 00:14:23 2008
New Revision: 3910

URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=3910
Log:
Move x-content-mimetype patch to svn-042-3842_x-content-mimetype.

Added:
    packages/f-spot/trunk/debian/patches/svn-042-3842_x-content-mimetype.dpatch
      - copied, changed from r3908, packages/f-spot/trunk/debian/patches/debian_x-content-mimetype.dpatch
Removed:
    packages/f-spot/trunk/debian/patches/debian_x-content-mimetype.dpatch
Modified:
    packages/f-spot/trunk/debian/changelog
    packages/f-spot/trunk/debian/patches/00list

Modified: packages/f-spot/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/changelog?rev=3910&op=diff
==============================================================================

--- packages/f-spot/trunk/debian/changelog (original)
+++ packages/f-spot/trunk/debian/changelog Fri Apr 25 00:14:23 2008
@@ -3,8 +3,6 @@
   * Rename patches to have different prefixes depending on their upstream
     status; svn-042-* are on upstream SVN trunk, stable-042-* are from the
     upstream stable SVN branch, and debian_* patches are not upstream.
-  * debian/patches/debian_x-content-mimetype.dpatch:
-    + Patch from upstream bugzilla for x-content mimetype .desktop file.
   * debian/patches/debian_link-system-mono-addins.dpatch,
     debian/patches/debian_link-system-flickrnet.dpatch:
     + Remove configure.in entries so that Makefiles aren't generated.
@@ -22,13 +20,15 @@
   * debian/patches/stable-042-3834_gphoto2-cameralist.dpatch:
     + Patch from upstream stable SVN branch for bug in gphoto2 bindings.
       (Closes: #475662)
+  * debian/patches/svn-042-3842_x-content-mimetype.dpatch:
+    + Patch from upstream SVN for x-content mimetype .desktop file.
   * debian/patches/11_screensaver_path.dpatch:
     + Remove - there is no point hardcoding a full path.
   * debian/control:
     + Add line breaks to Build-Depends.
   * debian/update_src_to_use_system_libs.sh: Remove unused script.
 
- -- Tim Retout <tim at retout.co.uk>  Wed, 16 Apr 2008 22:18:36 +0100
+ -- Tim Retout <tim at retout.co.uk>  Fri, 25 Apr 2008 01:10:07 +0100
 
 f-spot (0.4.2-1) unstable; urgency=low
 

Modified: packages/f-spot/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/00list?rev=3910&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/patches/00list (original)
+++ packages/f-spot/trunk/debian/patches/00list Fri Apr 25 00:14:23 2008
@@ -12,6 +12,7 @@
 svn-042-3754_deleting-1000-photos
 svn-042-3817_importdialog-missing-icon
 svn-042-3821_tag-icon-from-external-file
+svn-042-3842_x-content-mimetype
 
 # Patches that haven't been applied upstream yet.
 debian_libfspot-linkage
@@ -19,7 +20,6 @@
 debian_libfspotjpegtran-linkage
 debian_unlink-nunit
 debian_no-dup-app-icons
-debian_x-content-mimetype
 debian_link-system-mono-addins
 debian_link-system-flickrnet
 debian_flickrnet-2.1.5-port

Copied: packages/f-spot/trunk/debian/patches/svn-042-3842_x-content-mimetype.dpatch (from r3908, packages/f-spot/trunk/debian/patches/debian_x-content-mimetype.dpatch)
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/svn-042-3842_x-content-mimetype.dpatch?rev=3910&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/patches/debian_x-content-mimetype.dpatch (original)
+++ packages/f-spot/trunk/debian/patches/svn-042-3842_x-content-mimetype.dpatch Fri Apr 25 00:14:23 2008
@@ -1,5 +1,5 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## debian_x-content-mimetype.dpatch by Tim Retout <tim at retout.co.uk>
+## svn-042-3842_x-content-mimetype.dpatch by Tim Retout <tim at retout.co.uk>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: Patch from b.g.o. 510325 by Stephane Delcroix adding an f-spot-import


