diff options
| author | roubert@google.com <roubert@google.com@ee073f10-1060-11df-b6a4-87a95322a99c> | 2012-09-27 15:47:13 +0000 |
|---|---|---|
| committer | roubert@google.com <roubert@google.com@ee073f10-1060-11df-b6a4-87a95322a99c> | 2012-09-27 15:47:13 +0000 |
| commit | 3f0eeeb75f5de53ad14679bebcc3c206de99f09e (patch) | |
| tree | cf39d17cfca6ac6f54a7a22cbaa75acb139cff0e | |
| parent | 9cde0cc59c3c94cbca78a42f208a6121d1fcd3b2 (diff) | |
| download | android_external_libphonenumbergoogle-3f0eeeb75f5de53ad14679bebcc3c206de99f09e.tar.gz android_external_libphonenumbergoogle-3f0eeeb75f5de53ad14679bebcc3c206de99f09e.tar.bz2 android_external_libphonenumbergoogle-3f0eeeb75f5de53ad14679bebcc3c206de99f09e.zip | |
Update build rules to version 5.1 of the library.
Review URL: https://codereview.appspot.com/6572060
git-svn-id: http://libphonenumber.googlecode.com/svn/trunk@529 ee073f10-1060-11df-b6a4-87a95322a99c
| -rw-r--r-- | cpp/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/control | 4 | ||||
| -rw-r--r-- | debian/libphonenumber-java.jlibs | 2 | ||||
| -rw-r--r-- | debian/libphonenumber5.install (renamed from debian/libphonenumber3.install) | 0 | ||||
| -rwxr-xr-x | debian/rules | 2 |
6 files changed, 12 insertions, 6 deletions
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 7a51687..7150659 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 93ef8b6..907ebee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libphonenumber (5.1) lucid; urgency=low + + * Version update. + + -- Fredrik Roubert <roubert@google.com> 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 d8cef39..5f9b0a2 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 6e8e63d..04e6faa 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 index d0dbfd1..d0dbfd1 100644 --- a/debian/libphonenumber3.install +++ b/debian/libphonenumber5.install diff --git a/debian/rules b/debian/rules index 0c1a5fe..b067e8e 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 |