From eea6c5cf133f6c9fb70097e41bfbfdc1b35183ca Mon Sep 17 00:00:00 2001 From: Aldas Nabazas Date: Tue, 23 Nov 2010 13:59:18 +0100 Subject: [PATCH] xmh: Updated (1.0.1 -> 1.0.2) --- xorg/xmh/xmh-1.0.1-no-bitmap-data.patch | 103 ------------------------ xorg/xmh/xmh.desc | 6 +- 2 files changed, 3 insertions(+), 106 deletions(-) delete mode 100644 xorg/xmh/xmh-1.0.1-no-bitmap-data.patch diff --git a/xorg/xmh/xmh-1.0.1-no-bitmap-data.patch b/xorg/xmh/xmh-1.0.1-no-bitmap-data.patch deleted file mode 100644 index 6dc142939..000000000 --- a/xorg/xmh/xmh-1.0.1-no-bitmap-data.patch +++ /dev/null @@ -1,103 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../xmh/xmh-1.0.1-no-bitmap-data.patch -# Copyright (C) 2010 The OpenSDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - -Do not install bitmap data file (black6, box6) to void shared files with -xbitmaps. - ---- xmh-1.0.1/Makefile.in.orig 2010-07-30 15:53:03.440375496 +0200 -+++ xmh-1.0.1/Makefile.in 2010-07-30 15:57:36.984172088 +0200 -@@ -218,8 +218,6 @@ - # bitmap files - bitmapdir = $(includedir)/X11/bitmaps - --dist_bitmap_DATA = black6 box6 -- - - # - EXTRA_DIST = $(APPDEFAULTFILES:%=%.ad) Xmh.sample $(appman_PRE) -@@ -290,9 +288,9 @@ - CCLD = $(CC) - LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ - DIST_SOURCES = $(xmh_SOURCES) --DATA = $(appdefault_DATA) $(appman_DATA) $(dist_bitmap_DATA) -+DATA = $(appdefault_DATA) $(appman_DATA) - --DIST_COMMON = README $(dist_bitmap_DATA) $(srcdir)/Makefile.in \ -+DIST_COMMON = README $(srcdir)/Makefile.in \ - $(srcdir)/configure AUTHORS COPYING ChangeLog INSTALL \ - Makefile.am NEWS aclocal.m4 compile config.guess config.h.in \ - config.sub configure configure.ac depcomp install-sh missing \ -@@ -867,24 +865,6 @@ - echo " rm -f $(DESTDIR)$(appmandir)/$$f"; \ - rm -f $(DESTDIR)$(appmandir)/$$f; \ - done --dist_bitmapDATA_INSTALL = $(INSTALL_DATA) --install-dist_bitmapDATA: $(dist_bitmap_DATA) -- @$(NORMAL_INSTALL) -- $(mkinstalldirs) $(DESTDIR)$(bitmapdir) -- @list='$(dist_bitmap_DATA)'; for p in $$list; do \ -- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " $(dist_bitmapDATA_INSTALL) $$d$$p $(DESTDIR)$(bitmapdir)/$$f"; \ -- $(dist_bitmapDATA_INSTALL) $$d$$p $(DESTDIR)$(bitmapdir)/$$f; \ -- done -- --uninstall-dist_bitmapDATA: -- @$(NORMAL_UNINSTALL) -- @list='$(dist_bitmap_DATA)'; for p in $$list; do \ -- f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " rm -f $(DESTDIR)$(bitmapdir)/$$f"; \ -- rm -f $(DESTDIR)$(bitmapdir)/$$f; \ -- done - - ETAGS = etags - ETAGSFLAGS = -@@ -1106,8 +1086,7 @@ - - info-am: - --install-data-am: install-appdefaultDATA install-appmanDATA \ -- install-dist_bitmapDATA -+install-data-am: install-appdefaultDATA install-appmanDATA - - install-exec-am: install-binPROGRAMS - -@@ -1137,7 +1116,7 @@ - ps-am: - - uninstall-am: uninstall-appdefaultDATA uninstall-appmanDATA \ -- uninstall-binPROGRAMS uninstall-dist_bitmapDATA \ -+ uninstall-binPROGRAMS \ - uninstall-info-am - - .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ -@@ -1146,14 +1125,14 @@ - distclean-hdr distclean-tags distcleancheck distdir \ - distuninstallcheck dvi dvi-am info info-am install install-am \ - install-appdefaultDATA install-appmanDATA install-binPROGRAMS \ -- install-data install-data-am install-dist_bitmapDATA \ -+ install-data install-data-am \ - install-exec install-exec-am install-info install-info-am \ - install-man install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \ - ps ps-am tags uninstall uninstall-am uninstall-appdefaultDATA \ - uninstall-appmanDATA uninstall-binPROGRAMS \ -- uninstall-dist_bitmapDATA uninstall-info-am -+ uninstall-info-am - - - .ad: diff --git a/xorg/xmh/xmh.desc b/xorg/xmh/xmh.desc index e0b33adcd..4c0618eaf 100644 --- a/xorg/xmh/xmh.desc +++ b/xorg/xmh/xmh.desc @@ -2,7 +2,7 @@ [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] [COPY] Filename: package/.../xmh/xmh.desc -[COPY] Copyright (C) 2006 - 2007 The OpenSDE Project +[COPY] Copyright (C) 2006 - 2010 The OpenSDE Project [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project [COPY] [COPY] More information can be found in the files COPYING and README. @@ -27,9 +27,9 @@ [L] OpenSource [S] Stable -[V] 1.0.1 +[V] 1.0.2 [P] X -----5---9 112.600 [O] . package/*/*/modular-x-conf.in -[D] 3255436973 xmh-1.0.1.tar.bz2 http://xorg.freedesktop.org/releases/individual/app/ +[D] 1507124647 xmh-1.0.2.tar.bz2 http://xorg.freedesktop.org/releases/individual/app/