From: sr <sr@localhost.localdomain>
Date: Tue, 29 Dec 2009 18:54:07 +0000 (+0300)
Subject: Updated build rules
X-Git-Url: http://git.maemo.org/git/?p=qstardict;a=commitdiff_plain;h=d5b691e26ea1533d69cfdfa4f54b12acbeb3689d

Updated build rules
---

diff --git a/debian/changelog b/debian/changelog
index df0a5dd..2689708 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+qstardict (0.13.1-7) unstable; urgency=low
+
+  * optified
+  * Fixed icons
+
+ -- SR <sbir@list.ru>  Fri, 29 Dec 2009 21:43:00 +0300
+
 qstardict (0.13.1-6) unstable; urgency=low
 
   * Final Version
diff --git a/debian/control b/debian/control
index c002294..1dd1067 100644
--- a/debian/control
+++ b/debian/control
@@ -1,16 +1,17 @@
 Source: qstardict
-Version: 0.13.1-6
+Version: 0.13.1-7
 Section: x11
 Priority: optional
 Maintainer: SR <sbir@list.ru>
-Build-Depends: debhelper (>= 5), libqt4-dev (>= 4.4.0), libglib2.0-dev, zlib1g-dev, libx11-dev
+Build-Depends: debhelper (>= 5), libqt4-dev (>= 4.4.0), libglib2.0-dev, zlib1g-dev, libx11-dev, debhelper-maemo-package-icons (>= 0.0.2), maemo-optify | maemo-version (< 5.0)
 Standards-Version: 3.8.0
-Homepage: http://qstardict.ylsoftware.com
 
 Package: qstardict
+Section: user/office
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: festival
+XB-Maemo-Display-Name: QStarDict
 Description: International dictionary written using Qt4
  QStarDict is a modern international dictionary written using Qt4.
  .
diff --git a/debian/files b/debian/files
deleted file mode 100644
index 56c6827..0000000
--- a/debian/files
+++ /dev/null
@@ -1 +0,0 @@
-qstardict_0.13.1-6_armel.deb x11 optional
diff --git a/debian/qstardict.postinst.debhelper b/debian/qstardict.postinst.debhelper
deleted file mode 100644
index 8637a4e..0000000
--- a/debian/qstardict.postinst.debhelper
+++ /dev/null
@@ -1,5 +0,0 @@
-# Automatically added by dh_installmenu
-if [ "$1" = "configure" ] && [ -x "`which update-menus 2>/dev/null`" ]; then
-	update-menus
-fi
-# End automatically added section
diff --git a/debian/qstardict.postrm.debhelper b/debian/qstardict.postrm.debhelper
deleted file mode 100644
index 2b4be4f..0000000
--- a/debian/qstardict.postrm.debhelper
+++ /dev/null
@@ -1,3 +0,0 @@
-# Automatically added by dh_installmenu
-if [ -x "`which update-menus 2>/dev/null`" ]; then update-menus ; fi
-# End automatically added section
diff --git a/debian/qstardict.substvars b/debian/qstardict.substvars
deleted file mode 100644
index 29aea29..0000000
--- a/debian/qstardict.substvars
+++ /dev/null
@@ -1 +0,0 @@
-shlibs:Depends=libc6 (>= 2.5.0-1), libgcc1 (>= 1:4.2.1), libglib2.0-0 (>= 2.20.0), libqt4-core (>= 4.5.3~git20090723), libqt4-dbus (>= 4.5.3~git20090723), libqt4-gui (>= 4.5.3~git20090723), libqt4-network (>= 4.5.3~git20090723), libqt4-xml (>= 4.5.3~git20090723), libstdc++6 (>= 4.2.1), libx11-6, zlib1g (>= 1:1.2.1)
diff --git a/debian/rules b/debian/rules
index db6bbe3..6a772b6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,13 +45,16 @@ install:
 	cd $(CURDIR)/plugins && $(MAKE) INSTALL_ROOT=$(CURDIR)/debian/qstardict install
 	mkdir -p $(CURDIR)/debian/qstardict/usr/share/pixmaps
 	cp $(CURDIR)/debian/qstardict.xpm $(CURDIR)/debian/qstardict/usr/share/pixmaps/qstardict.xpm
+	mkdir -p $(CURDIR)/debian/qstardict/usr/share/icons/hicolor/scalable/hildon
 	cp $(CURDIR)/qstardict/qstardict.png $(CURDIR)/debian/qstardict/usr/share/pixmaps/qstardict.png
+	cp $(CURDIR)/qstardict/qstardict.png $(CURDIR)/debian/qstardict/usr/share/icons/hicolor/scalable/hildon/qstardict.png
 	mkdir -p $(CURDIR)/debian/qstardict/usr/share/applications/hildon/
 	cp $(CURDIR)/qstardict/qstardict.desktop $(CURDIR)/debian/qstardict/usr/share/applications/hildon/qstardict.desktop
 
 binary-indep: build install
 
 binary-arch: install
+	dh_maemo_package_icons
 	dh_testdir
 	dh_testroot
 	dh_installmenu
@@ -62,7 +65,11 @@ binary-arch: install
 	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums
+	if test -x /usr/bin/maemo-optify; then \
+		maemo-optify; \
+	fi
 	dh_builddeb
+	dh_maemo_package_icons -r
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install configure