Browse Source

Packaging maintenance

- Switch to debhelper 9, use native hardening
- Upgrade to Standards-Version: 3.9.6, no changes
- Cleanup
Christoph Biedl 8 years ago
parent
commit
7ae38097bb
3 changed files with 10 additions and 14 deletions
  1. 1 1
      debian/compat
  2. 6 7
      debian/control
  3. 3 6
      debian/rules

+ 1 - 1
debian/compat

@@ -1 +1 @@
-7
+9

+ 6 - 7
debian/control

@@ -1,18 +1,17 @@
 Source: softflowd
 Source: softflowd
-Section: net
-Priority: extra
 Maintainer: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
 Maintainer: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
-Build-Depends: debhelper (>= 7.0.50~),
+Homepage: http://code.google.com/p/softflowd/
+Standards-Version: 3.9.6
+Build-Depends: debhelper (>= 9.20~),
     autoconf,
     autoconf,
     autotools-dev,
     autotools-dev,
-    hardening-wrapper,
     libpcap0.8-dev,
     libpcap0.8-dev,
-Standards-Version: 3.9.3
-Homepage: http://code.google.com/p/softflowd/
+Priority: extra
+Section: net
 
 
 Package: softflowd
 Package: softflowd
 Architecture: any
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends},
 Description: Flow-based network traffic analyser
 Description: Flow-based network traffic analyser
  Softflowd is a flow-based network traffic anaylser capable of Cisco
  Softflowd is a flow-based network traffic anaylser capable of Cisco
  Netflow data export. Softflowd semi-statefully tracks traffic
  Netflow data export. Softflowd semi-statefully tracks traffic

+ 3 - 6
debian/rules

@@ -1,14 +1,11 @@
 #!/usr/bin/make -f
 #!/usr/bin/make -f
 
 
-export DEB_BUILD_HARDENING=1
+%:
+	dh $@
 
 
 override_dh_auto_configure:
 override_dh_auto_configure:
 	autoreconf
 	autoreconf
 	dh_auto_configure -- \
 	dh_auto_configure -- \
 		--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
 		--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
 		--prefix=/usr --mandir=\$${prefix}/share/man \
 		--prefix=/usr --mandir=\$${prefix}/share/man \
-		--infodir=\$${prefix}/share/info \
-		CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
-
-%:
-	dh $@
+		--infodir=\$${prefix}/share/info