diff options
| author | Thomas Preud'homme <robotux@celest.fr> | 2013-01-04 12:54:34 +0100 |
|---|---|---|
| committer | Thomas Preud'homme <robotux@celest.fr> | 2013-01-04 12:54:34 +0100 |
| commit | ebf89ecf2082ee73f307591858e36d6974ee4022 (patch) | |
| tree | 453fa9dbfe035085f64e7aa0e5bc74f0a1e1f252 /debian | |
| parent | f2e29f4bc9690a619014beafc1da8fa0436de9f6 (diff) | |
merge patched into master
Diffstat (limited to 'debian')
4 files changed, 9 insertions, 9 deletions
diff --git a/debian/.git-dpm b/debian/.git-dpm index eaca300..3d127e5 100644 --- a/debian/.git-dpm +++ b/debian/.git-dpm @@ -1,7 +1,7 @@ # see git-dpm(1) from git-dpm package -ebac45cd4ece4e6fdf2e9494f925aae0707d31dc -ebac45cd4ece4e6fdf2e9494f925aae0707d31dc -9f687f27f678f0d06d8e0071dac6b7c6c1aa0381 +5e1fc898f2fa389bfff3bb360d7767e855fc33f6 +5e1fc898f2fa389bfff3bb360d7767e855fc33f6 +aea07f8debfc051802dc9f5370685f12c8c82189 aea07f8debfc051802dc9f5370685f12c8c82189 ultracopier_0.2.0.15.orig.tar.bz2 28794bb2038db85138c2b2fd4bb70b84c6b788fb diff --git a/debian/patches/0001-Adapt-Ultracopier-to-build-system.patch b/debian/patches/0001-Adapt-Ultracopier-to-build-system.patch index 414ff93..8ace4b9 100644 --- a/debian/patches/0001-Adapt-Ultracopier-to-build-system.patch +++ b/debian/patches/0001-Adapt-Ultracopier-to-build-system.patch @@ -1,4 +1,4 @@ -From 3b9eb159d9e9e2523b5136973653dc730d467950 Mon Sep 17 00:00:00 2001 +From 1815994bacb0d521c237c1d4d6f94e333d39443a Mon Sep 17 00:00:00 2001 From: Thomas Preud'homme <thomas.preudhomme@celest.fr> Date: Sun, 3 Oct 2010 23:52:38 +0200 Subject: Adapt Ultracopier to build system @@ -61,5 +61,5 @@ index 2183f87..1c515a6 100644 CONFIG += ordered SUBDIRS = src/ultracopier.pro -- -1.7.1 +1.7.4.4 diff --git a/debian/patches/0002-Remove-deprecated-key-in-desktop-entry.patch b/debian/patches/0002-Remove-deprecated-key-in-desktop-entry.patch index ea7cac4..ed1f0a9 100644 --- a/debian/patches/0002-Remove-deprecated-key-in-desktop-entry.patch +++ b/debian/patches/0002-Remove-deprecated-key-in-desktop-entry.patch @@ -1,4 +1,4 @@ -From e81e34423f0c962be21174ba2d77966b34833416 Mon Sep 17 00:00:00 2001 +From 03ce51a49b0b299ea6f656e2c4a7232062ae2f6a Mon Sep 17 00:00:00 2001 From: Thomas Preud'homme <thomas.preudhomme@celest.fr> Date: Thu, 7 Oct 2010 17:11:29 +0200 Subject: Remove deprecated key in desktop entry. @@ -26,5 +26,5 @@ index bc68cb4..9284787 100644 X-DBUS-ServiceName= X-DBUS-StartupType= -- -1.7.1 +1.7.4.4 diff --git a/debian/patches/0003-Fix-two-typos-affecting-the-binary.patch b/debian/patches/0003-Fix-two-typos-affecting-the-binary.patch index 49f5c36..0b14bad 100644 --- a/debian/patches/0003-Fix-two-typos-affecting-the-binary.patch +++ b/debian/patches/0003-Fix-two-typos-affecting-the-binary.patch @@ -1,4 +1,4 @@ -From ebac45cd4ece4e6fdf2e9494f925aae0707d31dc Mon Sep 17 00:00:00 2001 +From 5e1fc898f2fa389bfff3bb360d7767e855fc33f6 Mon Sep 17 00:00:00 2001 From: Thomas Preud'homme <thomas.preudhomme@celest.fr> Date: Mon, 11 Oct 2010 16:21:19 +0200 Subject: Fix two typos affecting the binary. @@ -261,5 +261,5 @@ index e976976..d41c249 100644 </message> <message> -- -1.7.1 +1.7.4.4 |