← Back to team overview

linuxdcpp-team team mailing list archive

[Branch ~linuxdcpp-team/linuxdcpp/trunk] Rev 342: Make installation of desktop file non-Debian specific

 

------------------------------------------------------------
revno: 342
committer: Steven Sheehy <steven.sheehy@xxxxxxxxx>
branch nick: trunk
timestamp: Fri 2009-11-20 21:41:58 -0600
message:
  Make installation of desktop file non-Debian specific
modified:
  SConstruct
  debian/install


--
lp:linuxdcpp
https://code.launchpad.net/~linuxdcpp-team/linuxdcpp/trunk

Your team LinuxDC++ Team is subscribed to branch lp:linuxdcpp.
To unsubscribe from this branch go to https://code.launchpad.net/~linuxdcpp-team/linuxdcpp/trunk/+edit-subscription.
=== modified file 'SConstruct'
--- SConstruct	2009-11-03 03:13:47 +0000
+++ SConstruct	2009-11-21 03:41:58 +0000
@@ -276,9 +276,11 @@
 	glade_files = env.Glob('glade/*.glade')
 	text_files = env.Glob('*.txt')
 	prefix = env['FAKE_ROOT'] + env['PREFIX']
+	desktop_file = os.path.join('data', APP_NAME + '.desktop')
 
 	install_icons('icons/hicolor/', env)
 	env.Alias('install', env.Install(dir = os.path.join(prefix, 'share', APP_NAME, 'glade'), source = glade_files))
 	env.Alias('install', env.Install(dir = os.path.join(prefix, 'share', 'doc', APP_NAME), source = text_files))
+	env.Alias('install', env.Install(dir = os.path.join(prefix, 'share', 'applications'), source = desktop_file))
 	env.Alias('install', env.Install(dir = os.path.join(prefix, 'bin'), source = APP_NAME))
 

=== modified file 'debian/install'
--- debian/install	2009-10-22 03:11:11 +0000
+++ debian/install	2009-11-21 03:41:58 +0000
@@ -1,2 +1,1 @@
-data/linuxdcpp.desktop usr/share/applications
 icons/linuxdcpp.xpm usr/share/pixmaps