9 files changed, 47 insertions, 52 deletions
diff --git a/debian/changelog b/debian/changelog
index 0b4fbd5..9653459 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libpam-freerdp (3.0.0-0) UNRELEASED; urgency=medium
+
+  * Rename libpam-freerdp2 back to libpam-freerdp and make things
+    work and build against freerdp3-dev.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Thu, 07 Dec 2017 10:41:09 +0100
+
 libpam-freerdp2 (2.0.0-0) unstable; urgency=medium
 
   * Continue libpam-freerdp under a slightly new name and make things
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index ec63514..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/debian/control b/debian/control
index a54ed40..acdd996 100644
--- a/debian/control
+++ b/debian/control
@@ -1,45 +1,43 @@
-Source: libpam-freerdp2
+Source: libpam-freerdp
 Section: admin
 Priority: optional
 Maintainer: Artica Project <devs@lists.arctica-project.org>
 Uploaders:
  Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-Build-Depends: cdbs (>= 0.4.93~),
-               debhelper (>= 9),
-               dh-autoreconf,
+Build-Depends: debhelper-compat (= 12),
                dpkg-dev (>= 1.16.1.1~),
                mate-common,
-               freerdp2-dev (>= 2~),
+               freerdp3-dev (>= 3~) | freerdp2-dev (>= 2~),
                libgtest-dev,
                libpam0g-dev,
                pkg-config,
-Standards-Version: 4.1.4
-Homepage: https://github.com/ArcticaProject/libpam-freerdp2
-Vcs-Git: https://github.com/ArcticaProject/libpam-freerdp2/
-Vcs-Browser: https://github.com/ArcticaProject/libpam-freerdp2/
+Standards-Version: 4.7.0
+Homepage: https://github.com/ArcticaProject/libpam-freerdp
+Vcs-Git: https://github.com/ArcticaProject/libpam-freerdp/
+Vcs-Browser: https://github.com/ArcticaProject/libpam-freerdp/
 
-Package: libpam-freerdp2
+Package: libpam-freerdp
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         freerdp2-x11,
-Description: PAM Module to auth against an RDP server using FreeRDPv2
- Auth and session PAM module that uses FreeRDPv2 to authenticate against
+         freerdp3-x11 | freerdp2-x11,
+Description: PAM Module to auth against an RDP server using FreeRDP
+ Auth and session PAM module that uses FreeRDP to authenticate against
  an RDP server as the remote host and user. Local account required.
  .
  This PAM module is intended for facilitating Remote Logon into RDP
  servers using LightDM's Arctica Greeter.
 
-Package: libpam-freerdp2-dev
+Package: libpam-freerdp-dev
 Section: libdevel
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-Description: PAM Module to auth against an RDP server using FreeRDPv2 (development files)
- Auth and session PAM module that uses FreeRDPv2 to authenticate against
+Description: PAM Module to auth against an RDP server using FreeRDP (development files)
+ Auth and session PAM module that uses FreeRDP to authenticate against
  an RDP server as the remote host and user. Local account required.
  .
  This PAM module is intended for facilitating Remote Logon into RDP
  servers using LightDM's Arctica Greeter.
  .
- This package contains the pam_freerdp2.so header files.
+ This package contains the pam_freerdp.so header files.
diff --git a/debian/copyright b/debian/copyright
index 8eb8d0b..322f28b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: libpam-freerdp2
+Upstream-Name: libpam-freerdp
 Upstream-Contact: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-Source: https://github.com/ArcticaProject/libpam-freerdp2/
+Source: https://github.com/ArcticaProject/libpam-freerdp/
 
 Files: ChangeLog
  Makefile.am
@@ -12,8 +12,8 @@ Files: ChangeLog
  debian/changelog
  debian/compat
  debian/control
- debian/libpam-freerdp2-dev.install
- debian/libpam-freerdp2.install
+ debian/libpam-freerdp-dev.install
+ debian/libpam-freerdp.install
  debian/patches/README
  debian/rules
  debian/source/format
@@ -34,18 +34,18 @@ Comment:
  Assuming copyright holdership from the majority
  of other code files.
 
-Files: src/freerdp2-auth-check.c
- src/pam-freerdp2-children.c
- src/pam-freerdp2-children.h
- src/pam-freerdp2.c
- tests/test-freerdp2-auth.c
+Files: src/freerdp-auth-check.c
+ src/pam-freerdp-children.c
+ src/pam-freerdp-children.h
+ src/pam-freerdp.c
+ tests/test-freerdp-auth.c
 Copyright: 2012, Canonical Ltd.
 License: GPL-3
 
 Files: tests/mock_guest.c
  tests/mock_guest.h
  tests/mock_pam.c
- tests/test-freerdp2-wrapper.cc
+ tests/test-freerdp-wrapper.cc
 Copyright: 2012, Canonical Ltd.
 License: GPL-3
 Comment:
@@ -60,12 +60,12 @@ Comment:
  Assuming copyright holdership from the majority
  of other code files.
 
-Files: include/pam-freerdp2.h
+Files: include/pam-freerdp.h
 Copyright: 2012, Canonical Ltd.
   2012-2013, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
 License: GPL-3
 
-Files: src/pam-freerdp2-private.h
+Files: src/pam-freerdp-private.h
 Copyright: 2018, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
 License: GPL-3
 
diff --git a/debian/libpam-freerdp2-dev.install b/debian/libpam-freerdp-dev.install
index 175bba7..175bba7 100644
--- a/debian/libpam-freerdp2-dev.install
+++ b/debian/libpam-freerdp-dev.install
diff --git a/debian/libpam-freerdp2-dev.lintian-overrides b/debian/libpam-freerdp-dev.lintian-overrides
index 4f32408..4f32408 100644
--- a/debian/libpam-freerdp2-dev.lintian-overrides
+++ b/debian/libpam-freerdp-dev.lintian-overrides
diff --git a/debian/libpam-freerdp.install b/debian/libpam-freerdp.install
new file mode 100644
index 0000000..9a36efe
--- /dev/null
+++ b/debian/libpam-freerdp.install
@@ -0,0 +1,2 @@
+lib/
+usr/libexec/
diff --git a/debian/libpam-freerdp2.install b/debian/libpam-freerdp2.install
deleted file mode 100644
index 46af1b1..0000000
--- a/debian/libpam-freerdp2.install
+++ /dev/null
@@ -1,2 +0,0 @@
-lib/
-usr/lib/
diff --git a/debian/rules b/debian/rules
index 96d8b0c..bc8f672 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,28 +4,19 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/autoreconf.mk
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/utils.mk
+%:
+	dh $@
 
-DEB_MAKE_CHECK_TARGET = check
+# Uncomment for building against freerdp2-dev explicitly if freerdp3-dev _and_
+# freerdp2-dev are installed.
+#override_dh_auto_configure:
+#	dh_auto_configure -- --with-freerdp2
 
-#pre-build::
-#	cp README.md README
-#
-#cleanbuilddir::
-#	rm -f README
-
-# Remove .a and .la files from /lib/security
-remove-cruft::
-	find $(DEB_DESTDIR)/lib/security -type f \
-	        \( -name '*.a' -o -name '*.la' \) \
-	            -exec rm '{}' +
-
-common-install-indep:: remove-cruft
-common-install-arch:: remove-cruft
-common-binary-post-install-arch:: list-missing
+override_dh_install:
+	dh_install
+	find debian/tmp/lib/security -type f \
+	    \( -name '*.a' -o -name '*.la' \) \
+	    -exec rm '{}' +
 
 get-orig-source:
 	uscan --noconf --force-download --rename --download-current-version --destdir=..