[SCM] Kaboom - Debian KDE 3->4 migration tool branch, master, updated. d8d96946284060c5bc0c7fe932cd98e982426893

George Kiagiadakis gkiagia-guest at alioth.debian.org
Sat Feb 28 15:56:13 UTC 2009


The following commit has been merged in the master branch:
commit d8d96946284060c5bc0c7fe932cd98e982426893
Author: George Kiagiadakis <gkiagia at users.sourceforge.net>
Date:   Sat Feb 28 17:55:34 2009 +0200

    Generate and install translations in /usr/share/kaboom/

diff --git a/debian/rules b/debian/rules
index e54646f..a62b440 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
-	qmake
+	qmake-qt4
 	touch configure-stamp
 
 
@@ -14,6 +14,7 @@ build: build-stamp
 build-stamp: configure-stamp
 	dh_testdir
 	$(MAKE)
+	lrelease-qt4 kaboom.pro
 	touch build-stamp
 
 clean:
@@ -21,7 +22,7 @@ clean:
 	dh_testroot
 	rm -f build-stamp configure-stamp
 	[ ! -f Makefile ] || $(MAKE) distclean
-	rm -f kaboom
+	rm -f *.qm
 	dh_clean
 
 install: build
@@ -29,7 +30,9 @@ install: build
 	dh_testroot
 	dh_prep
 	dh_installdirs
-	install -D -p -m0755 kaboom $(CURDIR)/debian/kaboom/usr/bin/kaboom
+	install -D -p -m0755 kaboom debian/kaboom/usr/bin/kaboom
+	mkdir -p debian/kaboom/usr/share/kaboom
+	install -p -m0644 -t debian/kaboom/usr/share/kaboom/ *.qm
 
 
 # Build architecture-independent files here.
diff --git a/main.cpp b/main.cpp
index 38f7cfd..afc8963 100644
--- a/main.cpp
+++ b/main.cpp
@@ -30,16 +30,16 @@ int main(int argc, char* argv[])
   }
 
   QApplication app(argc,argv);
-  
+
   QString locale = QLocale::system().name();
-  
+
   QTranslator translator;
-  if(!translator.load(QString("kaboom_") + locale))
+  if(!translator.load(QString("kaboom_") + locale, "/usr/share/kaboom"))
   {
       qDebug() << "loading translation failed";
   }
   app.installTranslator(&translator);
-  
+
   MigrationTool main;
   main.show();
   int exitvalue = app.exec();

-- 
Kaboom - Debian KDE 3->4 migration tool



More information about the pkg-kde-commits mailing list