Merge pull request #1 from ukai/release_0.3.4

glog: release 0.3.4

.gitignore

@@ -0,0 +1,4 @@
+autom4te.cache
+glog-*.tar.gz
+packages/rpm-unknown
+packages/debian-*

Makefile.am

@@ -1,5 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
+AUTOMAKE_OPTIONS=subdir-objects
+
 # Make sure that when we re-make ./configure, we get the macros we need
 ACLOCAL_AMFLAGS = -I m4
 

README.windows

@@ -19,7 +19,7 @@ better ways to set this up than I've done!  If you run across any
 problems, please post to the google-glog Google Group, or report
 them on the google-glog Google Code site:
    http://groups.google.com/group/google-glog
-   http://code.google.com/p/google-glog/issues/list
+   https://github.com/google/glog/issues
 
 -- Shinichiro Hamaji
 

configure.ac

@@ -5,7 +5,7 @@
 # make sure we're interpreted by some minimal autoconf
 AC_PREREQ(2.57)
 
-AC_INIT(glog, 0.3.3, opensource@google.com)
+AC_INIT(glog, 0.3.4, opensource@google.com)
 # The argument here is just something that should be in the current directory
 # (for sanity checking)
 AC_CONFIG_SRCDIR(README)

packages/deb.sh

@@ -44,16 +44,18 @@ rm -rf tmp
 mkdir -p tmp
 cd tmp
 
+package="google-glog_$VERSION"
+
 # Debian has very specific requirements about the naming of build
 # directories, and tar archives. It also wants to write all generated
 # packages to the parent of the source directory. We accommodate these
 # requirements by building directly from the tar file.
-ln -s "${topdir}/${archive}.tar.gz" "${LIB}${archive}.orig.tar.gz"
+ln -s "${topdir}/${archive}.tar.gz" "${LIB}${package}.orig.tar.gz"
-tar zfx "${LIB}${archive}.orig.tar.gz"
+tar zfx "${LIB}${package}.orig.tar.gz"
-[ -n "${LIB}" ] && mv "${archive}" "${LIB}${archive}"
+mv "${archive}" "${LIB}${package}"
-cd "${LIB}${archive}"
+cd "${LIB}${package}"
 # This is one of those 'specific requirements': where the deb control files live
-ln -s "packages/deb" "debian"
+cp -a "packages/deb" "debian"
 
 # Now, we can call Debian's standard build tool
 debuild -uc -us

packages/deb/changelog

@@ -1,3 +1,9 @@
+google-glog (0.3.4-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Google Inc. <opensource@google.com>  Tue, 10 Mar 2015 12:02:20 +0900
+
 google-glog (0.3.3-1) unstable; urgency=low
 
   * New upstream release.

packages/deb/copyright

@@ -1,7 +1,7 @@
 This package was debianized by Google Inc. <opensource@google.com> on
 13 June 2008.
 
-It was downloaded from http://code.google.com/
+It was downloaded from https://github.com/google/glog
 
 Upstream Author: opensource@google.com
 

packages/rpm.sh

@@ -45,7 +45,7 @@ rm -rf "$RPM_SOURCE_DIR" "$RPM_BUILD_DIR"
 mkdir "$RPM_SOURCE_DIR"
 mkdir "$RPM_BUILD_DIR"
 
-cp "$archive" "$RPM_SOURCE_DIR"
+cp "$archive" "$RPM_SOURCE_DIR"/v"$VERSION".tar.gz
 
 rpmbuild -bb rpm/rpm.spec \
   --define "NAME $PACKAGE" \

packages/rpm/rpm.spec

@@ -7,11 +7,11 @@ Summary: A C++ application logging library
 Version: %VERSION
 Release: %rel
 Group: Development/Libraries
-URL: http://code.google.com/p/google-glog
+URL: http://github.com/google/glog
 License: BSD
 Vendor: Google
 Packager: Google Inc. <opensource@google.com>
-Source: http://%{NAME}.googlecode.com/files/%{NAME}-%{VERSION}.tar.gz
+Source: https://github.com/google/glog/archive/v%{VERSION}.tar.gz
 Distribution: Redhat 7 and above.
 Buildroot: %{_tmppath}/%{name}-root
 Prefix: %prefix

test-driver

@@ -0,0 +1 @@
+/usr/share/automake-1.14/test-driver