Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Debian package fix lintian errors #437

Open
wants to merge 18 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 14 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,9 @@ output/
*.qm
src/adldap/samba/ndr_misc.c
src/adldap/samba/ndr_misc.h
/debian/admc.substvars
/debian/debhelper-build-stamp
/debian/files
/debian/admc/
/debian/.debhelper/
/obj-*/
8 changes: 5 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.0)
cmake_minimum_required(VERSION 3.5)

set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
Expand Down Expand Up @@ -64,10 +64,12 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CHANGELOG_ru.txt

if (ADMC_BUILD_DEB)
SET(CPACK_GENERATOR "DEB")
SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "Kees van Vloten")
SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "Kees van Vloten <[email protected]>")
SET(CPACK_DEBIAN_PACKAGE_PRIORITY "optional")
SET(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
SET(CPACK_DEBIAN_PACKAGE_DESCRIPTION "Samba domain management console.")
SET(CPACK_DEBIAN_PACKAGE_DESCRIPTION "The ADMC is an integrated complex tool that implements
User and Computers and Group Policy Manager modules of
Microsoft Remote Server Administration Tools (RSAT).")
SET(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://github.com/altlinux/admc")
set(CPACK_STRIP_FILES "${CMAKE_INSTALL_LIBDIR}/libadldap.so;${CMAKE_INSTALL_BINDIR}/admc")
INCLUDE(CPack)
Expand Down
36 changes: 20 additions & 16 deletions README.md
Copy link
Collaborator

@august-alt august-alt Aug 6, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the purpose of modifying the README.md file in a pull request that specifically addresses Debian packaging? The changes to README.md are unrelated to the purpose of this pull request, please consider removing them and submitting a separate pull request for those changes if you still wish to update the file."

Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Active Directory Management Center (ADMC)

# Building
The ADMC is an integrated complex tool that implements
User and Computers and Group Policy Manager modules of
Microsoft Remote Server Administration Tools (RSAT).

![Screenshot](https://i.imgur.com/GuRmwnq.png)

## Building

Dependencies:
* qt (core, widgets, help, linguist tools)
Expand All @@ -10,40 +17,37 @@ Dependencies:
* uuid

Once dependencies are installed, run this from the admc folder:
```
$ mkdir build
$ cd build
$ cmake ..
$ make -j12
```sh
mkdir build
cd build
cmake ..
make -j12
```

If the build fails, check build output for missing dependencies.

You can also format the sources by building `clangformat`
target after `cmake` is run, for example:

```
```sh
make -C build clangformat
```

# Usage:
## Usage:

This app requires a working Active Directory domain and for the client machine to be connected and logged into the domain. You can find articles about these topics on [ALTLinux wiki](https://www.altlinux.org/%D0%94%D0%BE%D0%BC%D0%B5%D0%BD).

Launch admc from the build directory:
```
$ ./admc
```sh
./admc
```

# Testing
## Testing

Tests also require a domain and a connection to the domain.

Launch tests from the build directory:
```sh
./admc-test
```
$ ./admc-test
```

# Screenshots

![image](https://i.imgur.com/GuRmwnq.png)
7 changes: 7 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
admc (0.16.3) UNRELEASED; urgency=medium

* Fix crashes after OU/user creation attempts by users with corresponding
delegated rights.

-- Semyon Knyazev <[email protected]> Wed, 15 May 2024 00:00:00 +0000

admc (0.5.2) UNRELEASED; urgency=medium

* Initial release.
Expand Down
1 change: 0 additions & 1 deletion debian/compat

This file was deleted.

15 changes: 9 additions & 6 deletions debian/control
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
Source: admc
Maintainer: Kees van Vloten
Section: misc
Maintainer: Kees van Vloten <[email protected]>
Section: admin
Priority: optional
Rules-Requires-Root: no
Standards-Version: 3.9.2
Build-Depends: debhelper (>= 9), cmake, qtbase5-dev, libqt5help5, qttools5-dev, libldap2-dev, pkg-config, samba-dev (>=4.9), libsmbclient-dev, libkrb5-dev, libglib2.0-dev, libsasl2-dev
Build-Depends: debhelper-compat (= 11), debhelper (>= 11), cmake, qtbase5-dev, libqt5help5, qttools5-dev, libldap2-dev, pkgconf, samba-dev (>=4.9), libsmbclient-dev, libkrb5-dev, libglib2.0-dev, libsasl2-dev

Package: admc
Architecture: any
Depends: libldap-2.4-2, libsasl2-2, libsmbclient (>=4.9), libuuid1 (>= 2.33), libqt5help5 (>= 5.11), libkrb5-3 (>= 1.17)
Description: Samba domain management console.
Samba domain management console.
Depends: ${misc:Depends}, ${shlibs:Depends}, libsasl2-2, libqt5help5 (>= 5.11)
Description: Active Directory Management Center (ADMC)
The ADMC is an integrated complex tool that implements
User and Computers and Group Policy Manager modules of
Microsoft Remote Server Administration Tools (RSAT).
6 changes: 6 additions & 0 deletions debian/copyright
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/

Files: *
Copyright: 2020-2024 BaseALT Ltd.
2020-2024 Dmitry Degtyarev
License: GPL-3
2 changes: 1 addition & 1 deletion debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ export DH_VERBOSE=1
export QT_SELECT=qt5

%:
dh $@ --buildsystem=cmake
dh $@
yurtpage marked this conversation as resolved.
Show resolved Hide resolved

override_dh_auto_configure:
dh_auto_configure -- \
Expand Down
1 change: 1 addition & 0 deletions debian/source/format
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3.0 (native)