null+****@clear*****
null+****@clear*****
2011年 10月 29日 (土) 21:15:02 JST
Kouhei Sutou 2011-10-29 12:15:02 +0000 (Sat, 29 Oct 2011)
New Revision: 4c36e3cc031fc8fbbd37cbef4397b66e124e899b
Log:
[packages] move debian/, apt/, rpm/ and 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-storage-engine-depended-packages
(from apt/groonga-storage-engine-depended-packages)
packages/apt/sign-repository.sh
(from apt/sign-repository.sh)
packages/apt/update-repository.sh
(from apt/update-repository.sh)
packages/debian/apparmor/mysql-server-groonga
(from debian/apparmor/mysql-server-groonga)
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/mysql-server-groonga-doc.docs
(from debian/mysql-server-groonga-doc.docs)
packages/debian/mysql-server-groonga.install
(from debian/mysql-server-groonga.install)
packages/debian/mysql-server-groonga.postinst
(from debian/mysql-server-groonga.postinst)
packages/debian/mysql-server-groonga.postrm
(from debian/mysql-server-groonga.postrm)
packages/debian/rules
(from debian/rules)
packages/rpm/Makefile.am
(from rpm/Makefile.am)
packages/rpm/centos/Makefile.am
(from rpm/centos/Makefile.am)
packages/rpm/centos/mysql-groonga.spec.in
(from rpm/centos/mysql-groonga.spec.in)
packages/rpm/fedora/Makefile.am
(from rpm/fedora/Makefile.am)
packages/rpm/fedora/mysql-groonga.spec.in
(from rpm/fedora/mysql-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-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/mysql-groonga-depended-packages
(from yum/mysql-groonga-depended-packages)
packages/yum/sign-rpm.sh
(from yum/sign-rpm.sh)
packages/yum/update-repository.sh
(from yum/update-repository.sh)
Modified: .gitignore (+5 -5)
===================================================================
--- .gitignore 2011-10-28 15:20:37 +0000 (5d2ea35)
+++ .gitignore 2011-10-29 12:15:02 +0000 (3254dbe)
@@ -11,8 +11,8 @@ Makefile
Makefile.in
cscope.out
/aclocal.m4
-/apt/debian/
-/apt/ubuntu/
+/packages/apt/debian/
+/packages/apt/ubuntu/
/autom4te.cache
/config.guess
/config.h
@@ -29,9 +29,9 @@ cscope.out
/stamp-h1
/src/scratch
/libgroonga_storage_engine.a
-/rpm/*/*.spec
-/yum/fedora/
-/yum/centos/
+/packages/rpm/*/*.spec
+/packages/yum/fedora/
+/packages/yum/centos/
/doc/ja/build/
/doc/ja/doctrees/
/doc/ja/html/
Modified: Makefile.am (+4 -4)
===================================================================
--- Makefile.am 2011-10-28 15:20:37 +0000 (3b8cc86)
+++ Makefile.am 2011-10-29 12:15:02 +0000 (4c15348)
@@ -17,7 +17,7 @@ libgroonga_storage_engine_a_CXXFLAGS = $(AM_CFLAGS) $(MYSQL_CFLAGS)
libgroonga_storage_engine_a_CFLAGS = $(AM_CFLAGS) $(MYSQL_CFLAGS)
libgroonga_storage_engine_a_SOURCES = ha_mroonga.cc mrn_sys.c mrn_table.cc
-SUBDIRS = test apt rpm yum doc
+SUBDIRS = test packages doc
EXTRA_DIST = plug.in
@@ -48,9 +48,9 @@ update-latest-release:
misc/update-latest-release.rb \
$(PACKAGE) $(OLD_RELEASE) $(OLD_RELEASE_DATE) \
$(VERSION) $(NEW_RELEASE_DATE) \
- rpm/fedora/mysql-groonga.spec.in \
- rpm/centos/mysql-groonga.spec.in \
- debian/changelog
+ packages/rpm/fedora/mysql-groonga.spec.in \
+ packages/rpm/centos/mysql-groonga.spec.in \
+ packages/debian/changelog
echo-mysql-source:
echo $(MYSQL_SOURCE)
Modified: configure.ac (+7 -7)
===================================================================
--- configure.ac 2011-10-28 15:20:37 +0000 (2ec9ea4)
+++ configure.ac 2011-10-29 12:15:02 +0000 (eefda49)
@@ -299,15 +299,15 @@ AC_CONFIG_FILES([
test/sql/groonga_wrapper/Makefile
test/sql/groonga_wrapper/r/Makefile
test/sql/groonga_wrapper/t/Makefile
- apt/Makefile
- rpm/Makefile
- rpm/centos/Makefile
- rpm/fedora/Makefile
- yum/Makefile
+ packages/Makefile
+ packages/rpm/Makefile
+ packages/rpm/centos/Makefile
+ pakcages/rpm/fedora/Makefile
+ packages/yum/Makefile
doc/Makefile
doc/ja/Makefile
])
AC_OUTPUT([
- rpm/centos/mysql-groonga.spec
- rpm/fedora/mysql-groonga.spec
+ packages/rpm/centos/mysql-groonga.spec
+ packages/rpm/fedora/mysql-groonga.spec
])
Added: packages/Makefile.am (+4 -0) 100644
===================================================================
--- /dev/null
+++ packages/Makefile.am 2011-10-29 12:15:02 +0000 (d1bf9d1)
@@ -0,0 +1,4 @@
+SUBDIRS = \
+ apt \
+ rpm \
+ yum
Renamed: packages/apt/Makefile.am (+0 -0) 100%
===================================================================
Renamed: packages/apt/build-deb.sh (+0 -0) 100%
===================================================================
Renamed: packages/apt/build-in-chroot.sh (+0 -0) 100%
===================================================================
Renamed: packages/apt/groonga-storage-engine-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/apparmor/mysql-server-groonga (+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/mysql-server-groonga-doc.docs (+0 -0) 100%
===================================================================
Renamed: packages/debian/mysql-server-groonga.install (+0 -0) 100%
===================================================================
Renamed: packages/debian/mysql-server-groonga.postinst (+0 -0) 100%
===================================================================
Renamed: packages/debian/mysql-server-groonga.postrm (+0 -0) 100%
===================================================================
Renamed: packages/debian/rules (+0 -0) 100%
===================================================================
Renamed: packages/rpm/Makefile.am (+0 -0) 100%
===================================================================
Renamed: packages/rpm/centos/Makefile.am (+0 -0) 100%
===================================================================
Renamed: packages/rpm/centos/mysql-groonga.spec.in (+0 -0) 100%
===================================================================
Renamed: packages/rpm/fedora/Makefile.am (+0 -0) 100%
===================================================================
Renamed: packages/rpm/fedora/mysql-groonga.spec.in (+0 -0) 100%
===================================================================
Renamed: packages/yum/Makefile.am (+0 -0) 100%
===================================================================
Renamed: packages/yum/build-in-chroot.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/mysql-groonga-depended-packages (+0 -0) 100%
===================================================================
Renamed: packages/yum/sign-rpm.sh (+0 -0) 100%
===================================================================
Renamed: packages/yum/update-repository.sh (+0 -0) 100%
===================================================================