null+****@clear*****
null+****@clear*****
2012年 4月 27日 (金) 23:12:51 JST
Kouhei Sutou 2012-04-27 23:12:51 +0900 (Fri, 27 Apr 2012)
New Revision: d59b8c3ffaa5e891778d2963a70c447c09637bf6
Log:
apt: don't create groonga-repository package
Removed files:
packages/apt/debian/groonga-repository.install
packages/apt/groonga.list.in
Modified files:
.gitignore
packages/apt/Makefile.am
packages/apt/debian/changelog
packages/apt/debian/control
packages/apt/debian/rules
Renamed files:
packages/apt/groonga-keyring-depended-packages
(from packages/apt/groonga-repository-depended-packages)
Modified: .gitignore (+2 -2)
===================================================================
--- .gitignore 2012-04-27 22:46:53 +0900 (dea2717)
+++ .gitignore 2012-04-27 23:12:51 +0900 (35b789c)
@@ -92,8 +92,8 @@ cmake_install.cmake
/packages/apt/packages/ubuntu/dists/
/packages/apt/packages/ubuntu/*.db
/packages/apt/packages/ubuntu/*.conf
-/packages/apt/groonga-repository-*/
-/packages/apt/groonga-repository-*.tar.gz
+/packages/apt/groonga-keyring-*/
+/packages/apt/groonga-keyring-*.tar.gz
/configure.lineno
/packages/rpm/*/*.spec
/packages/yum/groonga.repo
Modified: packages/apt/Makefile.am (+2 -3)
===================================================================
--- packages/apt/Makefile.am 2012-04-27 22:46:53 +0900 (5fe5936)
+++ packages/apt/Makefile.am 2012-04-27 23:12:51 +0900 (6b6fc15)
@@ -2,8 +2,8 @@ DISTRIBUTIONS = debian ubuntu
CHROOT_BASE = /var/lib/chroot
ARCHITECTURES = i386 amd64
CODES = squeeze wheezy unstable lucid natty oneiric precise
-REPOSITORY_PACKAGE = groonga-repository
-REPOSITORY_VERSION = 1.0.0
+REPOSITORY_PACKAGE = groonga-keyring
+REPOSITORY_VERSION = 2012.04.29
REPOSITORY_BASE_NAME = $(REPOSITORY_PACKAGE)-$(REPOSITORY_VERSION)
all:
@@ -64,5 +64,4 @@ $(REPOSITORY_BASE_NAME).tar.gz: $(top_srcdir)/gpg_uid
mkdir -p $(REPOSITORY_BASE_NAME)
gpg --armor --export '$(GPG_UID)' > \
$(REPOSITORY_BASE_NAME)/groonga-keyring.gpg
- cp groonga.list.in $(REPOSITORY_BASE_NAME)/
tar cvzf $(REPOSITORY_BASE_NAME).tar.gz $(REPOSITORY_BASE_NAME)
Modified: packages/apt/debian/changelog (+1 -1)
===================================================================
--- packages/apt/debian/changelog 2012-04-27 22:46:53 +0900 (965c433)
+++ packages/apt/debian/changelog 2012-04-27 23:12:51 +0900 (2a36546)
@@ -1,4 +1,4 @@
-groonga-repository (1.0.0-1) unstable; urgency=low
+groonga-keyring (2012.04.29-1) unstable; urgency=low
* Initial release.
Modified: packages/apt/debian/control (+3 -12)
===================================================================
--- packages/apt/debian/control 2012-04-27 22:46:53 +0900 (f872fec)
+++ packages/apt/debian/control 2012-04-27 23:12:51 +0900 (949ce13)
@@ -1,21 +1,12 @@
-Source: groonga-repository
+Source: groonga-keyring
Section: misc
-Priority: optional
+Priority: important
Maintainer: groonga project <packa****@groon*****>
Build-Depends:
- debhelper (>= 7.0.50),
- lsb-release
+ debhelper (>= 7.0.50)
Standards-Version: 3.9.1
Homepage: http://groonga.org/
-Package: groonga-repository
-Section: misc
-Architecture: all
-Depends:
- ${misc:Depends}
-Description: apt-line for the groonga repository
- This package contains apt-line for the groonga repository.
-
Package: groonga-keyring
Section: misc
Architecture: all
Deleted: packages/apt/debian/groonga-repository.install (+0 -1) 100644
===================================================================
--- packages/apt/debian/groonga-repository.install 2012-04-27 22:46:53 +0900 (fd40bc8)
+++ /dev/null
@@ -1 +0,0 @@
-etc/apt/sources.list.d/*
Modified: packages/apt/debian/rules (+0 -7)
===================================================================
--- packages/apt/debian/rules 2012-04-27 22:46:53 +0900 (dd80325)
+++ packages/apt/debian/rules 2012-04-27 23:12:51 +0900 (759f2fd)
@@ -14,11 +14,4 @@ override_dh_install:
install -m 0644 groonga-keyring.gpg \
debian/tmp/usr/share/keyrings/
- install -d debian/tmp/etc/apt/sources.list.d/
- sed \
- -e "s/@distribution@/$$(lsb_release --id --short | tr 'A-Z' 'a-z')/g" \
- -e "s/@code_name@/$$(lsb_release --codename --short | sed -e 's/sid/unstable/g')/g" \
- groonga.list.in > \
- debian/tmp/etc/apt/sources.list.d/groonga.list
-
dh_install
Renamed: packages/apt/groonga-keyring-depended-packages (+0 -0) 100%
===================================================================
Deleted: packages/apt/groonga.list.in (+0 -2) 100644
===================================================================
--- packages/apt/groonga.list.in 2012-04-27 22:46:53 +0900 (276d1c6)
+++ /dev/null
@@ -1,2 +0,0 @@
-deb http://packages.groonga.org/@distribution@/ @code_name@ main
-deb-src http://packages.groonga.org/@distribution@/ @code_name@ main