[SCM] KDE Admin module packaging branch, master, updated. debian/4.4.5-4-28-g363153c

Modestas Vainius modax at alioth.debian.org
Tue Mar 29 23:18:55 UTC 2011


The following commit has been merged in the master branch:
commit 014766532ac9b8d0432f8e2bb4e0126b98da92a8
Author: Modestas Vainius <modax at debian.org>
Date:   Wed Mar 30 01:19:09 2011 +0300

    Strip sequence numbers from debian/patches/*.
---
 debian/changelog                                   |    1 +
 ...d_gid_fix.diff => kuser_first_uid_gid_fix.diff} |    0
 debian/patches/series                              |    4 ++--
 ...ff => system_config_printer_kde_cupsutils.diff} |    0
 ...config_printer_kde_scroll_printer_options.diff} |    0
 5 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a328f3e..f9e2bd9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,7 @@ kdeadmin (4:4.6.1-0r1) UNRELEASED; urgency=low
     backported from upstream.
   * Adapt 05_system_config_printer_kde_scroll_printer_options.diff to upstream
     changes.
+  * Strip sequence numbers from debian/patches/*.
 
  -- José Manuel Santamaría Lema <panfaust at gmail.com>  Sat, 11 Sep 2010 20:07:52 +0000
 
diff --git a/debian/patches/02_kuser_first_uid_gid_fix.diff b/debian/patches/kuser_first_uid_gid_fix.diff
similarity index 100%
rename from debian/patches/02_kuser_first_uid_gid_fix.diff
rename to debian/patches/kuser_first_uid_gid_fix.diff
diff --git a/debian/patches/series b/debian/patches/series
index 245d377..e5d2df9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-01_system_config_printer_kde_cupsutils.diff
-02_kuser_first_uid_gid_fix.diff
+system_config_printer_kde_cupsutils.diff
+kuser_first_uid_gid_fix.diff
diff --git a/debian/patches/01_system_config_printer_kde_cupsutils.diff b/debian/patches/system_config_printer_kde_cupsutils.diff
similarity index 100%
rename from debian/patches/01_system_config_printer_kde_cupsutils.diff
rename to debian/patches/system_config_printer_kde_cupsutils.diff
diff --git a/debian/patches/05_system_config_printer_kde_scroll_printer_options.diff b/debian/patches/system_config_printer_kde_scroll_printer_options.diff
similarity index 100%
rename from debian/patches/05_system_config_printer_kde_scroll_printer_options.diff
rename to debian/patches/system_config_printer_kde_scroll_printer_options.diff

-- 
KDE Admin module packaging



More information about the pkg-kde-commits mailing list