diff --git a/debian/control b/debian/control index a66868d3f..a4bdbcf78 100644 --- a/debian/control +++ b/debian/control @@ -34,7 +34,7 @@ Homepage: https://github.com/googlei18n/libphonenumber/ Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/libphonenumber.git/ Vcs-Git: git://anonscm.debian.org/collab-maint/libphonenumber.git -Package: libphonenumber6-java +Package: libphonenumber7-java Section: java Architecture: all Depends: ${misc:Depends}, ${maven:Depends} @@ -45,13 +45,13 @@ Description: parsing/formatting/validating phone numbers - java . This package contains the runtime library JARs for Java users. -Package: libphonenumber6-dev +Package: libphonenumber7-dev Section: libdevel Architecture: any Provides: libphonenumber-dev Conflicts: libphonenumber-dev Replaces: libphonenumber-dev -Depends: libphonenumber6 (=${binary:Version}), ${misc:Depends}, +Depends: libphonenumber7 (=${binary:Version}), ${misc:Depends}, libboost-dev (>= 1.40), libboost-system-dev (>= 1.40), libboost-thread-dev (>= 1.40), @@ -62,7 +62,7 @@ Description: parsing/formatting/validating phone numbers - development files . This package contains the static libraries and include files. -Package: libphonenumber6 +Package: libphonenumber7 Architecture: any Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} diff --git a/debian/libphonenumber6-dev.install b/debian/libphonenumber7-dev.install similarity index 100% rename from debian/libphonenumber6-dev.install rename to debian/libphonenumber7-dev.install diff --git a/debian/libphonenumber6-java.jlibs b/debian/libphonenumber7-java.jlibs similarity index 100% rename from debian/libphonenumber6-java.jlibs rename to debian/libphonenumber7-java.jlibs diff --git a/debian/libphonenumber6-java.poms b/debian/libphonenumber7-java.poms similarity index 100% rename from debian/libphonenumber6-java.poms rename to debian/libphonenumber7-java.poms diff --git a/debian/libphonenumber6.install b/debian/libphonenumber7.install similarity index 100% rename from debian/libphonenumber6.install rename to debian/libphonenumber7.install diff --git a/debian/rules b/debian/rules index e4f1f8209..7a3e021f1 100755 --- a/debian/rules +++ b/debian/rules @@ -53,7 +53,7 @@ endif # dh $@ --with javahelper #override_dh_auto_configure: -configure/libphonenumber6:: +configure/libphonenumber7:: mkdir -p $(CPP_BUILD) && cd $(CPP_BUILD) && $(CMAKE) $(CMAKE_FLAGS) .. #override_dh_auto_build: @@ -61,7 +61,7 @@ configure/libphonenumber6:: # mkdir java/lib # ln -s /usr/share/java/junit4.jar java/lib/junit-4.8.1.jar # $(ANT) -f $(JAVA_BUILD).xml jar -build/libphonenumber6:: +build/libphonenumber7:: ln -sf cpp-build-1.0-SNAPSHOT.jar tools/java/cpp-build/target/cpp-build-1.0-SNAPSHOT-jar-with-dependencies.jar ln -sf /usr/share/java/protobuf.jar tools/java/cpp-build/target/protobuf-java-debian.jar $(MAKE) -C $(CPP_BUILD) phonenumber phonenumber-shared