← Back to branch summary

~ubuntu-branches/ubuntu/vivid/kxneur/vivid

« back to all changes in this revision

Viewing changes to debian/patches/05_desktopfile.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Alexander GQ Gerasiov
  • Date: 2008-04-29 13:19:38 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20080429131938-p3q2zff1ljv6mtab
Tags: 0.8.0+svn20080310-2
http://bugs.debian.org/454826
http://bugs.debian.org/477042
Fix for FTBFS with gcc 4.3. Thanks Cyril Brulebois for patch.
(Closes: #454826, #477042.)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/05_desktopfile.dpatch
5
5
## DP: Install correct .desktop file into correct location.
6
6
 
7
7
@DPATCH@
8
 
diff -urNad kxneur-0.6.2~/src/Makefile.in kxneur-0.6.2/src/Makefile.in
9
 
--- kxneur-0.6.2~/src/Makefile.in       2007-07-17 13:14:16.000000000 +0400
10
 
+++ kxneur-0.6.2/src/Makefile.in        2007-10-09 03:36:05.925640295 +0400
11
 
@@ -380,7 +380,7 @@
12
 
 kxneur_LDADD = -lxnconfig $(LIB_KDEUI) -lpcre
 
8
diff -urNad kxneur~/src/Makefile.in kxneur/src/Makefile.in
 
9
--- kxneur~/src/Makefile.in     2008-03-15 21:04:19.000000000 +0300
 
10
+++ kxneur/src/Makefile.in      2008-03-15 21:38:11.971519351 +0300
 
11
@@ -312,7 +312,7 @@
 
12
 kxneur_LDADD = -lxnconfig $(LIB_KDEUI) $(LIB_KFILE)
13
13
 
14
14
 # this is where the desktop file will go 
15
15
-shelldesktopdir = $(kde_appsdir)/Utilities
17
17
 shelldesktop_DATA = kxneur.desktop
18
18
 
19
19
 # this is where the shell's XML-GUI resource file goes
20
 
@@ -697,7 +697,7 @@
 
20
@@ -698,7 +698,7 @@
21
21
 
22
22
 info-am:
23
23
 
26
26
        install-shelldesktopDATA
27
27
 
28
28
 install-exec-am: install-binPROGRAMS
29
 
@@ -726,7 +726,7 @@
 
29
@@ -727,7 +727,7 @@
30
30
 
31
31
 ps-am:
32
32
 
35
35
        uninstall-info-am uninstall-kxneurdataDATA \
36
36
        uninstall-shelldesktopDATA
37
37
 
38
 
diff -urNad kxneur-0.6.2~/src/kxneur.desktop kxneur-0.6.2/src/kxneur.desktop
39
 
--- kxneur-0.6.2~/src/kxneur.desktop    2007-06-11 22:51:10.000000000 +0400
40
 
+++ kxneur-0.6.2/src/kxneur.desktop     2007-10-09 03:31:23.420520248 +0400
 
38
diff -urNad kxneur~/src/kxneur.desktop kxneur/src/kxneur.desktop
 
39
--- kxneur~/src/kxneur.desktop  2008-03-15 21:04:19.000000000 +0300
 
40
+++ kxneur/src/kxneur.desktop   2008-03-15 21:38:11.971519351 +0300
41
41
@@ -3,15 +3,9 @@
42
42
 Name=KXNeur
43
43
 Exec=kxneur