null+****@clear*****
null+****@clear*****
2011年 5月 28日 (土) 00:16:57 JST
Kouhei Sutou 2011-05-27 15:16:57 +0000 (Fri, 27 May 2011)
New Revision: 64d3b049d15e3450e6fd01453a0a10a73e20de57
Log:
[package] move {debian,apt,rpm,yum}/ to packages/.
Added files:
packages/Makefile.am
Modified files:
.gitignore
Makefile.am
configure.ac
Renamed files:
packages/apt/Makefile.am
(from apt/Makefile.am)
packages/apt/build-deb.sh
(from apt/build-deb.sh)
packages/apt/build-in-chroot.sh
(from apt/build-in-chroot.sh)
packages/apt/groonga-depended-packages
(from apt/groonga-depended-packages)
packages/apt/sign-repository.sh
(from apt/sign-repository.sh)
packages/apt/update-repository.sh
(from apt/update-repository.sh)
packages/debian/changelog
(from debian/changelog)
packages/debian/compat
(from debian/compat)
packages/debian/control
(from debian/control)
packages/debian/copyright
(from debian/copyright)
packages/debian/groonga-bin.install
(from debian/groonga-bin.install)
packages/debian/groonga-doc.docs
(from debian/groonga-doc.docs)
packages/debian/groonga-munin-plugin.conf
(from debian/groonga-munin-plugin.conf)
packages/debian/groonga-munin-plugins.install
(from debian/groonga-munin-plugins.install)
packages/debian/groonga-munin-plugins.postinst
(from debian/groonga-munin-plugins.postinst)
packages/debian/groonga-munin-plugins.postrm
(from debian/groonga-munin-plugins.postrm)
packages/debian/groonga-plugin-suggest.install
(from debian/groonga-plugin-suggest.install)
packages/debian/groonga-server.default
(from debian/groonga-server.default)
packages/debian/groonga-server.dirs
(from debian/groonga-server.dirs)
packages/debian/groonga-server.init
(from debian/groonga-server.init)
packages/debian/groonga-server.logrotate
(from debian/groonga-server.logrotate)
packages/debian/groonga-server.postinst
(from debian/groonga-server.postinst)
packages/debian/groonga-server.postrm
(from debian/groonga-server.postrm)
packages/debian/groonga-tokenizer-mecab.install
(from debian/groonga-tokenizer-mecab.install)
packages/debian/libgroonga-dev.install
(from debian/libgroonga-dev.install)
packages/debian/libgroonga0.dirs
(from debian/libgroonga0.dirs)
packages/debian/libgroonga0.install
(from debian/libgroonga0.install)
packages/debian/patches/series
(from debian/patches/series)
packages/debian/rules
(from debian/rules)
packages/debian/source/format
(from debian/source/format)
packages/rpm/Makefile.am
(from rpm/Makefile.am)
packages/rpm/centos/Makefile.am
(from rpm/centos/Makefile.am)
packages/rpm/centos/groonga.spec.in
(from rpm/centos/groonga.spec.in)
packages/rpm/fedora/Makefile.am
(from rpm/fedora/Makefile.am)
packages/rpm/fedora/groonga.spec.in
(from rpm/fedora/groonga.spec.in)
packages/yum/Makefile.am
(from yum/Makefile.am)
packages/yum/build-in-chroot.sh
(from yum/build-in-chroot.sh)
packages/yum/build-repository-rpm.sh
(from yum/build-repository-rpm.sh)
packages/yum/build-rpm.sh
(from yum/build-rpm.sh)
packages/yum/gpg-public-key.sh
(from yum/gpg-public-key.sh)
packages/yum/gpg-uid.sh
(from yum/gpg-uid.sh)
packages/yum/groonga-depended-packages
(from yum/groonga-depended-packages)
packages/yum/groonga-repository.spec
(from yum/groonga-repository.spec)
packages/yum/sign-rpm.sh
(from yum/sign-rpm.sh)
packages/yum/update-repository.sh
(from yum/update-repository.sh)
Modified: .gitignore (+23 -23)
===================================================================
--- .gitignore 2011-05-27 09:54:22 +0000 (33d5afe)
+++ .gitignore 2011-05-27 15:16:57 +0000 (f7c4bb2)
@@ -62,30 +62,30 @@ version.sh
/coverage
/coverage.info
/test/unit/lib/*-*.*.*/
-/apt/debian/pool/*/*/*/*/*.diff.gz
-/apt/debian/pool/*/*/*/*/*.tar.gz
-/apt/debian/pool/*/*/*/*/*.build
-/apt/debian/pool/*/*/*/*/*.changes
-/apt/debian/pool/*/*/*/*/*.deb
-/apt/debian/pool/*/*/*/*/*.dsc
-/apt/debian/dists/
-/apt/debian/*.db
-/apt/debian/*.conf
-/apt/ubuntu/pool/*/*/*/*/*.diff.gz
-/apt/ubuntu/pool/*/*/*/*/*.tar.gz
-/apt/ubuntu/pool/*/*/*/*/*.build
-/apt/ubuntu/pool/*/*/*/*/*.changes
-/apt/ubuntu/pool/*/*/*/*/*.deb
-/apt/ubuntu/pool/*/*/*/*/*.dsc
-/apt/ubuntu/dists/
-/apt/ubuntu/*.db
-/apt/ubuntu/*.conf
+/packages/apt/debian/pool/*/*/*/*/*.diff.gz
+/packages/apt/debian/pool/*/*/*/*/*.tar.gz
+/packages/apt/debian/pool/*/*/*/*/*.build
+/packages/apt/debian/pool/*/*/*/*/*.changes
+/packages/apt/debian/pool/*/*/*/*/*.deb
+/packages/apt/debian/pool/*/*/*/*/*.dsc
+/packages/apt/debian/dists/
+/packages/apt/debian/*.db
+/packages/apt/debian/*.conf
+/packages/apt/ubuntu/pool/*/*/*/*/*.diff.gz
+/packages/apt/ubuntu/pool/*/*/*/*/*.tar.gz
+/packages/apt/ubuntu/pool/*/*/*/*/*.build
+/packages/apt/ubuntu/pool/*/*/*/*/*.changes
+/packages/apt/ubuntu/pool/*/*/*/*/*.deb
+/packages/apt/ubuntu/pool/*/*/*/*/*.dsc
+/packages/apt/ubuntu/dists/
+/packages/apt/ubuntu/*.db
+/packages/apt/ubuntu/*.conf
/configure.lineno
-/rpm/*/*.spec
-/yum/groonga.repo
-/yum/RPM-GPG-KEY-groonga
-/yum/fedora/
-/yum/centos/
+/packages/rpm/*/*.spec
+/packages/yum/groonga.repo
+/packages/yum/RPM-GPG-KEY-groonga
+/packages/yum/fedora/
+/packages/yum/centos/
/examples/dictionary/db/
/examples/dictionary/*.gz
/examples/dictionary/gene95-dictionary/
Modified: Makefile.am (+4 -6)
===================================================================
--- Makefile.am 2011-05-27 09:54:22 +0000 (9ca87f5)
+++ Makefile.am 2011-05-27 15:16:57 +0000 (9f31a80)
@@ -9,9 +9,7 @@ SUBDIRS = \
src \
examples \
test \
- apt \
- rpm \
- yum \
+ packages \
data \
tools \
doc
@@ -72,9 +70,9 @@ update-latest-release:
misc/update-latest-release.rb \
$(PACKAGE) $(OLD_RELEASE) $(OLD_RELEASE_DATE) \
$(VERSION) $(NEW_RELEASE_DATE) \
- rpm/fedora/groonga.spec.in \
- rpm/centos/groonga.spec.in \
- debian/changelog
+ packages/rpm/fedora/groonga.spec.in \
+ packages/rpm/centos/groonga.spec.in \
+ packages/debian/changelog
update-document:
@if test -z "$(GROONGA_GITHUB_COM_PATH)"; then \
Modified: configure.ac (+8 -7)
===================================================================
--- configure.ac 2011-05-27 09:54:22 +0000 (aa8bfe1)
+++ configure.ac 2011-05-27 15:16:57 +0000 (c8c514a)
@@ -123,11 +123,12 @@ AC_CONFIG_FILES([
examples/dictionary/eijiro/Makefile
examples/dictionary/gene95/Makefile
examples/dictionary/jmdict/Makefile
- apt/Makefile
- rpm/Makefile
- rpm/centos/Makefile
- rpm/fedora/Makefile
- yum/Makefile
+ packages/Makefile
+ packages/apt/Makefile
+ packages/rpm/Makefile
+ packages/rpm/centos/Makefile
+ packages/rpm/fedora/Makefile
+ packages/yum/Makefile
data/Makefile
data/html/Makefile
data/munin/Makefile
@@ -825,8 +826,8 @@ AC_DEFINE_UNQUOTED(GRN_CONFIG_PATH, ["$GRN_CONFIG_PATH"],
[Default command line option configuration file.])
AC_OUTPUT([
- rpm/centos/groonga.spec
- rpm/fedora/groonga.spec
+ packages/rpm/centos/groonga.spec
+ packages/rpm/fedora/groonga.spec
groonga.pc
])
Added: packages/Makefile.am (+4 -0) 100644
===================================================================
--- /dev/null
+++ packages/Makefile.am 2011-05-27 15:16:57 +0000 (d1bf9d1)
@@ -0,0 +1,4 @@
+SUBDIRS = \
+ apt \
+ rpm \
+ yum
Renamed: packages/apt/Makefile.am (+6 -1) 87%
===================================================================
--- apt/Makefile.am 2011-05-27 09:54:22 +0000 (964ea80)
+++ packages/apt/Makefile.am 2011-05-27 15:16:57 +0000 (9521f08)
@@ -36,7 +36,12 @@ upload: ensure-rsync-path
dists pool $(RSYNC_PATH)/$${distribution}); \
done
-build:
+build: source
./build-in-chroot.sh \
$(PACKAGE) $(VERSION) $(CHROOT_BASE) \
'$(ARCHITECTURES)' '$(CODES)'
+
+source: ../$(PACKAGE)-$(VERSION).tar.gz
+
+../$(PACKAGE)-$(VERSION).tar.gz:
+ ln -s $(abs_top_builddir)/$(PACKAGE)-$(VERSION).tar.gz ../
Renamed: packages/apt/build-deb.sh (+0 -0) 100%
===================================================================
Renamed: packages/apt/build-in-chroot.sh (+0 -0) 100%
===================================================================
Renamed: packages/apt/groonga-depended-packages (+0 -0) 100%
===================================================================
Renamed: packages/apt/sign-repository.sh (+0 -0) 100%
===================================================================
Renamed: packages/apt/update-repository.sh (+0 -0) 100%
===================================================================
Renamed: packages/debian/changelog (+0 -0) 100%
===================================================================
Renamed: packages/debian/compat (+0 -0) 100%
===================================================================
Renamed: packages/debian/control (+0 -0) 100%
===================================================================
Renamed: packages/debian/copyright (+0 -0) 100%
===================================================================
Renamed: packages/debian/groonga-bin.install (+0 -0) 100%
===================================================================
Renamed: packages/debian/groonga-doc.docs (+0 -0) 100%
===================================================================
Renamed: packages/debian/groonga-munin-plugin.conf (+0 -0) 100%
===================================================================
Renamed: packages/debian/groonga-munin-plugins.install (+0 -0) 100%
===================================================================
Renamed: packages/debian/groonga-munin-plugins.postinst (+0 -0) 100%
===================================================================
Renamed: packages/debian/groonga-munin-plugins.postrm (+0 -0) 100%
===================================================================
Renamed: packages/debian/groonga-plugin-suggest.install (+0 -0) 100%
===================================================================
Renamed: packages/debian/groonga-server.default (+0 -0) 100%
===================================================================
Renamed: packages/debian/groonga-server.dirs (+0 -0) 100%
===================================================================
Renamed: packages/debian/groonga-server.init (+0 -0) 100%
===================================================================
Renamed: packages/debian/groonga-server.logrotate (+0 -0) 100%
===================================================================
Renamed: packages/debian/groonga-server.postinst (+0 -0) 100%
===================================================================
Renamed: packages/debian/groonga-server.postrm (+0 -0) 100%
===================================================================
Renamed: packages/debian/groonga-tokenizer-mecab.install (+0 -0) 100%
===================================================================
Renamed: packages/debian/libgroonga-dev.install (+0 -0) 100%
===================================================================
Renamed: packages/debian/libgroonga0.dirs (+0 -0) 100%
===================================================================
Renamed: packages/debian/libgroonga0.install (+0 -0) 100%
===================================================================
Renamed: packages/debian/patches/series (+0 -0) 100%
===================================================================
Renamed: packages/debian/rules (+0 -0) 100%
===================================================================
Renamed: packages/debian/source/format (+0 -0) 100%
===================================================================
Renamed: packages/rpm/Makefile.am (+0 -0) 100%
===================================================================
Renamed: packages/rpm/centos/Makefile.am (+0 -0) 100%
===================================================================
Renamed: packages/rpm/centos/groonga.spec.in (+0 -0) 100%
===================================================================
Renamed: packages/rpm/fedora/Makefile.am (+0 -0) 100%
===================================================================
Renamed: packages/rpm/fedora/groonga.spec.in (+0 -0) 100%
===================================================================
Renamed: packages/yum/Makefile.am (+6 -1) 85%
===================================================================
--- yum/Makefile.am 2011-05-27 09:54:22 +0000 (53b4df2)
+++ packages/yum/Makefile.am 2011-05-27 15:16:57 +0000 (be63a3c)
@@ -34,7 +34,12 @@ upload: ensure-rsync-path
$${distribution}/ $(RSYNC_PATH)/$${distribution}; \
done
-build: build-in-chroot build-repository-rpm
+build: source build-in-chroot build-repository-rpm
+
+source: ../$(PACKAGE)-$(VERSION).tar.gz
+
+../$(PACKAGE)-$(VERSION).tar.gz:
+ ln -s $(abs_top_builddir)/$(PACKAGE)-$(VERSION).tar.gz ../
build-in-chroot:
./build-in-chroot.sh \
Renamed: packages/yum/build-in-chroot.sh (+0 -0) 100%
===================================================================
Renamed: packages/yum/build-repository-rpm.sh (+0 -0) 100%
===================================================================
Renamed: packages/yum/build-rpm.sh (+0 -0) 100%
===================================================================
Renamed: packages/yum/gpg-public-key.sh (+0 -0) 100%
===================================================================
Renamed: packages/yum/gpg-uid.sh (+0 -0) 100%
===================================================================
Renamed: packages/yum/groonga-depended-packages (+0 -0) 100%
===================================================================
Renamed: packages/yum/groonga-repository.spec (+0 -0) 100%
===================================================================
Renamed: packages/yum/sign-rpm.sh (+0 -0) 100%
===================================================================
Renamed: packages/yum/update-repository.sh (+0 -0) 100%
===================================================================