[DRE-commits] [SCM] tdiary-contrib.git branch, master, updated. upstream/3.1.20120506-9-gf012457
Taku YASUI
tach at debian.org
Sun May 6 17:58:39 UTC 2012
The following commit has been merged in the master branch:
commit 3a9a3d0361845d7d671901eb30081b21b0ab0d80
Author: Taku YASUI <tach at debian.org>
Date: Mon May 7 02:28:49 2012 +0900
Remove copyright/license issue files
diff --git a/debian/NEWS b/debian/NEWS
deleted file mode 100644
index fd6f9cd..0000000
--- a/debian/NEWS
+++ /dev/null
@@ -1,37 +0,0 @@
-tdiary (2.2.1-1) unstable; urgency=low
-
- In order to obey Debian's policy, tdiary-theme's files do no more put under
- /var/www/tdiary/theme. It is responsibility of a local administrator to
- make files in /usr/share/tdiary/theme available on the web.
- See README.Debian of tdiary-theme to get more information.
-
- -- Daigo Moriwaki <beatles at sgtpepper.net> Tue, 17 Jun 2008 22:31:07 +0900
-
-tdiary (2.0.2+20050720-1) unstable; urgency=low
-
- Following files are removed from Debian tdiary packages because they lack
- license or copyright. It could cause errors to show your entries that depend
- on the files. Please install them by yourself.
-
- - misc/plugin/amazon
- - misc/plugin/bq
- - misc/plugin/comment_rank
- - misc/plugin/gradation
- - misc/plugin/gradient
- - misc/plugin/makelirs
- - misc/plugin/recent_comment
- - misc/plugin/doctype-html401tr
- - misc/plugin/dropdown_calendar
- - misc/plugin/highlight
- - misc/plugin/referer-utf8 (this is also deprecated)
- - misc/plugin/src
- - misc/plugin/title_list
- - misc/plugin/title_tag
- - contrib/plugin/antirefspam
- - contrib/plugin/google_adsense.rb
- - contrib/plugin/select_theme
- - contrib/util/clean-spam
- - contrib/util/rast-search
- - contrib/style/hatena
-
- -- Daigo Moriwaki <beatles at sgtpepper.net> Sun, 24 Jul 2005 11:32:20 +0900
diff --git a/debian/README.Debian b/debian/README.Debian
index 173c3ec..83a4e83 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,9 +1,21 @@
-tdiary-contrib
-------------
+tdiary-contrib for Debian
+=========================
This package includes optional utilities and plugins for tDiary,
+
* that do not depend on tDiary-core version,
* that are not internationalized yet,
* that do not work with the latest tDiary-core version and so on.
+Copyright and license Issues
+----------------------------
+
+Following files are removed from binary package because of unknown
+copyright or license.
+
+ * plugin/coderwall.rb
+ * plugin/select_style.rb
+ * plugin/tweet_quote.rb
+ * js/yahoo_kousei.js
+
-- Daigo Moriwaki <beatles at sgtpepper.net>, Wed, 13 Apr 2005 23:35:01 +0900
diff --git a/debian/rules b/debian/rules
index fcb7cbf..ee38edb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,6 +20,12 @@ install/tdiary-contrib::
# Cleanup
rm -rf $(TDIARY_DIR)/contrib/util/tdiary-mode
+ # Remove due to copyright or license issue
+ rm $(TDIARY_DIR)/contrib/plugin/coderwall.rb
+ rm $(TDIARY_DIR)/contrib/plugin/select_style.rb
+ rm $(TDIARY_DIR)/contrib/plugin/tweet_quote.rb
+ rm $(TDIARY_DIR)/js/yahoo_kousei.js
+
install/tdiary-mode::
install -D -m644 util/tdiary-mode/http.el $(ELISP_DIR)/http.el
install -D -m644 util/tdiary-mode/tdiary-mode.el $(ELISP_DIR)/tdiary-mode.el
diff --git a/debian/rules.org b/debian/rules.org
deleted file mode 100755
index 40c179c..0000000
--- a/debian/rules.org
+++ /dev/null
@@ -1,134 +0,0 @@
-#!/usr/bin/make -f
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-BUILDROOT=`pwd`/debian/tdiary
-TDIARY=$(BUILDROOT)/usr/share/tdiary
-DOC_TDIARY=$(BUILDROOT)/usr/share/doc/tdiary
-WWW=$(TDIARY)
-MANDEST=$(BUILDROOT)/usr/share/man/man1
-QUILT_STAMPFN=patch-stamp
-
-manpages = tdiary-setup.1 tdiary-convert2.1
-
-$(manpages): %.1: debian/%.sgml
- docbook-to-man $< > $@
-
-build-arch: build
-build-indep: build
-
-build: build-stamp
-build-stamp: $(manpages)
- @echo "--- Compiling"
- dh_testdir
- # Do something to build your package here
- # touch build-stamp
-
-
-clean: clean1
- rm -f debian/*.debhelper.log
-
-clean1:
- @echo "--- Cleaning"
- dh_testdir
- dh_testroot
- dh_clean
-
- # Add here commands to clean up after the build process.
- rm -f $(manpages)
-
-install: build
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs
-
- # Add here commands to install the package into debian/tdiary.
- # --- Main files ---
- # TODO
- rm -f tdiary/wiki_style.rb
- #
- install -m 755 index.rb index.fcgi update.rb $(TDIARY)/
- install -m 644 tdiary.rb ChangeLog dot.htaccess README tdiary.conf.sample $(TDIARY)/
- cp -a js misc skel spec plugin tdiary $(TDIARY)/
- cp -a contrib2 $(TDIARY)/contrib
- mv $(TDIARY)/misc/plugin/trackback/tb.rb $(TDIARY)/
-
- # - copy themes into the web directory
- install -m 755 theme/themebench.rhtml $(BUILDROOT)/usr/lib/cgi-bin/tdiary/theme
- cp -ar theme $(WWW)
- find $(WWW) -name "*.png" -or -name "*.jpg" -or -name "*.css" | xargs chmod a-x
- rm -r $(WWW)/theme/themebench.rhtml
- for f in $(WWW)/theme/* ; do \
- if [ "$${f##*/}" = 'default' ] || \
- [ "$${f##*/}" = 'README' ] || \
- [ "$${f##*/}" = 'base.css' ]; then \
- continue ; \
- fi ; \
- dh_movefiles -ptdiary-theme --sourcedir=debian/tdiary -X.svn \
- "usr/share/tdiary/theme/$${f##*/}" ; \
- done
-
- # - debian original scripts
- cp -ar debian/debian-tools $(TDIARY)/
- install -m 644 debian/20theme_url.rb $(TDIARY)/plugin
- install -m 755 debian/tdiary-setup.rb $(BUILDROOT)/usr/bin/tdiary-setup
- install -m 755 misc/convert2.rb $(BUILDROOT)/usr/bin/tdiary-convert2
- install -m 755 debian/TC_tdiary-setup.rb $(TDIARY)/
-
- # - Fix permissions
- find $(TDIARY)/misc/plugin -type f | xargs chmod 644
- find $(WWW)/theme -type f | xargs chmod 644
- chmod a+x $(TDIARY)/misc/plugin/squeeze.rb
- chmod a+x $(TDIARY)/contrib/util/posttdiary/posttdiary.rb
- chmod a+x $(TDIARY)/contrib/util/tdiarysearch/search.rb
- chmod a+x $(TDIARY)/contrib/util/posttdiary/posttdiary-ex.rb
- chmod a+x $(TDIARY)/contrib/util/clean-spam/tdiary-comment-clean
- chmod a+x $(TDIARY)/contrib/util/clean-spam/tdiary-referer-clean
- chmod a+x $(TDIARY)/contrib/util/rast-search/rast-register.rb
- chmod a+x $(TDIARY)/contrib/util/rast-search/rast-search.rb
-
- # --- Move files for tdiary-mode.deb ---
- mv $(TDIARY)/contrib/util/tdiary-mode/*.el \
- $(CURDIR)/debian/tdiary-mode/usr/share/emacs/site-lisp/tdiary-mode/
-
- # --- Move files for tdiary-{theme,plugin,contrib}.deb ---
- find $(BUILDROOT) -type d -empty -print | xargs rm -rf
- dh_movefiles --sourcedir=debian/tdiary -X.svn
- for d in tdiary tdiary-contrib tdiary-mode tdiary-theme tdiary-plugin ; do \
- find $(CURDIR)/debian/$$d -type d -name ".svn" | xargs rm -rf ; \
- done
-
- find debian -name license.txt | xargs -r rm -f
-
-# Build architecture-independent files here.
-binary-indep: build install
- dh_testdir -i
- dh_testroot -i
-# dh_installdebconf -i
- dh_installdocs -i -X.svn
- dh_installexamples -i -X.svn
-# dh_installlogrotate -i
- dh_installemacsen -i -X.svn --priority=50
-# dh_installcron -i
- dh_installman -i -X.svn
-# dh_installinfo -i
- dh_installchangelogs ChangeLog
- dh_installchangelogs -ptdiary ChangeLog
- dh_installchangelogs -ptdiary-plugin misc/plugin/ChangeLog.DO_NOT_UPDATE
- dh_link -i
- dh_strip -i
- dh_compress -i
- dh_fixperms -i
- dh_installdeb -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i
-
-# Build architecture-dependent files here.
-binary-arch: build install
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
-
--
tdiary-contrib.git
More information about the Pkg-ruby-extras-commits
mailing list