[Git][debian-proftpd-team/proftpd-mod-proxy][master] 2 commits: Finalizing debian build system.

[Hilmar Preuße]

Hilmar Preuße pushed to branch master at Debian ProFTPD Team / proftpd-mod-proxy


Commits:
3aa76dcd by Hilmar Preusse at 2020-08-14T00:26:53+02:00
Finalizing debian build system.

- - - - -
34109793 by Hilmar Preusse at 2020-08-14T00:41:05+02:00
Add (formally) libsodium-dev, libhiredis-dev as B-D.

- - - - -


5 changed files:

- debian/clean
- debian/control
- debian/patches/series
- debian/proftpd-mod-proxy.dirs
- debian/rules


Changes:

=====================================
debian/clean
=====================================
@@ -1 +1,5 @@
 t/Makefile
+config.log
+config.status
+mod_proxy.h
+Makefile


=====================================
debian/control
=====================================
@@ -4,9 +4,11 @@ Priority: optional
 Maintainer: ProFTPD Maintainance Team <pkg-proftpd-maintainers at alioth-lists.debian.net>
 Uploaders: Francesco Paolo Lovergine <frankie at debian.org>,
            Hilmar Preusse <hille42 at web.de>
-Build-Depends: debhelper-compat (= 13),
+Build-Depends: debhelper,
                proftpd-dev (>= 1.3.6-1~),
-               libsqlite3-dev
+               libsqlite3-dev,
+               libsodium-dev,
+               libhiredis-dev
 Standards-Version: 4.5.0
 Homepage: https://github.com/Castaglia/proftpd-mod_proxy
 Vcs-Git: https://salsa.debian.org/debian-proftpd-team/proftpd-mod-proxy.git


=====================================
debian/patches/series
=====================================
@@ -1 +1 @@
-01_makefile.patch
+01_build_outside_tree


=====================================
debian/proftpd-mod-proxy.dirs
=====================================
@@ -1 +1,2 @@
 usr/lib/proftpd
+etc/proftpd


=====================================
debian/rules
=====================================
@@ -6,19 +6,29 @@ MODULE_NAME=mod_proxy
 DEBNAME=proftpd-mod-proxy
 
 %:
-	dh $@ --without autoreconf
+	dh $@
 
-override_dh_auto_configure: debian/control
-	./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+override_dh_auto_configure:
+	./configure --with-modules=$(MODULE_NAME) --enable-dso
 
 override_dh_auto_build:
-	DESTDIR=$(CURDIR)/debian/$(DEBNAME) prxs -c -I include $(MODULE_NAME).c
+	#DESTDIR=$(CURDIR)/debian/$(DEBNAME) prxs -c $(MODULE_NAME).c
+	make
 
 override_dh_auto_install:
-	DESTDIR=$(CURDIR)/debian/$(DEBNAME) prxs -i -I include -c $(MODULE_NAME).c
+	#DESTDIR=$(CURDIR)/debian/$(DEBNAME) prxs -i -c $(MODULE_NAME).c
+	make install DESTDIR=$(CURDIR)/debian/$(DEBNAME)
 	rm -f $(CURDIR)/debian/$(DEBNAME)/usr/lib/proftpd/*.la \
 		$(CURDIR)/debian/$(DEBNAME)/usr/lib/proftpd/*.a
 
 override_dh_gencontrol:
 	cat /usr/share/proftpd/proftpd-substvars >> $(CURDIR)/debian/$(DEBNAME).substvars
 	dh_gencontrol
+
+override_dh_auto_clean:
+	find lib -name \*.o | xargs rm -f
+	find lib -name \*.lo | xargs rm -f
+	DESTDIR=$(CURDIR)/debian/$(DEBNAME) prxs -d $(MODULE_NAME).c
+	#make clean
+
+override_dh_auto_test:



View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd-mod-proxy/-/compare/6f91fc5b95752444a9eba3d66c529cf8b59f6c78...34109793b522dc7c9124a0e9705f4d75c06e507f

-- 
View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd-mod-proxy/-/compare/6f91fc5b95752444a9eba3d66c529cf8b59f6c78...34109793b522dc7c9124a0e9705f4d75c06e507f
You're receiving this email because of your account on salsa.debian.org.