[DRE-commits] [tdiary] 06/09: Update debian/rules, etc: Follow upstream changes
Youhei SASAKI
uwabami-guest at moszumanska.debian.org
Fri Feb 27 14:55:59 UTC 2015
This is an automated email from the git hooks/post-receive script.
uwabami-guest pushed a commit to branch master
in repository tdiary.
commit 9a78a8ac3bf4d33db370ee20f7e9c8edc432f449
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date: Fri Feb 27 23:49:53 2015 +0900
Update debian/rules, etc: Follow upstream changes
Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
---
debian/20change_url.rb | 4 +-
debian/TC_tdiary-setup.rb | 0
debian/control | 61 ++++++++++----------
debian/debian-tools/index-debian.rb | 0
debian/debian-tools/squeeze-debian.rb | 0
debian/debian-tools/update-debian.rb | 0
debian/docs | 24 +++++---
debian/rules | 105 ++++++++++++++++++++--------------
debian/tdiary-core.dirs | 2 +
debian/tdiary-core.install | 18 ++++++
debian/tdiary-core.manpages | 2 +
11 files changed, 132 insertions(+), 84 deletions(-)
diff --git a/debian/20change_url.rb b/debian/20change_url.rb
index e712987..af7a6a8 100644
--- a/debian/20change_url.rb
+++ b/debian/20change_url.rb
@@ -2,8 +2,8 @@
#
# Author: Daigo Moriwaki <beatles at sgtpepper.net>
# Copyright (c) 2004 Daigo Moriwaki
-# Copyright (c) 2013 Youhei SASAKI
-# License: GPL version 2 or later
+# Copyright (c) 2013-2015 Youhei SASAKI
+# License: GPL version 2 or later
def theme_url
'theme'
diff --git a/debian/TC_tdiary-setup.rb b/debian/TC_tdiary-setup.rb
old mode 100644
new mode 100755
diff --git a/debian/control b/debian/control
index be3b175..525c2d4 100644
--- a/debian/control
+++ b/debian/control
@@ -3,30 +3,29 @@ Section: web
Priority: optional
Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
Uploaders: Daigo Moriwaki <daigo at debian.org>, Taku YASUI <tach at debian.org>, Hideki Yamane <henrich at debian.org>, Youhei SASAKI <uwabami at gfd-dennou.org>
-Build-Depends: debhelper (>= 9), docbook-to-man, cdbs, rsync
+Build-Depends: debhelper (>= 9), docbook-to-man
Standards-Version: 3.9.6
Homepage: http://www.tdiary.org/
Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/tdiary.git
Vcs-Browser: http://anonscm.debian.org/gitweb?p=pkg-ruby-extras/tdiary.git;a=summary
+# XS-Ruby-Versions: all
-Package: tdiary
+Package: tdiary-core
Architecture: all
+# XB-Ruby-Versions: all
Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
ruby-rack,
ruby-sprockets,
- ruby-uconv,
- ruby-rd,
- ruby-debian,
- ruby-json,
- ruby-redcarpet,
ruby-hikidoc,
+ ruby-fastimage,
+ ruby-gemoji,
+ ruby-execjs,
ruby-coffee-script,
- ruby-pygments.rb,
- ruby-twitter-text
-Suggests: tdiary-mode, tdiary-contrib (>= 3.1), tdiary-contrib (<< 3.2), httpd-cgi
-Recommends: tdiary-theme (= ${source:Version}), tdiary-plugin (= ${source:Version}), httpd
-Conflicts: tdiary-theme (<< 3.1.3-1)
-Breaks: tdiary-theme (<< 3.1.3-1)
+ ruby-debian
+# Suggests: tdiary-mode, tdiary-contrib (>= 3.1), tdiary-contrib (<< 3.2), httpd-cgi
+# Recommends: tdiary-theme (= ${source:Version}), tdiary-plugin (= ${source:Version}), httpd
+# Conflicts: tdiary-theme (<< 3.1.3-1)
+# Breaks: tdiary-theme (<< 3.1.3-1)
Description: Communication-friendly weblog system
tDiary is a weblog system, which makes your weblog communication-friendly for
the writer (you) and readers. It consists of Ruby scripts for CGI (Common
@@ -46,22 +45,22 @@ Description: Communication-friendly weblog system
converted to HTML by tDiary. The converting grammars are called `styles'.
Many styles are available.
-Package: tdiary-theme
-Architecture: all
-Depends: ${misc:Depends}
-Suggests: tdiary
-Conflicts: tdiary (<< 3.1.3-1)
-Breaks: tdiary (<< 3.1.3-1)
-Description: Themes of tDiary to change the design
- This package includes a lot of Cascading Style Sheets, which change the design
- of tDiary. You can choose a theme at the configuration page.
+# Package: tdiary-theme
+# Architecture: all
+# Depends: ${misc:Depends}
+# Suggests: tdiary
+# Conflicts: tdiary (<< 3.1.3-1)
+# Breaks: tdiary (<< 3.1.3-1)
+# Description: Themes of tDiary to change the design
+# This package includes a lot of Cascading Style Sheets, which change the design
+# of tDiary. You can choose a theme at the configuration page.
-Package: tdiary-plugin
-Architecture: all
-Depends: ${misc:Depends}, ruby | ruby-interpreter, tdiary (= ${source:Version}), ruby-nora, ruby-imagesize
-Conflicts: tdiary (<< 3.1.3-1)
-Breaks: tdiary (<< 3.1.3-1)
-Description: Plugins of tDiary to add functionalities
- This package includes a lot of plugins that add functionalities to tDiary; for
- instance there are calendar, categories, footnotes, images, RSS (RDF Site
- Summary), search form, title lists, TODOs, what's new and so on.
+# Package: tdiary-plugin
+# Architecture: all
+# Depends: ${misc:Depends}, ruby | ruby-interpreter, tdiary (= ${source:Version}), ruby-nora, ruby-imagesize
+# Conflicts: tdiary (<< 3.1.3-1)
+# Breaks: tdiary (<< 3.1.3-1)
+# Description: Plugins of tDiary to add functionalities
+# This package includes a lot of plugins that add functionalities to tDiary; for
+# instance there are calendar, categories, footnotes, images, RSS (RDF Site
+# Summary), search form, title lists, TODOs, what's new and so on.
diff --git a/debian/debian-tools/index-debian.rb b/debian/debian-tools/index-debian.rb
old mode 100644
new mode 100755
diff --git a/debian/debian-tools/squeeze-debian.rb b/debian/debian-tools/squeeze-debian.rb
old mode 100644
new mode 100755
diff --git a/debian/debian-tools/update-debian.rb b/debian/debian-tools/update-debian.rb
old mode 100644
new mode 100755
diff --git a/debian/docs b/debian/docs
index abd5353..52feca9 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,9 +1,17 @@
-doc/HOWTO-make-io.rd
-doc/HOWTO-make-plugin.html
-doc/HOWTO-make-theme.html
-doc/HOWTO-use-plugin.html
-doc/HOWTO-write-tDiary.html
-doc/README.html
-doc/UPGRADE
+doc/HOWTO-authenticate-in-rack.md
+doc/HOWTO-make-io.md
+doc/HOWTO-make-plugin.md
+doc/HOWTO-make-theme.md
+doc/HOWTO-testing-tDiary.md
+doc/HOWTO-use-plugin.md
+doc/HOWTO-write-tDiary.en.md
+doc/HOWTO-write-tDiary.md
+doc/INSTALL-cgi.md
+doc/INSTALL-paas.md
+doc/INSTALL-rack.md
+doc/INSTALL.md
+doc/README.en.md
+doc/README.md
+doc/UPGRADE.md
doc/doc.css
-misc/i18n/
+README.md
diff --git a/debian/rules b/debian/rules
index 53871fa..41e8ac0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,56 +1,75 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-
-DEB_INSTALL_DIRS_ALL = usr/share/tdiary
-TDIARY_ROOT = $(DEB_DESTDIR)/usr/share/tdiary
manpages = tdiary-setup.1 tdiary-convert2.1
+DEB_DESTDIR := $(CURDIR)/debian/tdiary-core
+
+%:
+ dh $@
+
+override_dh_auto_install: $(manpages)
+ dh_auto_install
+ rm -f $(DEB_DESTDIR)/usr/share/tdiary/misc/convert2.rb
+ install -D -m 755 misc/convert2.rb $(DEB_DESTDIR)/usr/bin/tdiary-convert2
+ install -D -m 755 debian/tdiary-setup.rb $(DEB_DESTDIR)/usr/bin/tdiary-setup
$(manpages): %.1: debian/%.sgml
docbook-to-man $< > $@
-clean::
+override_dh_auto_clean:
+ dh_auto_clean
rm -f $(manpages)
-common-build-indep:: $(manpages)
+# include /usr/share/cdbs/1/rules/debhelper.mk
+# include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-common-install-indep::
- mkdir -p $(TDIARY_ROOT)
- install -m 755 index.rb index.fcgi update.rb update.fcgi $(TDIARY_ROOT)/
- install -m 644 tdiary.rb dot.htaccess tdiary.conf.* config.ru $(TDIARY_ROOT)/
- install -D -m 755 misc/convert2.rb $(DEB_DESTDIR)/usr/bin/tdiary-convert2
- rsync -rlpqHSC js misc skel spec plugin tdiary $(TDIARY_ROOT)/
+# DEB_INSTALL_DIRS_ALL = usr/share/tdiary
+# TDIARY_ROOT = $(DEB_DESTDIR)/usr/share/tdiary
+# manpages = tdiary-setup.1 tdiary-convert2.1
- # Install default theme
- mkdir -p $(TDIARY_ROOT)/theme
- rsync -rlpqHSC theme/*.css theme/*.png theme/*.gif theme/default $(TDIARY_ROOT)/theme/
+# $(manpages): %.1: debian/%.sgml
+# docbook-to-man $< > $@
- # Install Debian original scripts
- rsync -rlpqHSC debian/debian-tools $(TDIARY_ROOT)/
- install -m 755 debian/TC_tdiary-setup.rb $(TDIARY_ROOT)/
- install -m 644 debian/20change_url.rb $(TDIARY_ROOT)/plugin/
- install -D -m 755 debian/tdiary-setup.rb $(DEB_DESTDIR)/usr/bin/tdiary-setup
+# clean::
+# rm -f $(manpages)
+
+# common-build-indep:: $(manpages)
+
+# common-install-indep::
+# mkdir -p $(TDIARY_ROOT)
+# install -m 755 index.rb index.fcgi update.rb update.fcgi $(TDIARY_ROOT)/
+# install -m 644 tdiary.rb dot.htaccess tdiary.conf.* config.ru $(TDIARY_ROOT)/
+# install -D -m 755 misc/convert2.rb $(DEB_DESTDIR)/usr/bin/tdiary-convert2
+# rsync -rlpqHSC js misc skel spec plugin tdiary $(TDIARY_ROOT)/
+
+# # Install default theme
+# mkdir -p $(TDIARY_ROOT)/theme
+# rsync -rlpqHSC theme/*.css theme/*.png theme/*.gif theme/default $(TDIARY_ROOT)/theme/
+
+# # Install Debian original scripts
+# rsync -rlpqHSC debian/debian-tools $(TDIARY_ROOT)/
+# install -m 755 debian/TC_tdiary-setup.rb $(TDIARY_ROOT)/
+# install -m 644 debian/20change_url.rb $(TDIARY_ROOT)/plugin/
+# install -D -m 755 debian/tdiary-setup.rb $(DEB_DESTDIR)/usr/bin/tdiary-setup
+
+# # Fix permissions
+# find $(TDIARY_ROOT)/misc/plugin -type f -exec chmod 644 {} +
+# chmod 755 $(TDIARY_ROOT)/misc/plugin/squeeze.rb
+# chmod 755 $(TDIARY_ROOT)/misc/plugin/xmlrpc/xmlrpc.rb
+# chmod 755 $(TDIARY_ROOT)/misc/plugin/amazon/amazonimg.rb
+# chmod 755 $(TDIARY_ROOT)/debian-tools/*.rb
+
+# # Cleanup
+# find $(cdbs_curdestdir) -name license.txt -exec rm -f {} +
+
+# install/tdiary-theme::
+# # Install themes except default
+# rsync -rlpqHSC \
+# --exclude=/theme/default/ \
+# --exclude='/theme/*.css' \
+# --exclude='/theme/*.png' \
+# --exclude='/theme/*.gif' \
+# --exclude='/theme/README' \
+# theme $(CURDIR)/debian/$(cdbs_curpkg)/usr/share/tdiary/
- # Fix permissions
- find $(TDIARY_ROOT)/misc/plugin -type f -exec chmod 644 {} +
- chmod 755 $(TDIARY_ROOT)/misc/plugin/squeeze.rb
- chmod 755 $(TDIARY_ROOT)/misc/plugin/xmlrpc/xmlrpc.rb
- chmod 755 $(TDIARY_ROOT)/misc/plugin/amazon/amazonimg.rb
- chmod 755 $(TDIARY_ROOT)/debian-tools/*.rb
-
- # Cleanup
- find $(cdbs_curdestdir) -name license.txt -exec rm -f {} +
-
-install/tdiary-theme::
- # Install themes except default
- rsync -rlpqHSC \
- --exclude=/theme/default/ \
- --exclude='/theme/*.css' \
- --exclude='/theme/*.png' \
- --exclude='/theme/*.gif' \
- --exclude='/theme/README' \
- theme $(CURDIR)/debian/$(cdbs_curpkg)/usr/share/tdiary/
-
- # Fix permissions
- find $(CURDIR)/debian/$(cdbs_curpkg) -type f -exec chmod 644 {} +
+# # Fix permissions
+# find $(CURDIR)/debian/$(cdbs_curpkg) -type f -exec chmod 644 {} +
diff --git a/debian/tdiary-core.dirs b/debian/tdiary-core.dirs
new file mode 100644
index 0000000..55c41d7
--- /dev/null
+++ b/debian/tdiary-core.dirs
@@ -0,0 +1,2 @@
+usr/share/tdiary
+usr/bin
diff --git a/debian/tdiary-core.install b/debian/tdiary-core.install
new file mode 100644
index 0000000..b9bfffc
--- /dev/null
+++ b/debian/tdiary-core.install
@@ -0,0 +1,18 @@
+config.ru usr/share/tdiary/
+data usr/share/tdiary/
+dot.htaccess usr/share/tdiary/
+index.fcgi usr/share/tdiary/
+index.rb usr/share/tdiary/
+js usr/share/tdiary/
+lib usr/share/tdiary/
+misc usr/share/tdiary/
+tdiary.conf.beginner usr/share/tdiary/
+tdiary.conf.sample usr/share/tdiary/
+tdiary.conf.sample-en usr/share/tdiary/
+theme usr/share/tdiary/
+update.fcgi usr/share/tdiary/
+update.rb usr/share/tdiary/
+views usr/share/tdiary/
+debian/debian-tools usr/share/tdiary/
+debian/20change_url.rb usr/share/tdiary/lib/tdiary/plugin/
+debian/TC_tdiary-setup.rb usr/share/tdiary/
diff --git a/debian/tdiary-core.manpages b/debian/tdiary-core.manpages
new file mode 100644
index 0000000..3948fe5
--- /dev/null
+++ b/debian/tdiary-core.manpages
@@ -0,0 +1,2 @@
+tdiary-setup.1
+tdiary-convert2.1
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/tdiary.git
More information about the Pkg-ruby-extras-commits
mailing list