Changeset 51e04f7

Timestamp:

Mar 26, 2016 3:26:55 PM (4 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

97a6cbd

Parents:

ee138a2

Message:

Debian: Remove libcommons-logging-java build dependency
mtn-ignore tweak

Files:

• .mtn-ignore (modified) (1 diff)
• debian/control (modified) (1 diff)
• debian/rules (modified) (2 diffs)

.mtn-ignore

@@ -40 +40 @@
 # Debian-related
 ^debian/copyright
-^debian/changelog
 ^.pc/
 

debian/control

@@ -15 +15 @@
  ,libgmp-dev (>= 2:5.0.5)
  ,libservice-wrapper-java
- ,libcommons-logging-java
  ,hardening-wrapper
  ,po-debconf

debian/rules

@@ -48 +48 @@
         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
@@ -63 +62 @@
         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 \