[sawfish] Revert "added debian packaging scripts based on the official ones"



commit 17137946e88094430ef2932c93948d1467af4dc7
Author: Christopher Roy Bratusek <chris nanolx org>
Date:   Tue Oct 27 18:59:23 2009 +0100

    Revert "added debian packaging scripts based on the official ones"
    
    This reverts commit 4c1aa73f9e1662ae7f76d2abb12b1eb272d5f416.

 ChangeLog                          |    2 -
 configure.in                       |    4 -
 debian/README.Debian               |   45 --
 debian/README.sawfish-data         |    5 -
 debian/README.source               |   57 --
 debian/README.themes               |    1 -
 debian/changelog.in                |    5 -
 debian/clean                       |   15 -
 debian/compat                      |    1 -
 debian/control                     |   65 ---
 debian/copyright                   |   44 --
 debian/postinst                    |   18 -
 debian/postrm                      |   10 -
 debian/preinst                     |    9 -
 debian/prerm                       |   11 -
 debian/rules                       |  163 ------
 debian/sawfish-data.info           |    1 -
 debian/sawfish-data.install.in     |    8 -
 debian/sawfish-dbg.links           |    1 -
 debian/sawfish-lisp-source.links   |    1 -
 debian/sawfish-lisp-source.lintian |    1 -
 debian/sawfish.dirs                |    5 -
 debian/sawfish.el                  | 1003 ------------------------------------
 debian/sawfish.emacsen-install     |   41 --
 debian/sawfish.emacsen-remove      |   15 -
 debian/sawfish.emacsen-startup     |   11 -
 debian/sawfish.install             |    9 -
 debian/sawfish.links               |    1 -
 debian/watch                       |    3 -
 src/display.c                      |   20 +-
 30 files changed, 3 insertions(+), 1572 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 127e9b6..6cfb9af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,8 +9,6 @@
 	* scripts/Makefile.in
 	* scripts/sawfish-about.jl.in: switched from custom about-dialog to GtkAboutDialog
 
-	* debian/*: added debian packaging scripts based on the official ones
-
 2009-10-24  Teika kazura <teika lavabit com>
 	* lisp/sawfish/wm/user.jl
 	* man/news.texi: minor news & comment fix.
diff --git a/configure.in b/configure.in
index 3d4f55a..7376a9d 100644
--- a/configure.in
+++ b/configure.in
@@ -338,11 +338,8 @@ if test "x$KDEDIR" = x; then
 	KDEDIR="/usr/share/apps/"
 fi
 
-gitdate=`date +%y%m%d`
-
 dnl Nonstandard exported symbols
 AC_SUBST(version)
-AC_SUBST(gitdate)
 AC_SUBST(subversion)
 AC_SUBST(sawfishdir)
 AC_SUBST(sawfishexecdir)
@@ -406,7 +403,6 @@ scripts/Makefile
 sounds/Makefile
 src/Makefile
 themes/Makefile
-debian/changelog
 ])
 
 AC_OUTPUT
diff --git a/src/display.c b/src/display.c
index e21f35d..cbc509a 100644
--- a/src/display.c
+++ b/src/display.c
@@ -82,23 +82,9 @@ error_handler (Display *dpy, XErrorEvent *ev)
 	if (w != NULL)
 	{
 	    DB(("error_handler (%s)\n", rep_STR(w->name)));
-
+	    
 	    if (!WINDOW_IS_GONE_P (w))
-           {
-               /* don't unmap a window that had send an X_ConfigureWindow request */
-               if(
-                   /*     ev->type == 0 what is the "type" ? but I've seen that type is always 0 */
-                   /*&&*/ ev->error_code==BadWindow /* the window is bad, because it is not configured yet */
-                     &&   ev->request_code==X_ConfigureWindow
-                     &&   ev->minor_code==0 /* X_ConfigureWindow is not in an Xlib extension, so it must be 0 */
-               )
-               {
-                   return 0;
-               } else
-               {
-                   remove_window (w, TRUE, TRUE);
-               }
-           }
+		remove_window (w, TRUE, TRUE);
 
 	    /* so we call emit_pending_destroys () at some point */
 	    rep_mark_input_pending (ConnectionNumber (dpy));
@@ -456,7 +442,7 @@ void
 send_client_message (Window w, Atom a, Time time)
 {
   XClientMessageEvent ev;
-
+  
   ev.type = ClientMessage;
   ev.window = w;
   ev.message_type = xa_wm_protocols;



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]