- outdated

Changed files:
    gajim-dbus_version.patch -> 1.2
    gajim-makefile.patch -> 1.5
    gajim-remote.patch -> 1.3

diff --git a/gajim-dbus_version.patch b/gajim-dbus_version.patch
deleted file mode 100644 (file)
index 012c750..0000000
--- a/gajim-dbus_version.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN gajim-0.8.1.orig/scripts/gajim-remote.py gajim-0.8.1/scripts/gajim-remote.py
---- gajim-0.8.1.orig/scripts/gajim-remote.py   2005-09-04 11:21:28.417658008 +0200
-+++ gajim-0.8.1/scripts/gajim-remote.py        2005-09-04 11:45:01.257873648 +0200
-@@ -211,7 +211,7 @@
-               except:
-                       self.send_error(_('Session bus is not available.'))
-               
--              if _version[1] >= 30 and _version[1] <= 42:
-+              if _version[1] >= 30:
-                       obj = self.sbus.get_object(SERVICE, OBJ_PATH)
-                       interface = dbus.Interface(obj, INTERFACE)
-               elif _version[1] < 30:

diff --git a/gajim-makefile.patch b/gajim-makefile.patch
deleted file mode 100644 (file)
index bda5913..0000000
--- a/gajim-makefile.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -urN gajim-0.8.orig/Makefile gajim-0.8/Makefile
---- gajim-0.8.orig/Makefile    2005-08-19 12:28:20.699646352 +0200
-+++ gajim-0.8/Makefile 2005-08-19 12:30:10.959884248 +0200
-@@ -3,10 +3,10 @@
- GAJIM_AP      = 0 # do we build Autopackage?
- 
- MODULES               = src src/common po
--PREFIX                = /usr/local
-+PREFIX                = /usr
- DESTDIR               = 
- LIBDIR                = /lib
--MANDIR                = $(DESTDIR)$(PREFIX)/share/man
-+MANDIR                = $(PREFIX)/share/man
- 
- FIND          = find . \( -name '*.glade' -o -name '*.py' -o -name '*.xpm' -o -name '*.gif' -o -name '*.png' -o -name '*.mo' -o -name '*.wav' \)
- 
-@@ -73,9 +73,9 @@
-       cp data/pixmaps/gajim_about.png "$(DESTDIR)$(PREFIX)/share/pixmaps/";
-       mkdir -p "$(DESTDIR)$(PREFIX)/share/applications";
-       cp gajim.desktop "$(DESTDIR)$(PREFIX)/share/applications/";
--      mkdir -p "$(MANDIR)/man1";
--      cp gajim.1 "$(MANDIR)/man1";
--      cp gajim-remote.1 "$(MANDIR)/man1";
-+      mkdir -p "$(DESTDIR)$(MANDIR)/man1";
-+      cp gajim.1 "$(DESTDIR)$(MANDIR)/man1";
-+      cp gajim-remote.1 "$(DESTDIR)$(MANDIR)/man1";
-       mkdir -p "$(DESTDIR)$(PREFIX)$(LIBDIR)/gajim";
-       for f in $(FILES_LIB) ; do \
-               cp "$$f" "$(DESTDIR)$(PREFIX)$(LIBDIR)/gajim/"; \

diff --git a/gajim-remote.patch b/gajim-remote.patch
deleted file mode 100644 (file)
index d993760..0000000
--- a/gajim-remote.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -urN gajim-0.8.1.orig/Makefile gajim-0.8.1/Makefile
---- gajim-0.8.1.orig/Makefile  2005-09-04 12:48:06.972357568 +0200
-+++ gajim-0.8.1/Makefile       2005-09-04 13:08:35.816544856 +0200
-@@ -64,6 +64,7 @@
-                       mkdir -p "$(DESTDIR)$(PREFIX)/share/gajim/$$d"; \
-               fi; \
-       done
-+      mv scripts/gajim-remote.py src
-       for f in $(FILES) ; do \
-               DST=`dirname "$$f"`; \
-               cp "$$f" "$(DESTDIR)$(PREFIX)/share/gajim/$$DST/"; \
-@@ -92,6 +93,7 @@
-               echo "$$F" > "$(DESTDIR)$(PREFIX)/bin/$$BASE"; \
-               chmod +x "$(DESTDIR)$(PREFIX)/bin/$$BASE"; \
-       done
-+      rmdir "$(DESTDIR)$(PREFIX)/share/gajim/scripts"
- 
- #
- # show make params we accept
-diff -urN gajim-0.8.1.orig/scripts/gajim-remote gajim-0.8.1/scripts/gajim-remote
---- gajim-0.8.1.orig/scripts/gajim-remote      2005-09-04 12:48:06.975357112 +0200
-+++ gajim-0.8.1/scripts/gajim-remote   2005-09-04 12:56:51.448625056 +0200
-@@ -22,6 +22,6 @@
-       echo "You must not launch gajim-remote as root, it is INSECURE"
- fi
- 
--cd PREFIX/share/gajim/scripts
-+cd PREFIX/share/gajim/src
- export PYTHONPATH="$PYTHONPATH:PREFIXLIB/gajim"
- python gajim-remote.py $@
-diff -urN gajim-0.8.1.orig/scripts/gajim-remote.py gajim-0.8.1/scripts/gajim-remote.py
---- gajim-0.8.1.orig/scripts/gajim-remote.py   2005-09-04 12:48:06.976356960 +0200
-+++ gajim-0.8.1/scripts/gajim-remote.py        2005-09-04 12:56:38.362614432 +0200
-@@ -32,7 +32,7 @@
- 
- signal.signal(signal.SIGINT, signal.SIG_DFL) # ^C exits the application
- 
--import i18n
-+from common import i18n
- 
- _ = i18n._
- i18n.init()