xbitmaps: Changes to 'upstream-unstable'

2011-01-13 Thread Cyril Brulebois 
 .gitignore   |   77 ---
 Makefile.am  |   16 +---
 configure.ac |   16 
 3 files changed, 87 insertions(+), 22 deletions(-)

New commits:
commit df1dfeaee913f6ce1f82189b90493c14cb011564
Author: Alan Coopersmith 
Date:   Wed Dec 8 22:25:45 2010 -0800

xbitmaps 1.1.1

Signed-off-by: Alan Coopersmith 

diff --git a/configure.ac b/configure.ac
index 57f16a1..a5db801 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to create configure.
 
 # Initialize Autoconf
 AC_PREREQ([2.60])
-AC_INIT([xbitmaps], [1.1.0],
+AC_INIT([xbitmaps], [1.1.1],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xbitmaps])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([config.h])

commit ba8d08a029c82aeb60b8c24fad76de8be288022b
Author: Alan Coopersmith 
Date:   Wed Nov 10 20:12:11 2010 -0800

Install xbitmaps.pc to $(datadir)/pkgconfig instead of $(libdir)

The xbitmaps package consists entirely of X bitmap data files, which
are platform-independent text files containing a C language format
representation of the encoded bitmap image, which are installed to
$(includedir)/X11/bitmaps so that programs can #include them into
their sources at build time.

Signed-off-by: Alan Coopersmith 
Acked-by: Peter Hutterer 

diff --git a/Makefile.am b/Makefile.am
index 9a89bbe..060112d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-pkgconfigdir = $(libdir)/pkgconfig
+pkgconfigdir = $(datadir)/pkgconfig
 pkgconfig_DATA = xbitmaps.pc
 
 MAINTAINERCLEANFILES = ChangeLog INSTALL

commit 5c89f362c67dadd858f3001d5cc79a8cb86e4a3d
Author: Alan Coopersmith 
Date:   Wed Nov 10 20:09:29 2010 -0800

config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS

Regroup AC statements under the Autoconf initialization section.
Regroup AM sttaements under the Automake initialization section.
Add missing AC_CONFIG_SRCDIR

Signed-off-by: Alan Coopersmith 

diff --git a/configure.ac b/configure.ac
index 6eb3019..57f16a1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,16 @@
+dnl Process this file with autoconf to create configure.
+
+# Initialize Autoconf
 AC_PREREQ([2.60])
-AC_INIT(xbitmaps, [1.1.0], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xbitmaps)
+AC_INIT([xbitmaps], [1.1.0],
+[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xbitmaps])
+AC_CONFIG_SRCDIR([Makefile.am])
+AC_CONFIG_HEADERS([config.h])
+
+# Initialize Automake
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 
-AM_CONFIG_HEADER(config.h)
-
 # Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS
 m4_ifndef([XORG_MACROS_VERSION],
  [m4_fatal([must install xorg-macros 1.3 or later before running 
autoconf/autogen])])

commit a908a28058b299390b250db7fccca078fa1f4065
Author: Gaetan Nadon 
Date:   Mon Mar 29 13:24:09 2010 -0400

config: update AC_PREREQ statement to 2.60

Unrelated to the previous patches, the new value simply reflects
the reality that the minimum level for autoconf to configure
all x.org modules is 2.60 dated June 2006.

ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz

Signed-off-by: Gaetan Nadon 

diff --git a/configure.ac b/configure.ac
index d0256e4..6eb3019 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_PREREQ([2.57])
+AC_PREREQ([2.60])
 AC_INIT(xbitmaps, [1.1.0], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xbitmaps)
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE

commit 48e794ca241e9fe29644a1790115b80733a59669
Author: Gaetan Nadon 
Date:   Mon Mar 29 11:37:20 2010 -0400

config: do not clean xbitmaps.pc

This file is part of the configuration and is removed
by running "make distclean"

Signed-off-by: Gaetan Nadon 

diff --git a/Makefile.am b/Makefile.am
index 9609764..9a89bbe 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,6 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = xbitmaps.pc
 
 MAINTAINERCLEANFILES = ChangeLog INSTALL
-CLEANFILES = xbitmaps.pc
 
 bitmapdir = $(includedir)/X11/bitmaps
 

commit be7a40a5fd45c2ad6c3ed1ab87537431613691a0
Author: Gaetan Nadon 
Date:   Mon Mar 29 11:35:30 2010 -0400

config: remove the pkgconfig pc.in file from EXTRA_DIST

Automake always includes it in the tarball.

Signed-off-by: Gaetan Nadon 

diff --git a/Makefile.am b/Makefile.am
index bf91113..9609764 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,6 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = xbitmaps.pc
 
 MAINTAINERCLEANFILES = ChangeLog INSTALL
-EXTRA_DIST = xbitmaps.pc.in
 CLEANFILES = xbitmaps.pc
 
 bitmapdir = $(includedir)/X11/bitmaps

commit 2b5713c691be826ff79617c5e5dfa30614d3cb94
Author: Gaetan Nadon 
Date:   Sun Nov 29 19:33:52 2009 -0500

INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206

xbitmaps: Changes to 'upstream-unstable'

2010-01-04 Thread Julien Cristau 
 .gitignore   |   10 ++
 COPYING  |   58 ++
 ChangeLog|   22 --
 Makefile.am  |   12 
 black6   |4 
 box6 |4 
 configure.ac |   10 ++
 7 files changed, 86 insertions(+), 34 deletions(-)

New commits:
commit 193b9cc84f98af912e15fe7dc8bd16537b6a5f46
Author: Alan Coopersmith 
Date:   Mon Oct 12 22:10:25 2009 -0700

xbitmaps 1.1.0

Signed-off-by: Alan Coopersmith 

diff --git a/configure.ac b/configure.ac
index 5327bb1..2385477 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.57])
-AC_INIT(xbitmaps, [1.0.1], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xbitmaps)
+AC_INIT(xbitmaps, [1.1.0], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xbitmaps)
 AM_INIT_AUTOMAKE([dist-bzip2])
 AM_MAINTAINER_MODE
 

commit 67ff90dc164d24bcc5efd7ae0eabdc674e7d7bda
Author: Alan Coopersmith 
Date:   Mon Oct 12 22:07:50 2009 -0700

Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS

Signed-off-by: Alan Coopersmith 

diff --git a/configure.ac b/configure.ac
index 0716aed..5327bb1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,14 +3,13 @@ AC_INIT(xbitmaps, [1.0.1], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=x
 AM_INIT_AUTOMAKE([dist-bzip2])
 AM_MAINTAINER_MODE
 
-# Require xorg-macros: XORG_CHANGELOG
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or 
later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.2)
-
 AM_CONFIG_HEADER(config.h)
 
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
+# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.3 or later before running 
autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
+XORG_DEFAULT_OPTIONS
 
 AC_OUTPUT([
Makefile

commit 1af293c2c0a1c058313a77074e62633c429d6b72
Author: Alan Coopersmith 
Date:   Mon Oct 12 22:04:01 2009 -0700

Move black6 & box6 bitmaps from xmh module

Signed-off-by: Alan Coopersmith 

diff --git a/Makefile.am b/Makefile.am
index 4c2f01a..bfd436d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,7 +12,9 @@ dist_bitmap_DATA =\
1x1 \
2x2 \
black   \
+   black6  \
boxes   \
+   box6\
calculator  \
cntr_ptr\
cntr_ptrmsk \
diff --git a/black6 b/black6
new file mode 100644
index 000..4e5384e
--- /dev/null
+++ b/black6
@@ -0,0 +1,4 @@
+#define black6_width 6
+#define black6_height 6
+static char black6_bits[] = {
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
diff --git a/box6 b/box6
new file mode 100644
index 000..83ac4a7
--- /dev/null
+++ b/box6
@@ -0,0 +1,4 @@
+#define box6_width 6
+#define box6_height 6
+static char box6_bits[] = {
+   0x3f, 0x21, 0x21, 0x21, 0x21, 0x3f};

commit 234a598e41331bb29c10b77ac747e3009be37d27
Author: Paulo Cesar Pereira de Andrade 
Date:   Tue Jan 27 15:23:52 2009 -0200

Correct make distcheck.

diff --git a/.gitignore b/.gitignore
index 8d7c959..160e62d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,17 @@
+Makefile
 Makefile.in
 aclocal.m4
 autom4te.cache
+config.h
 config.h.in
+config.log
+config.status
 configure
 install-sh
 missing
+stamp-h1
 *~
+xbitmaps-*.tar.*
+xbitmaps.pc
+ChangeLog
+tags
diff --git a/Makefile.am b/Makefile.am
index 293bc51..4c2f01a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -85,6 +85,6 @@ MAINTAINERCLEANFILES = ChangeLog
 .PHONY: ChangeLog
 
 ChangeLog:
-   (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv 
.changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git 
directory not found: installing possibly empty changelog.' >&2)
+   $(CHANGELOG_CMD)
 
 dist-hook: ChangeLog
diff --git a/configure.ac b/configure.ac
index 5d95d99..0716aed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,13 +1,16 @@
-# $XdotOrg: $
-
 AC_PREREQ([2.57])
 AC_INIT(xbitmaps, [1.0.1], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xbitmaps)
 AM_INIT_AUTOMAKE([dist-bzip2])
 AM_MAINTAINER_MODE
 
+# Require xorg-macros: XORG_CHANGELOG
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or 
later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.2)
+
 AM_CONFIG_HEADER(config.h)
 
 XORG_RELEASE_VERSION
+XORG_CHANGELOG
 
 AC_OUTPUT([
Makefile

commit 315699dafe12d8aefe52d230209d07a23ce1dd77
Author: Alan Coopersmith 
Date:   Tue Apr 1 11:21:59 2008 -0700

Create COPYING file from notice in terminal & X11R6.6 release notes

Bitmaps are unchanged from X11R6.6 (and much earlier X11 releases actually),
so this notice should still apply

diff --git a/COPYING b/COPYING
index 7f33cbf..c80ef7d 100644
--- a/COPYING
+++ b/COPYING
@@ -1,12 +1,54 @@
-This is a stub file.  This package has not yet had its complete licensing
-information compiled.  Ple

xbitmaps: Changes to 'upstream-unstable'

2007-02-04 Thread David Nusinow 
New branch 'upstream-unstable' available with the following commits:


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]