Merge pull request #228 from Nanolx/master

Debian packaging scripts

7 files changed, 45 insertions, 14 deletions

diff --git a/debian/changelog b/debian/changelog
index 6a69bf2c..73f0bacb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,18 @@
+lumina-desktop (0.9.1.1421-1nano) unstable; urgency=low
+
+  * new git snapshot
+  * update lumina-fm.install
+  * update lumina-data.install
+  * update lumina-desktop.install
+  * add lumina-textedit package
+  * add lumina-textedit as dependency for lumina-desktop
+  * update debian/merge-lumina-i18n.sh
+
+ -- Christopher Roy Bratusek <nano@jpberlin.de>  Wed, 25 May 2016 20:59:42 +0200
+
 lumina-desktop (0.9.0.1235-2nano) unstable; urgency=low
 
-  * New maintainer build
+  * New maintainance build
   * add -dbgsym packages
 
  -- Christopher Roy Bratusek <nano@jpberlin.de>  Tue, 01 Mar 2016 21:21:33 +0100
diff --git a/debian/control b/debian/control
index 2a48cd9e..70a2ba0a 100644
--- a/debian/control
+++ b/debian/control
@@ -18,10 +18,10 @@ Replaces: lumina-core (<< 0.8.3.372)
 Depends: ${misc:Depends}, ${shlibs:Depends}, libluminautils1 (= ${binary:Version}),
          libluminautils1, lumina-config, lumina-fm, oxygen-icon-theme,
          lumina-open, lumina-screenshot, lumina-search, lumina-info,
-         lumina-xconfig, lumina-fileinfo, lxpolkit, lumina-data, fluxbox,
-         numlockx, xbacklight, xscreensaver, usbmount, alsa-utils, acpi,
-         gstreamer1.0-plugins-base, phonon4qt5-backend-gstreamer,
-         pavucontrol, procps, sysstat
+         lumina-xconfig, lumina-fileinfo, lxpolkit, lumina-data,
+         lumina-textedit, fluxbox, numlockx, xbacklight, xscreensaver,
+         usbmount, alsa-utils, acpi, gstreamer1.0-plugins-base,
+         phonon4qt5-backend-gstreamer, pavucontrol, procps, sysstat
 Recommends: qt5-configuration-tool
 Description: Lightweight Qt5-based desktop environment
  Metapackage depending on all other lumina packages.
@@ -110,6 +110,15 @@ Replaces: lumina-core (<< 0.8.3.372)
 Description: Desktop file editor for the lumina desktop environment
  Advanced desktop file (menu) editor for Lumina
 
+Package: lumina-textedit
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}, libluminautils1 (= ${binary:Version})
+Description: Texteditor for the lumina desktop environment
+ Simple Texteditor for for Lumina, featuring
+ - tabs for multiple files
+ - syntax highlighting
+ - line wrapping
+
 Package: lumina-data
 Architecture: all
 Depends: ${misc:Depends}, libluminautils1
diff --git a/debian/lumina-data.install b/debian/lumina-data.install
index fbacc651..71d251c9 100644
--- a/debian/lumina-data.install
+++ b/debian/lumina-data.install
@@ -9,6 +9,5 @@ usr/share/Lumina-DE/Login.ogg
 usr/share/Lumina-DE/Logout.ogg
 usr/share/Lumina-DE/luminaDesktop.conf
 usr/share/Lumina-DE/i18n/lumina-desktop*.qm
-usr/share/Lumina-DE/quickplugins/quick-sample.qml
 usr/share/wallpapers/Lumina-DE/
 usr/share/xsessions/Lumina-DE.desktop 
diff --git a/debian/lumina-desktop.install b/debian/lumina-desktop.install
index 9a51ec4e..f0cc193d 100644
--- a/debian/lumina-desktop.install
+++ b/debian/lumina-desktop.install
@@ -1,3 +1,4 @@
 usr/bin/Lumina-DE
+usr/bin/start-lumina-desktop
 debian/luminaDesktop.conf   /etc
 debian/lumina-qt5ct         /etc/default
diff --git a/debian/lumina-fm.install b/debian/lumina-fm.install
index b335c2c2..55761e58 100644
--- a/debian/lumina-fm.install
+++ b/debian/lumina-fm.install
@@ -1,4 +1,3 @@
 usr/bin/lumina-fm
-usr/share/pixmaps/Insight-FileManager.png
 usr/share/applications/lumina-fm.desktop
 usr/share/Lumina-DE/i18n/lumina-fm*.qm
diff --git a/debian/lumina-textedit.install b/debian/lumina-textedit.install
new file mode 100644
index 00000000..ee55c669
--- /dev/null
+++ b/debian/lumina-textedit.install
@@ -0,0 +1,3 @@
+usr/bin/lumina-textedit
+usr/share/applications/lumina-textedit.desktop
+usr/share/Lumina-DE/i18n/lumina-textedit*.qm
diff --git a/debian/merge-lumina-i18n.sh b/debian/merge-lumina-i18n.sh
index 7bdded0c..a69bcbfe 100755
--- a/debian/merge-lumina-i18n.sh
+++ b/debian/merge-lumina-i18n.sh
@@ -10,15 +10,22 @@ git clone https://github.com/pcbsd/lumina-i18n.git
 LANGS=("${LNGDIR}"/*)
 LANGS=(${LANGS[@]/*\/ts\/})
 
-UTILS=( config desktop fileinfo fm info open screenshot search xconfig )
-
-echo ${LANGS[@]}
+UTILS=( config desktop fileinfo fm info open screenshot search textedit xconfig )
 
 for lng in ${LANGS[@]}; do
 	for utl in ${UTILS[@]}; do
-		[[ -e "${LNGDIR}"/${lng}/lumina-${utl}.ts ]] && \
-			cp "${LNGDIR}"/${lng}/lumina-${utl}.ts \
-				"${CURDIR}"/lumina-${utl}/i18n/lumina-${utl}_${lng}.ts
+		if [[ -e "${LNGDIR}"/${lng}/lumina-${utl}.ts ]]; then
+			if [[ -d "${CURDIR}"/src-qt5/core/lumina-${utl} ]]; then
+				cp "${LNGDIR}"/${lng}/lumina-${utl}.ts \
+					"${CURDIR}"/src-qt5/core/lumina-${utl}/i18n/lumina-${utl}_${lng}.ts
+			elif [[ -d "${CURDIR}"/src-qt5/core-utils/lumina-${utl} ]]; then
+				cp "${LNGDIR}"/${lng}/lumina-${utl}.ts \
+					"${CURDIR}"/src-qt5/core-utils/lumina-${utl}/i18n/lumina-${utl}_${lng}.ts
+			elif [[ -d "${CURDIR}"/src-qt5/desktop-utils/lumina-${utl} ]]; then
+				cp "${LNGDIR}"/${lng}/lumina-${utl}.ts \
+					"${CURDIR}"/src-qt5/desktop-utils/lumina-${utl}/i18n/lumina-${utl}_${lng}.ts
+			fi
+		fi
 	done
 done
 
@@ -28,6 +35,7 @@ echo "updated lumina translations."
 # first ensure all translations are known to GIT
 # then create a commit using only the translation files
 # other changes to the source will still be tracked by dpkg-source
-[[ -d "${CURDIR}"/.git ]] && ( git add */i18n/*.ts && git commit */i18n/*.ts \
+[[ -d "${CURDIR}"/.git ]] && ( git add src-qt5/*/*/i18n/*.ts && git commit src-qt5/*/*/i18n/*.ts \
 	-m "merge latest translations from https://github.com/pcbsd/lumina-i18n.git" )
+
 rm -rf lumina-i18n