diff options
| author | Michael Biebl <biebl@debian.org> | 2010-12-22 02:37:18 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2010-12-22 03:50:25 +0100 |
| commit | f880fb7eaf9ce26c442dbabbdfa9daa4f0263b59 (patch) | |
| tree | 8e2771019695b5539f6d293d6bc83d39266407c8 /debian | |
| parent | 88f24a26525396117dfd7d16586f2cee1ba6d8c4 (diff) | |
Switch from cdbs to dh
- Drop Build-Depends on cdbs. - Bump Build-Depends on debhelper to (>= 7.0.50~) for override targets. - Convert debian/rules to use dh. - Add debian/network-manager.docs.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | debian/control | 3 | ||||
| -rw-r--r-- | debian/network-manager.docs | 3 | ||||
| -rwxr-xr-x | debian/rules | 37 |
4 files changed, 27 insertions, 21 deletions
diff --git a/debian/changelog b/debian/changelog index 6796eff4..9e11e701 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,11 @@ network-manager (0.8.2-3) UNRELEASED; urgency=low * Cherry-pick two patches from upstream Git to make the keyfile plugin ignore temporary files and be more quiet when re-reading connections which have not changed. + * Switch from cdbs to dh + - Drop Build-Depends on cdbs. + - Bump Build-Depends on debhelper to (>= 7.0.50~) for override targets. + - Convert debian/rules to use dh. + - Add debian/network-manager.docs. -- Michael Biebl <biebl@debian.org> Wed, 22 Dec 2010 00:52:46 +0100 diff --git a/debian/control b/debian/control index c65edd93..17c931ba 100644 --- a/debian/control +++ b/debian/control @@ -4,8 +4,7 @@ Priority: optional Maintainer: Utopia Maintenance Team <pkg-utopia-maintainers@lists.alioth.debian.org> Uploaders: Michael Biebl <biebl@debian.org> Build-Depends: - debhelper (>= 7), - cdbs, + debhelper (>= 7.0.50~), autotools-dev, pkg-config, intltool, diff --git a/debian/network-manager.docs b/debian/network-manager.docs new file mode 100644 index 00000000..eb9b151c --- /dev/null +++ b/debian/network-manager.docs @@ -0,0 +1,3 @@ +NEWS +README +AUTHORS diff --git a/debian/rules b/debian/rules index b6f22bbb..82072b26 100755 --- a/debian/rules +++ b/debian/rules @@ -1,19 +1,11 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/autotools.mk -include /usr/share/cdbs/1/rules/utils.mk +%: + dh $@ -# List any files which are not installed -common-binary-post-install-arch:: list-missing - -DEB_DH_MAKESHLIBS_ARGS_ALL := -X/usr/lib/NetworkManager/ -X/usr/lib/pppd/ - -DEB_INSTALL_DOCS_ALL := README AUTHORS - -DEB_CONFIGURE_LIBEXECDIR := "\$$(prefix)/lib/NetworkManager" - -DEB_CONFIGURE_EXTRA_FLAGS := \ +override_dh_auto_configure: + dh_auto_configure -- \ + --libexecdir=/usr/lib/NetworkManager \ --with-distro=debian \ --with-resolvconf=/sbin/resolvconf \ --with-dhclient=/sbin/dhclient \ @@ -22,13 +14,20 @@ DEB_CONFIGURE_EXTRA_FLAGS := \ --disable-more-warnings \ --with-docs -DEB_DH_INSTALLINIT_ARGS := -r -- start 26 2 3 4 5 . stop 88 0 1 6 . - -clean:: - rm -f po/*.gmo - -binary-install/network-manager:: +override_dh_install: + dh_install --list-missing install -m 755 debian/network-manager-dispatcher.script \ debian/network-manager/etc/NetworkManager/dispatcher.d/01ifupdown install -m 755 debian/ifblacklist_migrate.sh \ debian/network-manager/usr/lib/NetworkManager + +override_dh_installinit: + dh_installinit -pnetwork-manager -r -- start 26 2 3 4 5 . stop 88 0 1 6 . + +override_dh_makeshlibs: + dh_makeshlibs -X/usr/lib/NetworkManager/ -X/usr/lib/pppd/ + +override_dh_strip: + dh_strip --dbg-package=network-manager-dbg + +override_dh_auto_test: |