r13243 - packages/trunk/nikki/debian

[Paul Wise]

Author: pabs
Date: 2012-02-13 05:19:56 +0000 (Mon, 13 Feb 2012)
New Revision: 13243

Added:
   packages/trunk/nikki/debian/install
Modified:
   packages/trunk/nikki/debian/control
   packages/trunk/nikki/debian/rules
Log:
Use debhelper dh, install icons

Modified: packages/trunk/nikki/debian/control
===================================================================
--- packages/trunk/nikki/debian/control	2012-02-13 02:03:44 UTC (rev 13242)
+++ packages/trunk/nikki/debian/control	2012-02-13 05:19:56 UTC (rev 13243)
@@ -6,9 +6,8 @@
  Joachim Breitner <nomeata at debian.org>,
  Miriam Ruiz <miriam at debian.org>
 Build-Depends:
- cdbs,
  cmake,
- debhelper (>= 7),
+ debhelper (>= 7.0.50~),
  ghc,
  libghc-aeson-dev (<< 0.4),
  libghc-aeson-dev (>= 0.3),

Added: packages/trunk/nikki/debian/install
===================================================================
--- packages/trunk/nikki/debian/install	                        (rev 0)
+++ packages/trunk/nikki/debian/install	2012-02-13 05:19:56 UTC (rev 13243)
@@ -0,0 +1,6 @@
+data/png/icon-16.png usr/share/icons/hicolor/16x16/apps
+data/png/icon-32.png usr/share/icons/hicolor/32x32/apps 
+data/png/icon-64.png usr/share/icons/hicolor/64x64/apps
+data/png/icon-128.png usr/share/icons/hicolor/128x128/apps 
+data/png/icon-256.png usr/share/icons/hicolor/256x256/apps
+data/png/icon-512.png usr/share/icons/hicolor/512x512/apps

Modified: packages/trunk/nikki/debian/rules
===================================================================
--- packages/trunk/nikki/debian/rules	2012-02-13 02:03:44 UTC (rev 13242)
+++ packages/trunk/nikki/debian/rules	2012-02-13 05:19:56 UTC (rev 13243)
@@ -1,82 +1,28 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
 
-# Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-build: build-stamp
-build-arch: build-stamp
-build-indep: build-stamp
+%:
+	dh $@ --parallel
 
-build-stamp:
-	dh_testdir
-	
+override_dh_auto_build:
 	cd src/rootInstall/ && bash compileQtBindings.sh
 	mkdir -p src/rootInstall/dist 
 	cd src && ghc --make Setup.hs -o rootInstall/dist/setup
 	cd src/rootInstall && ./dist/setup configure --prefix=/usr --bindir=/usr/games --datasubdir=nikki
 	cd src/rootInstall && ./dist/setup build
-	
-	touch $@
 
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-	
+override_dh_auto_clean:
 	[ ! -e src/rootInstall/dist/setup ] || { cd src/rootInstall && ./dist/setup clean ; }
 	cd src && bash clean.sh
 	rm -f src/Setup.hi src/Setup.o
-	
-	dh_clean
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-	
+override_dh_auto_install:
 	cd src/rootInstall && ./dist/setup copy --destdir=../../debian/nikki/
 	rm -f debian/nikki/usr/share/nikki/LICENSE
 	rm -f debian/nikki/usr/share/nikki/README
 	mkdir -p debian/nikki/usr/share/doc/nikki
 
-
-# Build architecture-independent files here.
-binary-indep: install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs
-	dh_installdocs
-	dh_installexamples
-#	dh_install
-#	dh_installmenu
-#	dh_installdebconf
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_python
-#	dh_installinit
-#	dh_installcron
-#	dh_installinfo
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-#	dh_perl
-#	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+override_dh_install:
+	dh_install
+	prename s/icon-[0-9]+/nikki debian/nikki/usr/share/icons/hicolor/*/apps/icon-*.png