diff options
author | Ken Moore <ken@pcbsd.org> | 2014-11-10 10:45:19 -0500 |
---|---|---|
committer | Ken Moore <ken@pcbsd.org> | 2014-11-10 10:45:19 -0500 |
commit | 1ebd4b1133a898137a581169439cb13cfd656695 (patch) | |
tree | ce33b876257b5f21d4f90199f71360021e943359 | |
parent | Add a new Lumina Theme: None (diff) | |
parent | Merge pull request #25 from Nanolx/master (diff) | |
download | lumina-1ebd4b1133a898137a581169439cb13cfd656695.tar.gz lumina-1ebd4b1133a898137a581169439cb13cfd656695.tar.bz2 lumina-1ebd4b1133a898137a581169439cb13cfd656695.zip |
Merge branch 'master' of github.com:pcbsd/lumina
-rw-r--r-- | debian/changelog | 9 | ||||
-rw-r--r-- | debian/control | 9 | ||||
-rw-r--r-- | debian/libluminautils-dev.install | 2 | ||||
-rw-r--r-- | debian/libluminautils1.install | 6 | ||||
-rw-r--r-- | debian/lumina-search.install | 1 | ||||
-rwxr-xr-x | debian/rules | 12 |
6 files changed, 31 insertions, 8 deletions
diff --git a/debian/changelog b/debian/changelog index d8282f03..f9ab5fb1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,14 @@ +lumina-desktop (0.7.1.158-1nano) unstable; urgency=low + + * new GIT snapshot + - added lumina-search package + + -- Christopher Roy Bratusek <nano@jpberlin.de> Fri, 07 Nov 2014 18:31:07 +0100 + lumina-desktop (0.6.3.99-1nano) unstable; urgency=low * new GIT snapshot - + -- Christopher Roy Bratusek <nano@jpberlin.de> Sun, 05 Oct 2014 20:18:23 +0200 lumina-desktop (0.6.2.14-1nano) unstable; urgency=low diff --git a/debian/control b/debian/control index d2e82a9b..dd6270a0 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Homepage: https://github.com/pcbsd/lumina Package: lumina-desktop Architecture: all Depends: libluminautils1, lumina-core, lumina-config, lumina-fm, - lumina-open, lumina-screenshot + lumina-open, lumina-screenshot, lumina-search Description: Lightweight Qt4-based desktop environment Metapackage depending on all other lumina packages. @@ -74,3 +74,10 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, libluminautils1 (= ${binary:Version Description: Screenshot utility for the lumina desktop environment Simple screenshot utility that allows to snapshot the whole desktop or a single window after a configurable delay. + +Package: lumina-search +Architecture: any +Depends: ${misc:Depends}, ${shlibs:Depends}, libluminautils1 (= ${binary:Version}) +Description: Search utility for the lumina desktop environment + Simple search utility that allows to search for applications or files and + directories in the user's HOME directory. diff --git a/debian/libluminautils-dev.install b/debian/libluminautils-dev.install index b205e6c3..239e470a 100644 --- a/debian/libluminautils-dev.install +++ b/debian/libluminautils-dev.install @@ -1,2 +1,2 @@ -usr/lib/libLuminaUtils.so +usr/lib/*/libLuminaUtils.so usr/include/*.h diff --git a/debian/libluminautils1.install b/debian/libluminautils1.install index 91a71aac..f463a644 100644 --- a/debian/libluminautils1.install +++ b/debian/libluminautils1.install @@ -1,3 +1,3 @@ -usr/lib/libLuminaUtils.so.1 -usr/lib/libLuminaUtils.so.1.0 -usr/lib/libLuminaUtils.so.1.0.0 +usr/lib/*/libLuminaUtils.so.1 +usr/lib/*/libLuminaUtils.so.1.0 +usr/lib/*/libLuminaUtils.so.1.0.0 diff --git a/debian/lumina-search.install b/debian/lumina-search.install new file mode 100644 index 00000000..2c84c40a --- /dev/null +++ b/debian/lumina-search.install @@ -0,0 +1 @@ +usr/bin/lumina-search diff --git a/debian/rules b/debian/rules index e0bb817b..661b461f 100755 --- a/debian/rules +++ b/debian/rules @@ -9,13 +9,21 @@ export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed DEB_PREF = $(shell gcc -print-multiarch) -USER_QMAKE_FLAGS = PREFIX=/usr LIBPREFIX=/usr/lib/$(DEB_PEF) +USER_QMAKE_FLAGS = PREFIX=/usr LIBPREFIX=/usr/lib/$(DEB_PREF) +QMAKE_EXTRA_DIRS = libLumina \ + lumina-config \ + lumina-desktop \ + lumina-fm \ + lumina-open \ + lumina-screenshot \ + lumina-search %: dh $@ -build: +override_dh_auto_configure: qmake-qt4 $(USER_QMAKE_FLAGS) + for d in $(QMAKE_EXTRA_DIRS) ; do (cd $$d && qmake-qt4 $(USER_QMAKE_FLAGS)); done override_dh_auto_clean: -$(MAKE) distclean |