[SCM] Debian Qt/KDE packaging tools branch, experimental, updated. debian/0.15.3-9-g2477822

[Sune Vuorela]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/pkg-kde-tools.git;a=commitdiff;h=bb5d4a4

The following commit has been merged in the experimental branch:
commit bb5d4a482acb8b4c44b9ed648881bc74d58e0632
Author: Sune Vuorela <sune at vuorela.dk>
Date:   Tue Apr 2 21:58:38 2013 +0000

    Revert "Add pkgkde-sort-install."
    
    This reverts commit 07c890ca1017964c99ed1d4d46725fa08a04c954.
    
    Conflicts:
    	debian/changelog
---
 CMakeLists.txt               |    1 -
 debian/changelog             |    4 +---
 debian/pkg-kde-tools.install |    1 -
 pkgkde-sortinstall           |   10 ----------
 4 files changed, 1 insertions(+), 15 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0ea5f08..c903938 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -75,7 +75,6 @@ install(PROGRAMS
     pkgkde-gensymbols
     pkgkde-getbuildlogs
     pkgkde-override-sc-dev-latest
-    pkgkde-sortinstall
     pkgkde-symbolshelper
     pkgkde-vcs
     pkgkde-git
diff --git a/debian/changelog b/debian/changelog
index 850cc97..eb0b00a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,5 @@
-pkg-kde-tools (0.15.4~pre3) UNRELEASED; urgency=low
+pkg-kde-tools (0.15.4) UNRELEASED; urgency=low
 
-  * Add pkgkde-sortinstall script, it's meant to help sorting debian/*.install
-    files.
   * Filter out -dbg packages from ${allLibraries} variables.
 
  -- José Manuel Santamaría Lema <panfaust at gmail.com>  Mon, 10 Sep 2012 10:09:02 +0200
diff --git a/debian/pkg-kde-tools.install b/debian/pkg-kde-tools.install
index 0e5dcb0..7764558 100644
--- a/debian/pkg-kde-tools.install
+++ b/debian/pkg-kde-tools.install
@@ -6,7 +6,6 @@ usr/bin/pkgkde-gensymbols
 usr/bin/pkgkde-getbuildlogs
 usr/bin/pkgkde-git
 usr/bin/pkgkde-override-sc-dev-latest
-usr/bin/pkgkde-sortinstall
 usr/bin/pkgkde-symbolshelper
 usr/bin/pkgkde-vcs
 usr/share/man/man1/dh_movelibkdeinit.1
diff --git a/pkgkde-sortinstall b/pkgkde-sortinstall
deleted file mode 100755
index 2b17e00..0000000
--- a/pkgkde-sortinstall
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-# simply sorts all files given on the command line
-
-for file in "$@"
-do
-  TMPFILE=`mktemp`
-  LANG=C sort -u ${file} > ${TMPFILE}
-  mv ${TMPFILE} ${file}
-  rm -f ${TMPFILE}
-done

-- 
Debian Qt/KDE packaging tools