diff -Nru goby-1.1+0.20140625/debian/changelog goby-1.1+0.20150806/debian/changelog --- goby-1.1+0.20140625/debian/changelog 2014-08-24 09:35:46.000000000 +0000 +++ goby-1.1+0.20150806/debian/changelog 2016-10-23 14:55:01.000000000 +0000 @@ -1,3 +1,20 @@ +goby (1.1+0.20150806-2) unstable; urgency=medium + + * Update 900_changelog.patch + * Update debhelper compat version to 9 + + -- Tatsuya Kinoshita Sun, 23 Oct 2016 23:55:01 +0900 + +goby (1.1+0.20150806-1) unstable; urgency=medium + + * New upstream version 1.1+0.20150806 + * Update debian/copyright + * Accept emacs25 + * Update Vcs-Browser to https + * Update Standards-Version to 3.9.8 + + -- Tatsuya Kinoshita Sun, 23 Oct 2016 22:29:55 +0900 + goby (1.1+0.20140625-1) unstable; urgency=medium * Imported Upstream version 1.1+0.20140625 diff -Nru goby-1.1+0.20140625/debian/compat goby-1.1+0.20150806/debian/compat --- goby-1.1+0.20140625/debian/compat 2013-12-14 23:43:03.000000000 +0000 +++ goby-1.1+0.20150806/debian/compat 2016-10-23 14:54:21.000000000 +0000 @@ -1 +1 @@ -7 +9 diff -Nru goby-1.1+0.20140625/debian/control goby-1.1+0.20150806/debian/control --- goby-1.1+0.20140625/debian/control 2014-08-24 09:30:55.000000000 +0000 +++ goby-1.1+0.20150806/debian/control 2016-10-23 14:54:26.000000000 +0000 @@ -2,15 +2,15 @@ Section: lisp Priority: optional Maintainer: Tatsuya Kinoshita -Build-Depends: debhelper (>= 7) -Standards-Version: 3.9.5 +Build-Depends: debhelper (>= 9) +Standards-Version: 3.9.8 Homepage: http://www.mew.org/~kazu/proj/goby/ Vcs-Git: git://anonscm.debian.org/collab-maint/goby.git -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/goby.git +Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/goby.git Package: goby Architecture: all -Depends: emacsen-common (>= 2.0.8), emacs | emacs24 | emacs23 | emacs22 | emacs-snapshot, ${misc:Depends} +Depends: emacsen-common (>= 2.0.8), emacs | emacs25 | emacs24 | emacs23 | emacs22 | emacs-snapshot, ${misc:Depends} Recommends: netpbm, imagemagick Suggests: fonts-liberation, fonts-dejavu, fonts-japanese-gothic, fonts-japanese-mincho, ghostscript Description: WYSIWYG presentation tool for Emacs diff -Nru goby-1.1+0.20140625/debian/copyright goby-1.1+0.20150806/debian/copyright --- goby-1.1+0.20140625/debian/copyright 2014-08-24 09:29:05.000000000 +0000 +++ goby-1.1+0.20150806/debian/copyright 2016-10-23 13:29:03.000000000 +0000 @@ -31,8 +31,8 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Files: debian/* -Copyright: 2009-2014, Tatsuya Kinoshita -License: +Copyright: 2009-2016, Tatsuya Kinoshita +License: permissive-debian Redistribution and use in source and binary forms, with or without modification, are permitted without restriction, with NO WARRANTY. You may regard this as a work that is placed in the public domain. diff -Nru goby-1.1+0.20140625/debian/patches/900_changelog.patch goby-1.1+0.20150806/debian/patches/900_changelog.patch --- goby-1.1+0.20140625/debian/patches/900_changelog.patch 2014-08-24 09:28:25.000000000 +0000 +++ goby-1.1+0.20150806/debian/patches/900_changelog.patch 2016-10-23 14:53:23.000000000 +0000 @@ -6,10 +6,14 @@ diff --git a/ChangeLog b/ChangeLog new file mode 100644 -index 0000000..9ed435b +index 0000000..da68e22 --- /dev/null +++ b/ChangeLog -@@ -0,0 +1,68 @@ +@@ -0,0 +1,72 @@ ++2015-08-06 Kazu Yamamoto ++ ++ * goby-emacs.el, goby.el: ad-hoc adjustment for Mac. ++ +2014-06-25 Kazu Yamamoto + + * goby-emacs.el, goby-vars.el: removing goby-view-adjust. @@ -31,7 +35,7 @@ + +2012-01-28 Jonas Bernoulli + -+ * goby.el: follow header conventions ++ * goby.el: follow header conventions. + +2011-06-29 Kazu Yamamoto + diff -Nru goby-1.1+0.20140625/goby.el goby-1.1+0.20150806/goby.el --- goby-1.1+0.20140625/goby.el 2014-06-25 03:37:52.000000000 +0000 +++ goby-1.1+0.20150806/goby.el 2015-08-06 05:50:53.000000000 +0000 @@ -252,6 +252,8 @@ (let ((ret (* (goby-get-pixel-height ratio) goby-emacs-pixel-base))) ;; Mac is 72dpi, Windows is 96dpi (if (eq window-system 'w32) (setq ret (* (/ ret 4) 3))) + ;; FIXME: very ad-hoc adjustment + (if (eq window-system 'mac) (setq ret (* (/ ret 10) 9))) ret)) (defun goby-make-face (family-num ratio color-num) diff -Nru goby-1.1+0.20140625/goby-emacs.el goby-1.1+0.20150806/goby-emacs.el --- goby-1.1+0.20140625/goby-emacs.el 2014-06-25 03:37:52.000000000 +0000 +++ goby-1.1+0.20150806/goby-emacs.el 2015-08-06 05:50:53.000000000 +0000 @@ -144,6 +144,7 @@ (defvar goby-old-fringe-face nil) (defvar goby-old-modeline-face nil) (defvar goby-old-menu-bar-lines nil) +(defvar goby-old-width nil) (defun goby-decorate-view-frame (height) ;; Emacs does not allow the cursor to have the same color as the @@ -153,6 +154,8 @@ (setq x-pointer-shape goby-view-pointer-shape)) (setq goby-old-menu-bar-lines (frame-parameter (selected-frame) 'menu-bar-lines)) + (setq goby-old-width + (frame-parameter (selected-frame) 'width)) (modify-frame-parameters (selected-frame) `((cursor-type . nil) @@ -160,12 +163,10 @@ (vertical-scroll-bars . nil) (menu-bar-lines . 0) (tool-bar-lines . 0) - (mouse-color . ,goby-view-pointer-color) - (fullscreen . fullscreen) - (top . (+ ,goby-window-manager-view-top-position)) - (left . (+ ,goby-window-manager-view-left-position)) - (height . ,(+ height goby-window-manager-bottom-margin)) - )) + (mouse-color . ,goby-view-pointer-color))) + (modify-frame-parameters + (selected-frame) + `((fullscreen . fullscreen))) (if (fboundp 'ns-fullscreen-toggle) (ns-fullscreen-toggle)) (if (fboundp 'ns-toggle-fullscreen) (ns-toggle-fullscreen)) (goby-x-window-manager '(1 "_NET_WM_STATE_FULLSCREEN" 0)) @@ -190,15 +191,14 @@ (if (fboundp 'ns-fullscreen-toggle) (ns-fullscreen-toggle)) (modify-frame-parameters (selected-frame) + `((fullscreen . nil))) + (modify-frame-parameters + (selected-frame) `((cursor-type . box) (name . ,goby-frame) (vertical-scroll-bars . ,goby-vertical-scroll-bars) (menu-bar-lines . ,goby-old-menu-bar-lines) - (mouse-color . ,goby-pointer-color) - (height . ,height) - (fullscreen . nil) - (top . (+ ,goby-window-manager-top-position)) - (left . (+ ,goby-window-manager-left-position)))) + (mouse-color . ,goby-pointer-color))) (setq goby-old-menu-bar-lines nil) (goby-x-window-manager '(0 "_NET_WM_STATE_FULLSCREEN" 0)) (cond @@ -213,7 +213,12 @@ (copy-face 'goby-old-fringe-face 'fringe))) (copy-face 'goby-old-modeline-face 'mode-line) (setq goby-old-fringe-face nil) - (setq goby-old-modeline-face nil)) + (setq goby-old-modeline-face nil) + ;; very ad-hoc fix + (sit-for 2) + (modify-frame-parameters + (selected-frame) + `((width . ,goby-old-width)))) (provide 'goby-emacs)