[SCM] kdenlive packaging branch, kubuntu_xenial_archive, updated. ubuntu/4%15.08.2-0ubuntu1-561-gb8d8ab5

Scarlett Clark sgclark-guest at moszumanska.debian.org
Thu Feb 18 19:30:52 UTC 2016


Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kdenlive.git;a=commitdiff;h=df2f73e

The following commit has been merged in the kubuntu_xenial_archive branch:
commit df2f73e2d9db112764bfb8dbc34780c5f8abe3fd
Author: the-me <the-me at f1c9c430-f51a-44e6-a298-6f72677f57b2>
Date:   Fri Jun 19 13:09:31 2009 +0000

    - Drop kdenlive.{menu,xpm} and install both from upstream.
    
    
    git-svn-id: https://svn.linux-dev.org/svn/pkg/kdenlive/trunk/debian@1047 f1c9c430-f51a-44e6-a298-6f72677f57b2
---
 changelog        |   3 +-
 kdenlive.install |   2 +-
 kdenlive.menu    |   4 -
 kdenlive.xpm     | 263 -------------------------------------------------------
 rules            |   2 +
 5 files changed, 5 insertions(+), 269 deletions(-)

diff --git a/changelog b/changelog
index 482250e..e46f702 100644
--- a/changelog
+++ b/changelog
@@ -1,8 +1,9 @@
 kdenlive (0.7.4+svn3592-1) UNRELEASED; urgency=low
 
   * New subversion snapshot of revision 3592.
+    - Drop kdenlive.{menu,xpm} and install both from upstream.
 
- -- Patrick Matthäi <pmatthaei at debian.org>  Fri, 19 Jun 2009 15:05:47 +0200
+ -- Patrick Matthäi <pmatthaei at debian.org>  Fri, 19 Jun 2009 15:08:55 +0200
 
 kdenlive (0.7.4-2) unstable; urgency=low
 
diff --git a/kdenlive.install b/kdenlive.install
index f2483c8..8b4c159 100644
--- a/kdenlive.install
+++ b/kdenlive.install
@@ -2,4 +2,4 @@ debian/tmp/usr/lib usr/
 debian/tmp/usr/share/man usr/share/
 debian/tmp/usr/share/applications/kde4 usr/share/applications/
 debian/tmp/usr/bin usr/
-debian/kdenlive.xpm usr/share/pixmaps/
+data/kdenlive.xpm usr/share/pixmaps/
diff --git a/kdenlive.menu b/kdenlive.menu
deleted file mode 100644
index b09aeea..0000000
--- a/kdenlive.menu
+++ /dev/null
@@ -1,4 +0,0 @@
-?package(kdenlive):needs="X11" section="Applications/Graphics"\
- title="Kdenlive"\
- description="A non-linear video editor for KDE."\
- command="/usr/bin/kdenlive" icon="/usr/share/pixmaps/kdenlive.xpm"
diff --git a/kdenlive.xpm b/kdenlive.xpm
deleted file mode 100644
index d3e02d5..0000000
--- a/kdenlive.xpm
+++ /dev/null
@@ -1,263 +0,0 @@
-/* XPM */
-static char * kdenlive_xpm[] = {
-"32 32 228 2",
-"  	c None",
-". 	c #5F2F2A",
-"+ 	c #2C1513",
-"@ 	c #241210",
-"# 	c #6A342E",
-"$ 	c #B1574D",
-"% 	c #B95B51",
-"& 	c #824039",
-"* 	c #6E3630",
-"= 	c #B4584F",
-"- 	c #3D1E1B",
-"; 	c #000000",
-"> 	c #89433C",
-", 	c #0F0E17",
-"' 	c #46475F",
-") 	c #393853",
-"! 	c #6F3630",
-"~ 	c #42201D",
-"{ 	c #0C0B15",
-"] 	c #44445C",
-"^ 	c #BABBCD",
-"/ 	c #E7E7EE",
-"( 	c #7A7BA0",
-"_ 	c #090811",
-": 	c #251110",
-"< 	c #B3584E",
-"[ 	c #89443C",
-"} 	c #0D0B12",
-"| 	c #42425A",
-"1 	c #7B7DA1",
-"2 	c #7E80A4",
-"3 	c #C3C4D5",
-"4 	c #E5E5EC",
-"5 	c #888AAB",
-"6 	c #42425E",
-"7 	c #6B342F",
-"8 	c #AB544B",
-"9 	c #AB5751",
-"0 	c #694F50",
-"a 	c #CBCCDA",
-"b 	c #7B7CA1",
-"c 	c #0D0C17",
-"d 	c #B1574E",
-"e 	c #B85A50",
-"f 	c #B2574E",
-"g 	c #9D5953",
-"h 	c #95939B",
-"i 	c #4A4A67",
-"j 	c #612F2A",
-"k 	c #A8534C",
-"l 	c #A8554E",
-"m 	c #A9534A",
-"n 	c #B25D58",
-"o 	c #56383C",
-"p 	c #7D7FA3",
-"q 	c #7E7FA4",
-"r 	c #13111E",
-"s 	c #151521",
-"t 	c #3A333F",
-"u 	c #B5665F",
-"v 	c #B7635D",
-"w 	c #A8534A",
-"x 	c #AA5750",
-"y 	c #97504C",
-"z 	c #54536A",
-"A 	c #50506E",
-"B 	c #13121E",
-"C 	c #5B5A74",
-"D 	c #7E7FA0",
-"E 	c #774B47",
-"F 	c #B8645D",
-"G 	c #A9534B",
-"H 	c #59383B",
-"I 	c #7D7FA2",
-"J 	c #151321",
-"K 	c #100F1A",
-"L 	c #4C4B67",
-"M 	c #DEDEE7",
-"N 	c #EFEFF4",
-"O 	c #8081A5",
-"P 	c #4D4759",
-"Q 	c #A85854",
-"R 	c #B25E58",
-"S 	c #A8534B",
-"T 	c #AA564F",
-"U 	c #9C524E",
-"V 	c #514F65",
-"W 	c #535373",
-"X 	c #474762",
-"Y 	c #7D7EA3",
-"Z 	c #B7B8CC",
-"` 	c #C4C5D6",
-" .	c #78799D",
-"..	c #643A3A",
-"+.	c #B35E59",
-"@.	c #AC5852",
-"#.	c #B15D57",
-"$.	c #5B383A",
-"%.	c #7C7EA1",
-"&.	c #171525",
-"*.	c #0C0A14",
-"=.	c #4A4A62",
-"-.	c #DDDDE6",
-";.	c #C8C8D8",
-">.	c #4E495C",
-",.	c #A65753",
-"'.	c #B5594F",
-").	c #A9564F",
-"!.	c #A05450",
-"~.	c #4F4C61",
-"{.	c #7F81A5",
-"].	c #C7C8D7",
-"^.	c #C1C2D3",
-"/.	c #565578",
-"(.	c #403F59",
-"_.	c #7F80A5",
-":.	c #E6E6ED",
-"<.	c #C5C6D6",
-"[.	c #7A7B9F",
-"}.	c #623A3B",
-"|.	c #AA544B",
-"1.	c #B15C57",
-"2.	c #5F393A",
-"3.	c #7A7C9F",
-"4.	c #EAEBF0",
-"5.	c #DFDFE8",
-"6.	c #515072",
-"7.	c #05040A",
-"8.	c #040309",
-"9.	c #585769",
-"0.	c #DEDEE6",
-"a.	c #9C9DB9",
-"b.	c #4F4B5F",
-"c.	c #A35651",
-"d.	c #A7534B",
-"e.	c #B6594F",
-"f.	c #A9554E",
-"g.	c #A45752",
-"h.	c #716D78",
-"i.	c #9C9EB9",
-"j.	c #5C5A79",
-"k.	c #151322",
-"l.	c #020205",
-"m.	c #8887A2",
-"n.	c #F7F7FA",
-"o.	c #AAABC3",
-"p.	c #7B7CA0",
-"q.	c #60393B",
-"r.	c #AD5953",
-"s.	c #B0564D",
-"t.	c #784F4B",
-"u.	c #C4C4D2",
-"v.	c #565575",
-"w.	c #171624",
-"x.	c #292839",
-"y.	c #8283A6",
-"z.	c #514D63",
-"A.	c #B85B51",
-"B.	c #B65950",
-"C.	c #A8544D",
-"D.	c #A65751",
-"E.	c #160F16",
-"F.	c #68688A",
-"G.	c #7C7DA1",
-"H.	c #5D393C",
-"I.	c #B9655E",
-"J.	c #B15D56",
-"K.	c #AF564D",
-"L.	c #AE564C",
-"M.	c #AD554C",
-"N.	c #62302A",
-"O.	c #282737",
-"P.	c #545268",
-"Q.	c #AA625B",
-"R.	c #BB6861",
-"S.	c #A65249",
-"T.	c #020105",
-"U.	c #676788",
-"V.	c #A2A3BE",
-"W.	c #9697B5",
-"X.	c #502F30",
-"Y.	c #68332D",
-"Z.	c #272636",
-"`.	c #8A8BAD",
-" +	c #FAFAFB",
-".+	c #D7D7E2",
-"++	c #484863",
-"@+	c #0E0C17",
-"#+	c #080404",
-"$+	c #9C4D44",
-"%+	c #21100E",
-"&+	c #646484",
-"*+	c #ABABC3",
-"=+	c #807F8E",
-"-+	c #1E1E25",
-";+	c #502723",
-">+	c #6B342E",
-",+	c #232232",
-"'+	c #A2A2BD",
-")+	c #FCFCFD",
-"!+	c #C4C5D5",
-"~+	c #51506D",
-"{+	c #984B42",
-"]+	c #974A42",
-"^+	c #010103",
-"/+	c #5F5F80",
-"(+	c #B3B3C9",
-"_+	c #8182A6",
-":+	c #8F8E9D",
-"<+	c #1F1E28",
-"[+	c #4C2521",
-"}+	c #B75A50",
-"|+	c #773A34",
-"1+	c #2E1613",
-"2+	c #1F1E2D",
-"3+	c #B8B9CD",
-"4+	c #FEFEFE",
-"5+	c #B7B7CC",
-"6+	c #585777",
-"7+	c #191825",
-"8+	c #944840",
-"9+	c #773B34",
-"0+	c #301715",
-"a+	c #5F5E7E",
-"b+	c #9494A5",
-"c+	c #1F1E2C",
-"d+	c #06050C",
-"e+	c #010002",
-"                                                                ",
-"                                                                ",
-"                              . +                               ",
-"                        @ # $ % &                               ",
-"                      * = % % % % -               ;             ",
-"                      $ % % % % % >           , ' )             ",
-"                      ! % % % % % % ~     { ] ^ / ( _           ",
-"                      : < % % % % % [ } | 1 2 3 4 5 6           ",
-"                        7 % % % % 8 9 0 a 2 2 2 2 2 b c         ",
-"                          d e f % f 9 g h 2 2 2 2 2 2 i         ",
-"                          j k l < % m n o p 2 2 2 2 2 q r       ",
-"                        s t u v w % < x y z 2 2 2 2 2 2 A       ",
-"                    B C q D E F 9 f % G n H I 2 2 2 2 2 2 J     ",
-"                K L M N O q P Q R S % = T U V 2 2 2 2 2 2 W     ",
-"            c X Y q Z ` O q  ...+. at .$ % G #.$.%.2 2 2 2 2 2 &.  ",
-"        *.=.-.;.q q q q q q q >.,.+.S % '.).!.~.2 2 2 {.].^./.  ",
-"    _ (.( _.:.<.q q q q q q q [.}.+. at .$ % |.1.2.3.2 2 2 4.5.6.7.",
-"8.9.0.a.q q q q q q q q q q q q b.c.+.d.% e.f.g.h.i.2 q j.k.    ",
-"l.m.n.o.q q q q q q q q q q q q p.q.+.r.s.% 8 R t.u.v.w.        ",
-"  x.y.q q q q q q q q q q q q q q z.!.+.S A.B.C.D.E.            ",
-"  l.F.q q q q q q q q q q q q q q G.H.I.J.K.% L.M.N.            ",
-"    O.q q q q q q q q q q q q q q q P.Q.R.S.% % % K.            ",
-"    T.U.q q q q q q q q q q q V.W.q b X.S $ % % % % Y.          ",
-"      Z.q q q q q q q q q q `. +.+++ at +#+$+% % % % % f %+        ",
-"      l.&+q q q q q q *+`.q q =+-+      ;+% % % % % % >+        ",
-"        ,+q q q q q '+)+!+~+B             {+% % % % % ]+        ",
-"        ^+/+O (+_+q q :+<+                [+% % % }+|+1+        ",
-"          2+3+4+5+6+7+                      8+}+9+0+            ",
-"            a+b+c+                            0+                ",
-"            d+e+                                                ",
-"                                                                ",
-"                                                                "};
diff --git a/rules b/rules
index 2726055..ae977c2 100755
--- a/rules
+++ b/rules
@@ -36,6 +36,7 @@ clean:
 	rm -f build-stamp configure-stamp
 	rm -rf build
 	rm -rf $(CURDIR)/debian/tmp
+	rm -f $(CURDIR)/kdenlive.menu
 	dh_clean
 
 install: build
@@ -43,6 +44,7 @@ install: build
 	dh_testroot
 	dh_prep
 	cd build && $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+	cp $(CURDIR)/data/kdenlive.menu $(CURDIR)/debian/
 
 binary-indep: build install
 	dh_testdir -i

-- 
kdenlive packaging



More information about the pkg-kde-commits mailing list