master #62

Merged

asmeron merged 14 commits from YanTheKaller/ubl-settings-manager:master into master

YanTheKaller commented

Collaborator

There is no content yet.

YanTheKaller added 2 commits

803ba9c2c2 Added glade, css and banner files to bin, Makefile updates

a01e74f228 Merge pull request 'Added glade, css and banner files to bin, Makefile updates' (#55 ) from devel into master

Reviewed-on: YanTheKaller/ubl-settings-manager#55

YanTheKaller added 1 commit

0d1ff86c63 reverting

YanTheKaller added 1 commit

d2579e5315 reverting

YanTheKaller added 1 commit

284165f8db reverting

YanTheKaller added 1 commit

158b044313 reverting

YanTheKaller added 1 commit

a814ad1753 Restore

YanTheKaller added 3 commits

e00f09c817 Updated Makefile

da77940652 Updated header file

5ac504ca14 Fixed css error

YanTheKaller added 2 commits

8a002006f4 resized documentation windo

3cd1cdf535 .desktop changes, localisation changes

YanTheKaller added 1 commit

402f2b8762 Shortened documentation confirmation window

YanTheKaller added 1 commit

38ad00d174 Fixed policies

user-166 commented

Collaborator

Проверил.

asmeron merged commit 3e3554c381 into master 2 years ago

asmeron referenced this issue from a commit

Merge pull request 'master' (#62) from YanTheKaller/ubl-settings-manager:master into master

asmeron requested changes

Makefile

													
						@install -dm755 "${DESTDIR}${PREFIX}/share/${PKGNAME}"/{ui,css,images}

						@install -Dm644 -t "${DESTDIR}${PREFIX}/share/${PKGNAME}/ui/" "${PKGNAME}.glade"

						@install -Dm644 -t "${DESTDIR}${PREFIX}/share/${PKGNAME}/css/" "${PKGNAME}.css"

						@install -Dm644 -t "${DESTDIR}${PREFIX}/share/${PKGNAME}/images/" "ublinux-logo.svg"

asmeron commented

Owner

Зачем убрали ?
Ссылки на этот файл остались в коде !

Makefile

													
						@sed -e 's+/usr/bin+${PREFIX}/bin+' -e 's+.run+${PKGIDENT}.run+g' ./compile/com.ublinux.${PKGNAME}${PKGIDENT}.policy -i

						@install -Dm755 -t "${DESTDIR}${PREFIX}/bin/" "${CMAKE_BUILD_DIR}/${PKGNAME}"

						@install -dm755 "${DESTDIR}/etc/xdg"

						@install -Dm644 -t "${DESTDIR}/etc/xdg/${PKGNAME}/" "${PKGNAME}.conf"

asmeron commented

Owner

Зачем убрали ?
Ссылки на этот файл остались в коде !

asmeron requested changes

source/CMakeLists.txt

													
					link_directories(${GTK_LIBRARY_DIRS})

					add_definitions(${GTK_CFLAGS_OTHER})

					pkg_check_modules(VTE291 REQUIRED vte-2.91)

asmeron commented

Owner

VTE разве используется в приложении ?

asmeron approved these changes

Reviewers

asmeron approved these changes

The pull request has been merged as 3e3554c381.

No Label

No Milestone

No project

No Assignees

3 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: Applications/ubl-settings-manager#62