[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

xterm: Changes to 'debian-unstable'



 debian/changelog     |    6 ++++++
 debian/control       |    2 ++
 debian/rules         |    2 +-
 debian/xterm.install |    1 +
 4 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit dc48174ad87c328be5d429a714e88597e74f2e2d
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date:   Thu Aug 4 15:56:38 2011 +0300

    Install .desktop files again.

diff --git a/debian/changelog b/debian/changelog
index 51ff142..d791b2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xterm (271-2) UNRELEASED; urgency=low
+
+  * Install .desktop files again. (Closes: #486317, LP: #129041)
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com>  Thu, 04 Aug 2011 15:19:28 +0300
+
 xterm (271-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/control b/debian/control
index 2d6b79f..81924f2 100644
--- a/debian/control
+++ b/debian/control
@@ -17,6 +17,7 @@ Build-Depends:
  quilt,
  lynx-cur | lynx,
  xorg-docs-core,
+ desktop-file-utils,
 
 # Reasons for Build-Depends:
 #
@@ -100,6 +101,7 @@ Build-Depends:
 #   debhelper (>= 5)                debian/compat = 5
 #   quilt                           patch management system
 #   lynx-cur | lynx                 generates plain-text version of xterm faq
+#   desktop-file-utils              for installing xterm.desktop
 
 Package: xterm
 Architecture: any
diff --git a/debian/rules b/debian/rules
index 2879066..5c2beea 100755
--- a/debian/rules
+++ b/debian/rules
@@ -93,7 +93,7 @@ install: build
 	dh_installdirs
 	# General installation
 	cd build && \
-	$(MAKE) install mandir=/usr/share/man/man1 libdir=/etc DESTDIR=$(DEBTREEDIR)
+	$(MAKE) install install-desktop mandir=/usr/share/man/man1 libdir=/etc DESTDIR=$(DEBTREEDIR)
 	
 	## Install lxterm command and manual page.
 	install -m 755 debian/local/lxterm $(DEBTREEDIR)/usr/bin
diff --git a/debian/xterm.install b/debian/xterm.install
index e620391..dad8ef6 100644
--- a/debian/xterm.install
+++ b/debian/xterm.install
@@ -2,3 +2,4 @@ etc/X11/app-defaults/*
 usr/bin/*
 usr/share/man/man1/*
 usr/share/pixmaps
+usr/share/applications/*


Reply to: