[SCM] qtcreator packaging branch, master, updated. debian/4.2.0-1-14-ge06d8b1
Adam Majer
adamm at moszumanska.debian.org
Tue Jul 11 18:25:08 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtcreator.git;a=commitdiff;h=3517df3
The following commit has been merged in the master branch:
commit 3517df3342465e3d892f7bedfb2624668bd3fa7a
Author: Adam Majer <adamm at zombino.com>
Date: Tue Jul 11 13:15:08 2017 +0000
Use upstream version of .desktop file
Use upstream version of .desktop file that includes reference to
multiple resolution icon versions.
---
debian/changelog | 1 +
debian/qtcreator-data.install | 2 +
debian/qtcreator-icon-32x32.xpm | 142 ----------------------------------------
debian/qtcreator.desktop | 10 ---
debian/qtcreator.install | 4 +-
5 files changed, 4 insertions(+), 155 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f8edf46..0ddf145 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ qtcreator (4.3.1-1) UNRELEASED; urgency=medium
documentation directory
* Install HTML version of the documentation for both QtCreator
end user and the plugin developer.
+ * Remove qtcreator.desktop in favour of upstream version
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Thu, 01 Jun 2017 20:41:24 -0500
diff --git a/debian/qtcreator-data.install b/debian/qtcreator-data.install
index 8b1963b..ede5bdc 100644
--- a/debian/qtcreator-data.install
+++ b/debian/qtcreator-data.install
@@ -1,3 +1,5 @@
debian/Nokia-QtCreator.xml usr/share/mime/packages/
+tmp/usr/share/applications/org.qt-project.qtcreator.desktop
+tmp/usr/share/metainfo/org.qt-project.qtcreator.appdata.xml
usr/share/icons/hicolor/*
usr/share/qtcreator/*
diff --git a/debian/qtcreator-icon-32x32.xpm b/debian/qtcreator-icon-32x32.xpm
deleted file mode 100644
index 91d8159..0000000
--- a/debian/qtcreator-icon-32x32.xpm
+++ /dev/null
@@ -1,142 +0,0 @@
-/* XPM */
-static char * qtcreator_icon_32x32_xpm[] = {
-"32 32 107 2",
-" c None",
-". c #024C1C",
-"+ c #38871E",
-"@ c #5AA72D",
-"# c #044E1C",
-"$ c #489723",
-"% c #09531D",
-"& c #98CE70",
-"* c #F1F8EC",
-"= c #E8F4E0",
-"- c #B1DA91",
-"; c #519F27",
-"> c #80C052",
-", c #FFFFFF",
-"' c #0E591D",
-") c #F2F9ED",
-"! c #A4D37F",
-"~ c #DFF0D2",
-"{ c #C9E5B2",
-"] c #8CC760",
-"^ c #216E1C",
-"/ c #82C154",
-"( c #64AE34",
-"_ c #E0F0D3",
-": c #28761C",
-"< c #1A671C",
-"[ c #2F7E1D",
-"} c #81C152",
-"| c #76BA46",
-"1 c #408F20",
-"2 c #6CB43B",
-"3 c #808080",
-"4 c #99CE71",
-"5 c #848484",
-"6 c #757575",
-"7 c #F9FCF6",
-"8 c #14601D",
-"9 c #888888",
-"0 c #B3B3B3",
-"a c #9B9B9B",
-"b c #6CB43C",
-"c c #949494",
-"d c #C3C3C3",
-"e c #E1E1E1",
-"f c #858585",
-"g c #216F1C",
-"h c #BDE0A3",
-"i c #878787",
-"j c #B4B4B4",
-"k c #D5D5D5",
-"l c #D7D7D7",
-"m c #DADADA",
-"n c #747474",
-"o c #C8E5B2",
-"p c #76BB46",
-"q c #828282",
-"r c #A5A5A5",
-"s c #CBCBCB",
-"t c #E5E5E5",
-"u c #D2D2D2",
-"v c #E7E7E7",
-"w c #BEBEBE",
-"x c #7D7D7D",
-"y c #9D9D9D",
-"z c #DFDFDF",
-"A c #CDCDCD",
-"B c #E2E2E2",
-"C c #7F7F7F",
-"D c #B2B2B2",
-"E c #D8D8D8",
-"F c #DBDBDB",
-"G c #DEDEDE",
-"H c #D0D0D0",
-"I c #E0E0E0",
-"J c #D1D1D1",
-"K c #AFAFAF",
-"L c #DCDCDC",
-"M c #C9C9C9",
-"N c #DDDDDD",
-"O c #676767",
-"P c #818181",
-"Q c #CFCFCF",
-"R c #8A8A8A",
-"S c #8B8B8B",
-"T c #CACACA",
-"U c #B8B8B8",
-"V c #D4D4D4",
-"W c #CCCCCC",
-"X c #ACACAC",
-"Y c #6D6D6D",
-"Z c #105B1D",
-"` c #898989",
-" . c #C8C8C8",
-".. c #D6D6D6",
-"+. c #BABABA",
-"@. c #CECECE",
-"#. c #B1B1B1",
-"$. c #C2C2C2",
-"%. c #C5C5C5",
-"&. c #C6C6C6",
-"*. c #AAAAAA",
-"=. c #B7B7B7",
-"-. c #BBBBBB",
-";. c #989898",
-">. c #777777",
-",. c #8F8F8F",
-"'. c #717171",
-" ",
-" . . + @ @ @ @ @ @ ",
-". . + @ @ @ @ @ @ @ @ @ @ @ @ @ ",
-". . @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ ",
-". # @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ ",
-". # @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ ",
-". # @ @ @ @ $ % + & * = - @ @ @ @ @ @ @ @ @ @ ",
-". # @ @ @ ; . > , , , , , = @ @ # > , @ @ @ @ ",
-". # @ @ @ ' + , , ) % + , , ! @ . ~ , @ @ @ @ ",
-". # @ @ @ . { , , ] @ . & , ) ^ ' , , / ( @ @ ",
-". # @ @ + . , , , ( @ ' @ , , + , , , , _ @ @ ",
-". # @ @ : < , , , @ @ < + , , [ - , * } | @ @ ",
-". # @ @ < < , , , @ @ < < , , $ @ , , @ @ @ @ ",
-". # @ @ < @ , , _ @ @ < < , , @ @ , , @ @ @ @ ",
-". # @ @ < : , , ) @ @ < < , , @ @ , , @ @ @ @ ",
-". # @ @ < < , , , @ @ < < , , 1 @ , , @ @ @ @ ",
-". # @ @ + < , , , @ @ < $ , , + @ , , @ @ @ @ ",
-". # @ @ 1 . , , , 2 @ ' @ , , : @ , , @ @ @ @ 3 ",
-". # @ @ @ . & , , 4 @ . & , ) < : , , : : @ @ 5 6 ",
-". # @ @ @ < < , , 7 8 $ , , ! [ ' , , ~ _ @ @ 9 0 a ",
-". # @ @ @ ; . b , , , , , = @ @ ' : { _ 4 @ @ c d e f ",
-". # @ @ @ @ ; ' g - , , h @ @ @ @ @ @ @ @ i j k l m n ",
-". # @ @ @ @ @ @ < + , , o p @ @ @ @ @ q r s t u v w ",
-". # @ @ @ @ @ @ $ . ~ , , _ @ @ @ @ x y d z e A z B y ",
-". # @ @ @ @ @ @ @ : ' > * o @ @ @ C D E F G H k I J 5 ",
-". # @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ n K k E L k M N E 0 O ",
-". # @ @ @ @ @ @ @ @ @ @ @ @ @ @ P d k E E w m k Q R ",
-". # @ @ @ @ @ @ @ @ @ S T k E U V J W X Y ",
-" Z @ @ @ ` ...+. at .@. .#.3 ",
-" ` .$.%.W &.*.3 ",
-" =.=.-.K ;.>. ",
-" ` ,.x '. "};
diff --git a/debian/qtcreator.desktop b/debian/qtcreator.desktop
deleted file mode 100644
index f7eea92..0000000
--- a/debian/qtcreator.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Exec=qtcreator %F
-Icon=QtProject-qtcreator
-Type=Application
-Terminal=false
-Name=Qt Creator
-GenericName=Integrated Development Environment
-MimeType=text/x-c++src;text/x-c++hdr;text/x-xsrc;application/x-designer;application/vnd.nokia.qt.qmakeprofile;application/vnd.nokia.xml.qt.resource;
-Categories=Qt;Development;IDE;
-InitialPreference=9
diff --git a/debian/qtcreator.install b/debian/qtcreator.install
index c2adf90..7c5ed3a 100644
--- a/debian/qtcreator.install
+++ b/debian/qtcreator.install
@@ -1,4 +1,2 @@
-debian/qtcreator-icon-32x32.xpm usr/share/pixmaps/
-debian/qtcreator.desktop usr/share/applications/
-usr/bin/*
+usr/bin/qtcreator
usr/lib/*/qtcreator/*
--
qtcreator packaging
More information about the pkg-kde-commits
mailing list