提交: 9823b1f0f6c8efb613d56ee68cb924c90b365d55 - trjp_sawfish (git)

Japanese translation of message catalog for Sawfish Window-Manager

Commit MetaInfo

• 修订版: 9823b1f0f6c8efb613d56ee68cb924c90b365d55 (tree)
• 时间: 2016-08-13 17:20:20
• 作者: Christopher Roy Bratusek <nano@jpbe...>
• Commiter: Christopher Roy Bratusek

Log Message

vanillized debian packaging scripts

更改概述

• delete: debian/00debian.jl
• delete: debian/00menu.jl
• delete: debian/50cursors.jl
• modified: debian/changelog
• modified: debian/control
• delete: debian/defaults.jl
• delete: debian/menu-method
• delete: debian/postrm
• modified: debian/sawfish-data.install.in
• delete: debian/sawfish.dirs
• modified: debian/sawfish.install
• modified: debian/sawfish.postinst
• delete: debian/sawfish.postrm
• delete: debian/site-init.jl

差异

--- a/debian/00debian.jl
+++ /dev/null
@@ -1,2 +0,0 @@
-; load the sawfish defaults
-(require 'sawfish-defaults)

--- a/debian/00menu.jl
+++ /dev/null
@@ -1,4 +0,0 @@
-; load the debian menu
-(require 'debian-menu)
-; install it
-(setq apps-menu debian-menu)

--- a/debian/50cursors.jl
+++ /dev/null
@@ -1,3 +0,0 @@
-; change cursors when moving or resizing a window
-(setq move-cursor-shape 'hand2)   
-(setq resize-cursor-shape 'hand2)

--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+sawfish (3:1.12.0~pre2-1nano) unstable; urgency=low
+
+  * Rebuild with vanillized packaging scripts
+
+ -- Christopher Roy Bratusek <[e-mail]>  Sat, 13 Aug 2016 10:17:33 +0200
+
 sawfish (3:1.12.0~pre1-1nano) unstable; urgency=low
 
   * Rebuild with new packaging scripts

--- a/debian/control
+++ b/debian/control
@@ -31,9 +31,6 @@ Depends: x-terminal-emulator | gnome-terminal,
          sawfish-data (= ${source:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
-Suggests: gnome-control-center,
-          menu,
-          yelp
 Provides: x-window-manager
 Replaces: sawfish-lisp-source (<= 0.38-6),
           sawfish2

--- a/debian/defaults.jl
+++ /dev/null
@@ -1,35 +0,0 @@
-;; sawmill-default.jl -- default user startup
-;; $Id: defaults.jl,v 1.19 2000/11/15 21:51:02 jsh Exp $
-
-;; Copyright (C) 1999 John Harper <[e-mail]>
-
-;; This file is part of sawmill.
-
-;; sawmill is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; sawmill is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with sawmill; see the file COPYING.  If not, write to
-;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-
-;; Commentary:
-
-;; This file provides defaults for users without .sawmillrc files
-
-(declare (in-module user))
-
-;; magic comment to get an alias installed
-;; (define-structure-alias sawmill-defaults sawfish.wm.defaults)
-
-;; this is probably good for novice users?
-(require 'sawfish.wm.ext.window-history)
-
-;; save errors to aid debugging
-(require 'sawfish.wm.ext.error-handler)

--- a/debian/menu-method
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/usr/bin/install-menu
-
-!include menu.h
-compat="menu-2";
-outputencoding="UTF-8";
-outputlanguage="C";
-
-userprefix=".sawfish/lisp";
-rootprefix="/var/lib/sawfish";
-genmenu="debian-menu.jl";
-rootsection="Debian";
-
-function label($arg)=tolower(replacewith($arg,"/ ","--"));
-function q($arg)=esc($arg,"\"\\");
-
-supported;
-	x11="	'(\"" q(title()) "\" (system \"exec " q($command) " &\"))" ifneq(entryindex(), sub(entrycount(), "1"), "\n");
-	text="	'(\"" q(title()) "\" (system \"exec " q(term()) " &\"))" ifneq(entryindex(), sub(entrycount(), "1"), "\n");
-	wm="	'(\"" q(title()) "\" (progn (setq saved-command-line-args '(\"" q($command) "\")) (restart)))" ifneq(entryindex(), sub(entrycount(), "1"), "\n");
-endsupported;
-
-preoutput=";; This is -*-Lisp-*-\n;; Automagically generated file.  Do not edit (see /usr/doc/menu/html/index.html)\n\n(provide 'debian-menu)\n\n";
-
-startmenu="(defvar " label($section)"-menu\n	(list\n";
-endmenu="))\n";
-submenutitle="	'(\"" translate("",title()) "\" . " label($section) "-menu)" ifneq(entryindex(), sub(entrycount(), "1"), "\n");
-sort=tolower(translate("",title()))

--- a/debian/postrm
+++ /dev/null
@@ -1,10 +0,0 @@
-#! /bin/sh -e
-
-if [ "$1" = purge ]; then
-    rm -rf /etc/X11/sawfish 2>/dev/null || true
-    rm -rf /var/lib/sawfish 2>/dev/null || true
-fi
-
-#DEBHELPER#
-
-exit 0

--- a/debian/sawfish-data.install.in
+++ b/debian/sawfish-data.install.in
@@ -1,5 +1,4 @@
 debian/README.themes usr/share/sawfish/themes
-debian/site-init.jl usr/share/sawfish/site-lisp
 usr/share/applications/sawfish-config.desktop
 usr/share/locale
 usr/share/sawfish/lisp/sawfish/wm/autoload.jl

--- a/debian/sawfish.dirs
+++ /dev/null
@@ -1 +0,0 @@
-var/lib/sawfish

--- a/debian/sawfish.install
+++ b/debian/sawfish.install
@@ -1,6 +1,3 @@
-debian/00debian.jl  etc/X11/sawfish/site-init.d
-debian/00menu.jl    etc/X11/sawfish/site-init.d
-debian/50cursors.jl etc/X11/sawfish/site-init.d
 sawfish.el   usr/share/emacs/site-lisp/sawfish
 usr/bin/sawfish
 usr/bin/sawfish-about

--- a/debian/sawfish.postinst
+++ b/debian/sawfish.postinst
@@ -4,24 +4,6 @@ set -e
 
 if [ "$1" = "configure" ]; then
 
-# Move old conffiles in < 0.37.2-2
-  if [ -e /etc/X11/sawfish/defaults.jl ]; then
-    mv /etc/X11/sawfish/defaults.jl /etc/X11/sawfish/site-init.d/00debian.jl
-  fi
-  if [ -e /etc/X11/sawfish/menu.jl ]; then
-    mv /etc/X11/sawfish/menu.jl /etc/X11/sawfish/site-init.d/00menu.jl
-  fi
-
-# Remove old conffiles in < 0.38-1
-	rm /etc/X11/sawfish/site-init.d/defaults.jl 2>/dev/null || true
-	rm /etc/X11/sawfish/site-init.d/menu.jl 2>/dev/null || true
-
-# Be sure to remove this old file
-	rm /etc/X11/sawfish/site-init.jl 2>/dev/null || true
-
-# Remove old generated menu file in /etc
-	rm /etc/X11/sawfish/debian-menu.jl 2>/dev/null || true
-
 # Touch all jlc files
   find /usr/share/sawfish/lisp -name *.jlc | xargs touch
 

--- a/debian/sawfish.postrm
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /bin/sh
-
-set -e
-
-if [ "$1" = purge ]; then
-    rm -rf /etc/X11/sawfish 2>/dev/null || true
-    rm -rf /var/lib/sawfish 2>/dev/null || true
-fi
-
-#DEBHELPER#
-
-exit 0

--- a/debian/site-init.jl
+++ /dev/null
@@ -1,10 +0,0 @@
-(setq load-path (nconc load-path (list "/var/lib/sawfish")))
-(let*
-    ((dir "/etc/X11/sawfish/site-init.d")
-     (files (and (file-directory-p dir) (directory-files dir))))
-  (mapc
-    (lambda (file)
-      (condition-case data
-          (load (expand-file-name file dir) t t t)
-        (error (error-handler-function (car data) (cdr data)))))
-    (sort files)))