diff options
| author | Ken Moore <ken@pcbsd.org> | 2015-04-22 11:08:22 -0400 |
|---|---|---|
| committer | Ken Moore <ken@pcbsd.org> | 2015-04-22 11:08:22 -0400 |
| commit | 47552bfbf3790abc9c1bdaf0a040e188580857d0 (patch) | |
| tree | 0d83891ee0c78cef4bad88129e9a53c3934253cd | |
| parent | Move the initial screen brightness and volume setting routines into the sessi... (diff) | |
| parent | Merge pull request #93 from Nanolx/master (diff) | |
| download | lumina-47552bfbf3790abc9c1bdaf0a040e188580857d0.tar.gz lumina-47552bfbf3790abc9c1bdaf0a040e188580857d0.tar.bz2 lumina-47552bfbf3790abc9c1bdaf0a040e188580857d0.zip | |
Merge branch 'master' of github.com:pcbsd/lumina
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/control | 15 | ||||
| -rw-r--r-- | debian/lumina-fileinfo.install | 2 | ||||
| -rwxr-xr-x | debian/rules | 3 | ||||
| -rw-r--r-- | libLumina/libLumina.pro | 2 |
5 files changed, 25 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index e9ce4488..bacb03b1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +lumina-desktop (0.8.4.533-1nano) unstable; urgency=low + + * New git snapshot + * add lumina-fileinfo package + + -- Christopher Roy Bratusek <nano@jpberlin.de> Tue, 21 Apr 2015 20:36:42 +0200 + lumina-desktop (0.8.4.475-1nano) unstable; urgency=low * New git snapshot diff --git a/debian/control b/debian/control index da781d4a..cae65fe2 100644 --- a/debian/control +++ b/debian/control @@ -17,9 +17,11 @@ 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, lxpolkit, lumina-data, fluxbox, numlockx, xbacklight, - xscreensaver, usbmount, gstreamer1.0-plugins-base, - phonon4qt5-backend-gstreamer, alsa-utils, acpi, pavucontrol + lumina-xconfig, lxpolkit, lumina-data, fluxbox, + numlockx, xbacklight, xscreensaver, usbmount, alsa-utils, acpi, + gstreamer1.0-plugins-base, phonon4qt5-backend-gstreamer, + pavucontrol +#lumina-fileinfo Recommends: qt5-configuration-tool Description: Lightweight Qt5-based desktop environment Metapackage depending on all other lumina packages. @@ -103,6 +105,13 @@ Replaces: lumina-core (<< 0.8.3.372) Description: Display configuration tool for the lumina desktop environment Simple multi-head aware display configuration tool for Lumina +#Package: lumina-fileinfo +#Architecture: any +#Depends: ${misc:Depends}, ${shlibs:Depends}, libluminautils1 (= ${binary:Version}) +#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-data Architecture: all Depends: ${misc:Depends}, libluminautils1, lumina-desktop diff --git a/debian/lumina-fileinfo.install b/debian/lumina-fileinfo.install new file mode 100644 index 00000000..3ccd15a2 --- /dev/null +++ b/debian/lumina-fileinfo.install @@ -0,0 +1,2 @@ +/usr/bin/lumina-fileinfo +/usr/share/Lumina-DE/i18n/lumina-fileinfo*.qm diff --git a/debian/rules b/debian/rules index e1e14d53..8ae23bc8 100755 --- a/debian/rules +++ b/debian/rules @@ -24,7 +24,8 @@ QMAKE_EXTRA_DIRS = libLumina \ lumina-screenshot \ lumina-search \ lumina-info \ - lumina-xconfig + lumina-xconfig #\ +# lumina-fileinfo %: dh $@ --parallel diff --git a/libLumina/libLumina.pro b/libLumina/libLumina.pro index ef30bd20..d539a384 100644 --- a/libLumina/libLumina.pro +++ b/libLumina/libLumina.pro @@ -45,6 +45,8 @@ SOURCES += LuminaXDG.cpp \ exists(/bin/lsb_release){ LINUX_DISTRIBUTION = $$system(lsb_release -si) +} exists(/usr/bin/lsb_release){ + LINUX_DISTRIBUTION = $$system(lsb_release -si) } equals(LINUX_DISTRIBUTION, "Debian"): { |