[SCM] jedit - Java plugin-based editor for programmers branch, master, updated. debian/4.4.1+dfsg-1-1-g161a60b

[Gabriele Giacone]

The following commit has been merged in the master branch:
commit 161a60bc8eceb31788e67e6b591fd4d955434471
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Thu Nov 10 00:06:23 2011 +0100

    Fix pixmaps dir typo (Closes: #648232).

diff --git a/debian/changelog b/debian/changelog
index dcac928..ef010b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+jedit (4.4.1+dfsg-2) UNRELEASED; urgency=low
+
+  * Fix pixmaps dir typo (Closes: #648232).
+
+ -- Gabriele Giacone <1o5g4r8o at gmail.com>  Thu, 10 Nov 2011 00:05:40 +0100
+
 jedit (4.4.1+dfsg-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/rules b/debian/rules
index 14f292b..5c2ec89 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,9 +37,9 @@ 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
+	install -d -m 755 $(DESTDIR)/usr/share/pixmaps
 	convert $(ICON) -scale 32x32 \
-		$(DESTDIR)/usr/share/pixmap/jedit.xpm
+		$(DESTDIR)/usr/share/pixmaps/jedit.xpm
 	# desktop
 	cp jEdit/package-files/linux/deb/jedit.desktop debian/jedit.desktop
 	sed -i /^Icon/s/=.*/=jedit/ debian/jedit.desktop
@@ -48,7 +48,7 @@ override_dh_auto_install:
 		$(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/' \
+	sed -i '$$s/$$/ icon="\/usr\/share\/pixmaps\/jedit.xpm"/;s/Apps/Applications/' \
 		debian/jedit.menu
 
 override_dh_auto_clean:

-- 
jedit - Java plugin-based editor for programmers