diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 7a5168774..7150659af 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -17,8 +17,8 @@ cmake_minimum_required (VERSION 2.8) project (libphonenumber) -set (libphonenumber_VERSION_MAJOR 4) -set (libphonenumber_VERSION_MINOR 3) +set (libphonenumber_VERSION_MAJOR 5) +set (libphonenumber_VERSION_MINOR 1) # Helper functions dealing with finding libraries and programs this library # depends on. diff --git a/debian/changelog b/debian/changelog index 93ef8b637..907ebee12 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libphonenumber (5.1) lucid; urgency=low + + * Version update. + + -- Fredrik Roubert Thu, 27 Sep 2012 17:06:43 +0200 + libphonenumber (4.3) lucid; urgency=low * Version update. diff --git a/debian/control b/debian/control index d8cef3904..5f9b0a283 100644 --- a/debian/control +++ b/debian/control @@ -22,14 +22,14 @@ Vcs-Svn: http://libphonenumber.googlecode.com/svn/trunk/ Package: libphonenumber-dev Section: libdevel Architecture: any -Depends: libphonenumber4 (=${binary:Version}), ${misc:Depends} +Depends: libphonenumber5 (=${binary:Version}), ${misc:Depends} Description: parsing/formatting/validating phone numbers - development Google's common C++ and Java library for parsing, formatting, storing and validating international phone numbers. . This package contains the static libraries and include files. -Package: libphonenumber4 +Package: libphonenumber5 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} diff --git a/debian/libphonenumber-java.jlibs b/debian/libphonenumber-java.jlibs index 6e8e63d3d..04e6faa04 100644 --- a/debian/libphonenumber-java.jlibs +++ b/debian/libphonenumber-java.jlibs @@ -1 +1 @@ -java/libphonenumber/build/jar/libphonenumber.jar +java/build/jar/libphonenumber.jar diff --git a/debian/libphonenumber3.install b/debian/libphonenumber5.install similarity index 100% rename from debian/libphonenumber3.install rename to debian/libphonenumber5.install diff --git a/debian/rules b/debian/rules index 0c1a5fe97..b067e8ed1 100755 --- a/debian/rules +++ b/debian/rules @@ -24,7 +24,7 @@ JAVA_HOME ?= /usr/lib/jvm/default-java CMAKE_FLAGS := -DCMAKE_INSTALL_PREFIX=/usr CPP_BUILD := cpp/build -JAVA_BUILD := java/libphonenumber/build +JAVA_BUILD := java/build ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0