diff -Nru aspectc++-2.2+git20170823/debian/changelog aspectc++-2.2+git20170823/debian/changelog
--- aspectc++-2.2+git20170823/debian/changelog	2018-05-22 13:31:45.000000000 +0000
+++ aspectc++-2.2+git20170823/debian/changelog	2018-06-25 14:59:10.000000000 +0000
@@ -1,3 +1,10 @@
+aspectc++ (1:2.2+git20170823-7) unstable; urgency=medium
+
+  * Build depend on llvm-dev (Closes: #902220)
+  * Add autopkgtest
+
+ -- Reinhard Tartler <siretart@tauware.de>  Mon, 25 Jun 2018 10:59:10 -0400
+
 aspectc++ (1:2.2+git20170823-6) unstable; urgency=medium
 
   * Add patch to fix FTBFS with gcc-8 (Closes: #897709)
diff -Nru aspectc++-2.2+git20170823/debian/control aspectc++-2.2+git20170823/debian/control
--- aspectc++-2.2+git20170823/debian/control	2018-05-22 13:31:45.000000000 +0000
+++ aspectc++-2.2+git20170823/debian/control	2018-06-25 14:59:10.000000000 +0000
@@ -2,7 +2,7 @@
 Section: devel
 Priority: optional
 Maintainer: Reinhard Tartler <siretart@tauware.de>
-Build-Depends: debhelper (>= 9), libxml2-dev, docbook-to-man, zlib1g-dev, libedit-dev, llvm-4.0-dev, libclang-dev
+Build-Depends: debhelper (>= 9), libxml2-dev, docbook-to-man, zlib1g-dev, libedit-dev, llvm-dev, libclang-dev
 Build-Depends-Indep: doxygen, graphviz, gsfonts
 Standards-Version: 4.0.0
 Homepage: http://www.aspectc.org
diff -Nru aspectc++-2.2+git20170823/debian/.gitlab-ci.yml aspectc++-2.2+git20170823/debian/.gitlab-ci.yml
--- aspectc++-2.2+git20170823/debian/.gitlab-ci.yml	1970-01-01 00:00:00.000000000 +0000
+++ aspectc++-2.2+git20170823/debian/.gitlab-ci.yml	2018-06-25 14:59:10.000000000 +0000
@@ -0,0 +1,10 @@
+image: registry.gitlab.com/eighthave/ci-image-git-buildpackage:latest
+
+build:
+  artifacts:
+    paths:
+    - "*.deb"
+    expire_in: 1 day
+  script:
+    - cp ../*.deb .  # copy it into place to be saved as an artifact
+    - autopkgtest ../*.changes -- null
diff -Nru aspectc++-2.2+git20170823/debian/rules aspectc++-2.2+git20170823/debian/rules
--- aspectc++-2.2+git20170823/debian/rules	2018-05-22 13:31:45.000000000 +0000
+++ aspectc++-2.2+git20170823/debian/rules	2018-06-25 14:59:10.000000000 +0000
@@ -102,6 +102,9 @@
 	rm -f ac++.1 ag++.1
 	rm -rf AspectC++/bin
 	rm -rf Puma.copy/
+	# remove autopkgtest cruft
+	rm -rf Ag++/tests/src/obj
+	rm -rf Ag++/tests/src/test
 	# standard cleaning:
 	dh_clean
 
diff -Nru aspectc++-2.2+git20170823/debian/tests/ag++_compile aspectc++-2.2+git20170823/debian/tests/ag++_compile
--- aspectc++-2.2+git20170823/debian/tests/ag++_compile	1970-01-01 00:00:00.000000000 +0000
+++ aspectc++-2.2+git20170823/debian/tests/ag++_compile	2018-06-25 14:59:10.000000000 +0000
@@ -0,0 +1,5 @@
+#!/bin/sh -e
+
+cd Ag++/tests/src
+make all ACXX=/usr/bin/ag++
+./test
diff -Nru aspectc++-2.2+git20170823/debian/tests/control aspectc++-2.2+git20170823/debian/tests/control
--- aspectc++-2.2+git20170823/debian/tests/control	1970-01-01 00:00:00.000000000 +0000
+++ aspectc++-2.2+git20170823/debian/tests/control	2018-06-25 14:59:10.000000000 +0000
@@ -0,0 +1,2 @@
+Tests: ag++_compile
+Restrictions: rw-build-tree