[SCM] jedit - Java plugin-based editor for programmers branch, master, updated. upstream/4.3.2+dfsg-8-g31a189a

[Gabriele Giacone]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "jedit - Java plugin-based editor for programmers".

The branch, master has been updated
       via  31a189a18b8d4758d21376adfdf71e5e54831d64 (commit)
      from  257950a4bf6bd23c476462fe80f9e9694157b9ac (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 31a189a18b8d4758d21376adfdf71e5e54831d64
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Fri Jun 18 01:47:31 2010 +0200

    added Debian and desktop menu

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog     |    7 +++++++
 debian/jedit.desktop |   16 ----------------
 debian/rules         |   12 ++++++++++++
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c390936..b381776 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+jedit (4.3.2+dfsg-2) unstable; urgency=low
+
+  * Added desktop menu, Debian menu and icons from upstream.
+    Thanks to Daniel Hahler msgid:<201006162350.30109.ubuntu at thequod.de>
+
+ -- Gabriele Giacone <1o5g4r8o at gmail.com>  Fri, 18 Jun 2010 01:44:33 +0200
+
 jedit (4.3.2+dfsg-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/jedit.desktop b/debian/jedit.desktop
deleted file mode 100644
index d7d74de..0000000
--- a/debian/jedit.desktop
+++ /dev/null
@@ -1,16 +0,0 @@
-[Desktop Entry]
-Name=jEdit
-GenericName=Programmer's Text Editor
-GenericName[ca]=Editor de text per a programadors
-GenericName[de]=Texteditor für Programmierer
-GenericName[es]=Editor de textos para programadores
-Comment=Edit text files
-Comment[ca]=Editeu fitxers de text
-Comment[de]=Editiere Textdateien
-Comment[es]=Modifique archivos de texto
-Exec=jedit %U
-Icon=jedit
-Terminal=false
-Type=Application
-Categories=Development;TextEditor
-StartupNotify=true
diff --git a/debian/rules b/debian/rules
index 518f48a..14f292b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,6 +27,7 @@ override_dh_auto_build:
 
 override_dh_auto_install:
 	dh_install
+	# icons
 	install -d -m 755 $(DESTDIR)/usr/share/icons/hicolor/16x16/apps
 	convert $(ICON) -scale 16x16 \
 		$(DESTDIR)/usr/share/icons/hicolor/16x16/apps/jedit.png
@@ -36,14 +37,25 @@ override_dh_auto_install:
 	install -d -m 755 $(DESTDIR)/usr/share/icons/hicolor/48x48/apps
 	convert $(ICON) -scale 48x48 \
 		$(DESTDIR)/usr/share/icons/hicolor/48x48/apps/jedit.png
+	install -d -m 755 $(DESTDIR)/usr/share/pixmap
+	convert $(ICON) -scale 32x32 \
+		$(DESTDIR)/usr/share/pixmap/jedit.xpm
+	# desktop
+	cp jEdit/package-files/linux/deb/jedit.desktop debian/jedit.desktop
+	sed -i /^Icon/s/=.*/=jedit/ debian/jedit.desktop
 	install -d -m 755 $(DESTDIR)/usr/share/applications
 	install -m 644 debian/jedit.desktop \
 		$(DESTDIR)/usr/share/applications
+	# menu
+	cp jEdit/package-files/linux/deb/jedit debian/jedit.menu
+	sed -i '$$s/$$/ icon="\/usr\/share\/pixmap\/jedit.xpm"/;s/Apps/Applications/' \
+		debian/jedit.menu
 
 override_dh_auto_clean:
 	-dh_quilt_unpatch
 	-mv debian/patches/series debian/patches/series.noauto
 	cd jEdit && ant clean-all
+	rm -f debian/jedit.menu debian/jedit.desktop
 	# bsh: clean
 	rm -rf jEdit/org/gjt/sp/jedit/bsh bsh
 


hooks/post-receive
-- 
jedit - Java plugin-based editor for programmers