[DRE-commits] [tdiary-contrib] 03/04: Use dh instead of cdbs
Youhei SASAKI
uwabami-guest at moszumanska.debian.org
Sun May 14 12:02:16 UTC 2017
This is an automated email from the git hooks/post-receive script.
uwabami-guest pushed a commit to branch master
in repository tdiary-contrib.
commit 9a6dcd273b081ee246a8862689cea45b57cc3ef3
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date: Sun May 14 20:58:01 2017 +0900
Use dh instead of cdbs
Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
---
debian/README.Debian | 7 +------
debian/changelog | 6 ++++++
debian/control | 4 +++-
debian/copyright | 7 +------
debian/patches/010_disable_unexecutable_shebang | 12 ++++++++++++
debian/patches/020_depends_libjs-mootools.patch | 25 +++++++++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 23 +++++++++++++----------
debian/source/lintian-overrides | 2 ++
9 files changed, 64 insertions(+), 23 deletions(-)
diff --git a/debian/README.Debian b/debian/README.Debian
index b9e7468..021cef0 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -18,9 +18,4 @@ copyright or license.
* plugin/tweet_quote.rb
* js/yahoo_kousei.js
-TODO
-----
-
- * Remove mootools.js and depends on libjs-mootools to prevent lintian errors.
-
--- Daigo Moriwaki <beatles at sgtpepper.net>, Wed, 13 Apr 2005 23:35:01 +0900
+ -- Youhei SASAKI <uwabami at gfd-dennou.org>, Sun, 14 May 2017 20:57:44 +0900
diff --git a/debian/changelog b/debian/changelog
index f5bc695..67dc071 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tdiary-contrib (5.0.4-1) experimental; urgency=medium
+
+ * New upstream version 5.0.4
+
+ -- Youhei SASAKI <uwabami at gfd-dennou.org> Sun, 14 May 2017 20:20:37 +0900
+
tdiary-contrib (5.0.2-2) unstable; urgency=medium
* Move old packaging tools to d/packaging-tools/old
diff --git a/debian/control b/debian/control
index 5280c27..e584a41 100644
--- a/debian/control
+++ b/debian/control
@@ -6,19 +6,21 @@ Uploaders: Daigo Moriwaki <daigo at debian.org>,
Taku YASUI <tach at debian.org>,
Youhei SASAKI <uwabami at gfd-dennou.org>,
Hideki Yamane <henrich at debian.org>
-Build-Depends: cdbs,
+Build-Depends: gem2deb,
debhelper (>= 9),
rsync
Standards-Version: 3.9.8
Homepage: http://www.tdiary.org/
Vcs-Git: https://anonscm.debian.org/git/pkg-ruby-extras/tdiary-contrib.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ruby-extras/tdiary-contrib.git
+XS-Ruby-Versions: all
Package: tdiary-contrib
Architecture: all
Depends: curl,
ruby | ruby-interpreter,
tdiary (>= 5),
+ libjs-mootools,
${misc:Depends}
Suggests: hyperestraier,
ruby-hyperestraier
diff --git a/debian/copyright b/debian/copyright
index 2f0e96f..c692b31 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -156,8 +156,7 @@ Files: util/image-gallery/js/SmoothGallery/scripts/mootools-1.2-more.js
util/image-gallery/js/SmoothGallery/scripts/mootools-1.2.1-core-yc.js
Copyright: 2006-2008 Valerio Proietti <http://mad4milk.net>
License: Expat
-
-
+Note: Please see the package: libjs-mootools
Files: util/image-gallery/js/SmoothGallery/scripts/jdgalleryresize.js
util/image-gallery/js/SmoothGallery/scripts/jd.gallery.js
@@ -317,10 +316,6 @@ Files: js/flickr.js js/socialbutton.js
Copyright: 2011MATSUOKA Kohei <kmachu at gmail.com>
License: GPL-2.0+
-Files: js/picasa.js
-Copyright: 2011hb <smallstyle at gmail.com>
-License: GPL-2.0+
-
Files: js/appstore.js js/show_and_hide.js
Copyright: 2011tamoot <tamoot+tdiary at gmail.com>
License: GPL-2.0+
diff --git a/debian/patches/010_disable_unexecutable_shebang b/debian/patches/010_disable_unexecutable_shebang
index cd90b65..45062a9 100644
--- a/debian/patches/010_disable_unexecutable_shebang
+++ b/debian/patches/010_disable_unexecutable_shebang
@@ -1,3 +1,15 @@
+From: Debian Ruby Extras Maintainers
+ <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
+Date: Sun, 14 May 2017 20:58:08 +0900
+Subject: _disable_unexecutable_shebang
+
+Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
+---
+ style/hatena_style.rb | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/style/hatena_style.rb b/style/hatena_style.rb
+index d1947e9..3ae02ad 100755
--- a/style/hatena_style.rb
+++ b/style/hatena_style.rb
@@ -1,4 +1,3 @@
diff --git a/debian/patches/020_depends_libjs-mootools.patch b/debian/patches/020_depends_libjs-mootools.patch
new file mode 100644
index 0000000..d1497b1
--- /dev/null
+++ b/debian/patches/020_depends_libjs-mootools.patch
@@ -0,0 +1,25 @@
+From: Debian Ruby Extras Maintainers
+ <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
+Date: Sun, 14 May 2017 20:58:08 +0900
+Subject: Use libjs-mootools
+
+Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
+---
+ util/image-gallery/misc/plugin/recent_image.rb | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/util/image-gallery/misc/plugin/recent_image.rb b/util/image-gallery/misc/plugin/recent_image.rb
+index 12ced34..da966d6 100644
+--- a/util/image-gallery/misc/plugin/recent_image.rb
++++ b/util/image-gallery/misc/plugin/recent_image.rb
+@@ -306,8 +306,8 @@ if /image-gallery\.(?:cgi|rb)$/ =~ $0
+ <link rel="stylesheet" href="js/SmoothGallery/css/jd.gallery.css" type="text/css" media="screen" charset="utf-8" />
+ <link rel="stylesheet" href="js/SmoothGallery/css/ReMooz.css" type="text/css" media="screen" charset="utf-8" />
+ <link rel="stylesheet" href="#{theme_url}/image-gallery.css" type="text/css" media="all">
+- <script src="js/SmoothGallery/scripts/mootools-1.2.1-core-yc.js" type="text/javascript"></script>
+- <script src="js/SmoothGallery/scripts/mootools-1.2-more.js" type="text/javascript"></script>
++ <script src="js/SmoothGallery/scripts/mootools-core-yc.js" type="text/javascript"></script>
++ <script src="js/SmoothGallery/scripts/mootools-more.js" type="text/javascript"></script>
+ <script src="js/SmoothGallery/scripts/ReMooz.js" type="text/javascript"></script>
+ <script src="js/SmoothGallery/scripts/jd.gallery.js" type="text/javascript"></script>
+ EOS
diff --git a/debian/patches/series b/debian/patches/series
index 78f7e90..d50ca7c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
010_disable_unexecutable_shebang
+020_depends_libjs-mootools.patch
diff --git a/debian/rules b/debian/rules
index 444843b..ab587c6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,21 +1,22 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
+TDIARY_DIR = $(CURDIR)/debian/tdiary-contrib/usr/share/tdiary
+ELISP_DIR = $(CURDIR)/debian/tdiary-mode/usr/share/emacs/site-lisp/tdiary-mode
-TDIARY_DIR = $(CURDIR)/debian/$(cdbs_curpkg)/usr/share/tdiary
-ELISP_DIR = $(CURDIR)/debian/$(cdbs_curpkg)/usr/share/emacs/site-lisp/$(cdbs_curpkg)
+%:
+ dh $@ --buildsystem ruby --with ruby
-install/tdiary-contrib::
+override_dh_auto_install:
+ dh_auto_install
rsync -rlpqHSC js $(TDIARY_DIR)/
rsync -rlpqHSC plugin $(TDIARY_DIR)/contrib/
rsync -rlpqHSC misc/* $(TDIARY_DIR)/misc/
rsync -rlpqHSC filter io style util $(TDIARY_DIR)/contrib/
rsync -rlpqHSC lib/bayes* $(TDIARY_DIR)/
-
- # Fix permissions
find $(TDIARY_DIR) -type f -exec chmod 644 {} +
chmod 755 $(TDIARY_DIR)/contrib/plugin/git-register.rb
chmod 755 $(TDIARY_DIR)/contrib/plugin/windex.rb
+ chmod 755 $(TDIARY_DIR)/contrib/plugin/squeeze.rb
chmod 755 $(TDIARY_DIR)/contrib/util/clean-spam/tdiary-comment-clean
chmod 755 $(TDIARY_DIR)/contrib/util/clean-spam/tdiary-comment-clean2
chmod 755 $(TDIARY_DIR)/contrib/util/clean-spam/tdiary-referer-clean
@@ -28,17 +29,19 @@ install/tdiary-contrib::
chmod 755 $(TDIARY_DIR)/contrib/util/rast-search/rast-register.rb
chmod 755 $(TDIARY_DIR)/contrib/util/rast-search/rast-search.rb
chmod 755 $(TDIARY_DIR)/contrib/util/tdiary-grep/grep.rb
-
# Cleanup
rm -rf $(TDIARY_DIR)/contrib/util/tdiary-mode
find $(TDIARY_DIR) -name license.txt -exec rm {} +
-
# 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::
+ # use libjs-mootools
+ rm $(TDIARY_DIR)/contrib/util/image-gallery/js/SmoothGallery/scripts/mootools-1.2-more.js
+ dh_link usr/share/javascript/mootools/mootools-more.min.js usr/share/tdiary/contrib/util/image-gallery/js/SmoothGallery/scripts/mootools-more.js
+ rm $(TDIARY_DIR)/contrib/util/image-gallery/js/SmoothGallery/scripts/mootools-1.2.1-core-yc.js
+ dh_link usr/share/javascript/mootools/mootools-core.min.js usr/share/tdiary/contrib/util/image-gallery/js/SmoothGallery/scripts/mootools-core-yc.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/source/lintian-overrides b/debian/source/lintian-overrides
index 7122e11..7ff9ad0 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -1,5 +1,7 @@
# Note: source is added to debian/missing-sources directory but it is merged
# from multiple files to one source, so lintian cannot detect it and
# I'll override it.
+tdiary-contrib source: source-contains-prebuilt-javascript-object util/image-gallery/js/SmoothGallery/scripts/mootools-1.2-more.js line length is 278 characters (>256)
tdiary-contrib source: source-is-missing util/image-gallery/js/SmoothGallery/scripts/mootools-1.2-more.js line length is 278 characters (>256)
+tdiary-contrib source: source-contains-prebuilt-javascript-object util/image-gallery/js/SmoothGallery/scripts/mootools-1.2.1-core-yc.js
tdiary-contrib source: source-is-missing util/image-gallery/js/SmoothGallery/scripts/mootools-1.2.1-core-yc.js
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/tdiary-contrib.git
More information about the Pkg-ruby-extras-commits
mailing list