From 51e04f7c6eb89b058b05cfdb2e8c471fc527957e Mon Sep 17 00:00:00 2001 From: zzz Date: Sat, 26 Mar 2016 15:26:55 +0000 Subject: [PATCH] Debian: Remove libcommons-logging-java build dependency mtn-ignore tweak --- .mtn-ignore | 1 - debian/control | 1 - debian/rules | 3 --- 3 files changed, 5 deletions(-) diff --git a/.mtn-ignore b/.mtn-ignore index 4bb2dae0c..e2f77fe17 100644 --- a/.mtn-ignore +++ b/.mtn-ignore @@ -39,7 +39,6 @@ web-out.xml # Debian-related ^debian/copyright -^debian/changelog ^.pc/ # Build property overrides diff --git a/debian/control b/debian/control index e27e81729..978745492 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,6 @@ Build-Depends: debhelper (>= 7.0.50~) ,gettext ,libgmp-dev (>= 2:5.0.5) ,libservice-wrapper-java - ,libcommons-logging-java ,hardening-wrapper ,po-debconf ,dh-systemd diff --git a/debian/rules b/debian/rules index 286a1f6be..760bd5709 100755 --- a/debian/rules +++ b/debian/rules @@ -47,7 +47,6 @@ override_dh_auto_clean: find $(CURDIR)/core \( -name '*\.so' -o -name '*\.o' \) -exec rm -f {} \; rm -rf $(CURDIR)/core/c/jcpuid/lib/ rm -f $(CURDIR)/installer/lib/wrapper/all/wrapper.jar - rm -f $(CURDIR)/installer/lib/launch4j/lib/commons-logging.jar rm -rf $(CURDIR)/debian/python-i2p debconf-updatepo @@ -62,8 +61,6 @@ binary-indep: build-indep build-indep: dh_prep mkdir -p $(CURDIR)/installer/lib/wrapper/all - mkdir -p $(CURDIR)/installer/lib/launch4j/lib/ - ln -sf /usr/share/java/commons-logging.jar $(CURDIR)/installer/lib/launch4j/lib/commons-logging.jar ln -sf /usr/share/java/wrapper.jar $(CURDIR)/installer/lib/wrapper/all/wrapper.jar if [ ! -e $(CURDIR)/debian/routerversion.java.bak ]; then \ cp $(ROUTERVERSION) $(CURDIR)/debian/routerversion.java.bak; \