[SCM] root-system: CERN's ROOT Data Analysis Framework branch, master, updated. upstream/5.34.00_rc1-13-g5157e06

[Lifeng Sun]

The following commit has been merged in the master branch:
commit 5a16fc1dafcf5b8e4f32d8d7f22119328825a72f
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Thu Jun 14 09:12:37 2012 +0800

    Move root-system-bin.desktop back to debian/skel/.

diff --git a/debian/root-system-bin.desktop b/debian/root-system-bin.desktop
deleted file mode 100644
index 7aee216..0000000
--- a/debian/root-system-bin.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Name=ROOT
-GenericName=ROOT
-Comment=ROOT's Object Oriented Technologies
-Comment[dk]=ROOT er Object Orienteret Teknologi
-Exec=/usr/bin/root %F
-Icon=root-system-bin.png
-Categories=Education;Science;Math;DataVisualization;NumericalAnalysis;Physics;
-MimeType=application/x-root
-Terminal=true
-Type=Application
-StartupNotify=false
-
diff --git a/debian/rules b/debian/rules
index d59b2d3..1bfe7b6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -229,7 +229,8 @@ TEMPLATES	:= $(wildcard debian/skel/*.links.in) \
                    $(wildcard debian/skel/*.prerm.in) \
                    $(wildcard debian/skel/*.preinst.in) \
                    $(wildcard debian/skel/*.postinst.in) \
-                   $(wildcard debian/skel/*.init.in)
+                   $(wildcard debian/skel/*.init.in) \
+                   $(wildcard debian/skel/*.desktop.in)
 SPKGLIST	:= $(filter-out root-system-doc root-system-common ttf-root-installer, $(PKGLIST:libroot%=libroot%$(SOVERS))) $(filter libroot%, $(PKGLIST:libroot%=libroot%-dev)) libroot-static
 IPKGLIST	:= root-system-doc ttf-root-installer root-system-common root-system
 DPKGLIST	:= $(SPKGLIST:%=%,) root-system-doc, root-ttf
diff --git a/build/package/debian/root-system-bin.desktop.in b/debian/skel/root-system-bin.desktop.in
similarity index 100%
copy from build/package/debian/root-system-bin.desktop.in
copy to debian/skel/root-system-bin.desktop.in

-- 
root-system: CERN's ROOT Data Analysis Framework