diff options
| author | Gaurav Sinha <gaurav.sinha@vyatta.com> | 2012-06-10 15:03:35 -0700 |
|---|---|---|
| committer | Gaurav Sinha <gaurav.sinha@vyatta.com> | 2012-06-10 15:03:35 -0700 |
| commit | 48056fa49608bedc4c076181478485569fec7d5f (patch) | |
| tree | 3d60586d43ec504d7018af00ba7cf1d895e3f099 /debian/rules | |
| parent | 4decf5460114e222532147ccc97fbec05bc5cccb (diff) | |
| parent | 5bbd235a4a30b26f477b73b2779619a5f20ad73b (diff) | |
| download | conntrack-tools-48056fa49608bedc4c076181478485569fec7d5f.tar.gz conntrack-tools-48056fa49608bedc4c076181478485569fec7d5f.zip | |
Merge branch 'pacifica' into oxnard
Conflicts:
.frlog
debian/changelog
Diffstat (limited to 'debian/rules')
| -rwxr-xr-x | debian/rules | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/debian/rules b/debian/rules index fb498be..3073583 100755 --- a/debian/rules +++ b/debian/rules @@ -71,7 +71,7 @@ binary-arch: build install dh_compress -a dh_fixperms -a dh_installdeb -a - dh_shlibdeps -a + dh_shlibdeps -av if [ -f "../.VYATTA_DEV_BUILD" ]; then \ dh_gencontrol -- -v999.dev; \ else \ |