xcursor-themes: Changes to 'debian-unstable'
.gitignore | 79 +++++-
ChangeLog | 650 ++++++--------------------------------------------
Makefile.am | 12
configure.ac | 20 -
debian/changelog | 10
debian/control | 4
handhelds/.gitignore | 4
redglass/.gitignore | 6
whiteglass/.gitignore | 6
9 files changed, 199 insertions(+), 592 deletions(-)
New commits:
commit 40e13846226eca34fb2c429cb0b465efe3c04600
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 19 15:55:39 2010 +0100
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index fbf08f9..36d5159 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xcursor-themes (1.0.3-1) UNRELEASED; urgency=low
+xcursor-themes (1.0.3-1) unstable; urgency=low
[ Julien Cristau ]
* Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
@@ -9,7 +9,7 @@ xcursor-themes (1.0.3-1) UNRELEASED; urgency=low
* Bump xutils-dev build-dep for new macros.
* Add myself to Uploaders.
- -- Cyril Brulebois <kibi@debian.org> Fri, 19 Nov 2010 15:48:28 +0100
+ -- Cyril Brulebois <kibi@debian.org> Fri, 19 Nov 2010 15:52:43 +0100
xcursor-themes (1.0.2-1) unstable; urgency=low
commit 6bc167068c5bde3e610a9f027a47e528133b1612
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 19 15:52:39 2010 +0100
Add myself to Uploaders.
diff --git a/debian/changelog b/debian/changelog
index 95bbf4b..fbf08f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ xcursor-themes (1.0.3-1) UNRELEASED; urgency=low
[ Cyril Brulebois ]
* New upstream release.
* Bump xutils-dev build-dep for new macros.
+ * Add myself to Uploaders.
-- Cyril Brulebois <kibi@debian.org> Fri, 19 Nov 2010 15:48:28 +0100
diff --git a/debian/control b/debian/control
index f6ab88a..8247b50 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xcursor-themes
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>
+Uploaders: David Nusinow <dnusinow@debian.org>, Cyril Brulebois <kibi@debian.org>
Build-Depends:
debhelper (>= 7.0.0),
pkg-config,
commit cc173c5cc212cc26671f4249ead1d60a44b0c64e
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 19 15:50:23 2010 +0100
Bump xutils-dev build-dep for new macros.
diff --git a/debian/changelog b/debian/changelog
index 233c2e0..95bbf4b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ xcursor-themes (1.0.3-1) UNRELEASED; urgency=low
[ Cyril Brulebois ]
* New upstream release.
+ * Bump xutils-dev build-dep for new macros.
-- Cyril Brulebois <kibi@debian.org> Fri, 19 Nov 2010 15:48:28 +0100
diff --git a/debian/control b/debian/control
index a3cb13e..f6ab88a 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends:
x11-apps | xcursorgen,
libxcursor-dev,
automake,
- xutils-dev (>= 1:7.4+4),
+ xutils-dev (>= 1:7.5~1),
Standards-Version: 3.8.3.0
Package: xcursor-themes
commit d63c40c8a72d69d97d280ddc0b007a2326236860
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 19 15:48:45 2010 +0100
Update changelogs.
diff --git a/ChangeLog b/ChangeLog
index 14b8ed4..a69d4cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,362 +1,131 @@
-commit 4378257a8d2375d4e1d69e72b04b7fdff12021ee
-Merge: 444f6a1 a0209fb
-Author: Timo Aaltonen <tjaalton@cc.hut.fi>
-Date: Tue Jan 5 11:02:56 2010 +0200
+commit 287d4bac2826de32365afcb2cbe0ec24abd2eecd
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Oct 30 08:57:22 2010 -0700
- Merge commit 'xcursor-themes-1.0.2' into debian-unstable
-
-commit 444f6a1b504fd59ebffa1d02f9642214f3f5f324
-Merge: a556cc6 2a1b455
-Author: Timo Aaltonen <tjaalton@cc.hut.fi>
-Date: Tue Jan 5 10:41:52 2010 +0200
-
- Merge branch 'debian-unstable' of ../../xsfbs into debian-unstable
-
-commit 2a1b4553fc2c5ba982e8bb8be4c504e28ce79ed1
-Author: Julien Cristau <jcristau@debian.org>
-Date: Fri Sep 25 16:39:23 2009 +0200
-
- xsfbs.mk: remove more obsolete code
+ xcursor-themes 1.0.3
- We can use plain debconf-updatepo, and don't need to clean the 'imports'
- directory or shlibs.local.
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-commit 9a4314c976e0d22e8d47f5d86163791e407a6ecc
-Author: Julien Cristau <jcristau@debian.org>
-Date: Fri Sep 25 15:43:28 2009 +0200
+commit fd7401bab073b95c2e8d4d45569f03afffda8ee2
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sat Oct 30 08:54:40 2010 -0700
- xsfbs.mk: kill obsolete DEFAULT_DCRESOLUTIONS and SOURCE_DIR usage
+ config: update AC_PREREQ statement to 2.60
- These variables aren't set anywhere.
-
-commit bda208ec00d0b7b3632f57fb27e014684cdf73ba
-Author: Julien Cristau <jcristau@debian.org>
-Date: Fri Sep 25 15:33:39 2009 +0200
-
- xsfbs.sh: fix typo and remove svn keyword
-
-commit a0209fb0eb221bc72af78f238ad69372d3b2a8d2
-Author: Alan Coopersmith <alan.coopersmith@sun.com>
-Date: Thu Sep 24 17:12:31 2009 -0700
-
- xcursor-themes 1.0.2
+ 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.
- Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
-
-commit f682dfcb3c5ef0051c96f4116d85fd54999b8fbc
-Author: Alan Coopersmith <alan.coopersmith@sun.com>
-Date: Thu Sep 24 17:16:00 2009 -0700
-
- Fill in COPYING and README
+ ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
- Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-commit 5bc5c8c768c80cf7ca8c09f6a1a0f2f4f5dfa0ae
-Author: Alan Coopersmith <alan.coopersmith@sun.com>
-Date: Thu Sep 24 17:10:10 2009 -0700
+commit 2c8a072222d0cbb7ccf63470af76738b33f1b11f
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Fri Jan 1 13:33:12 2010 -0500
- Remove unnecessary configure steps, since no C code is compiled here
+ configure: use "$PKG_CONFIG" rather than hard coded "pkg-config"
- Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
-commit a556cc6392ae6dc9b82ce639429cc6ceae98d87d
-Author: David Nusinow <dnusinow@debian.org>
-Date: Thu Sep 3 20:14:21 2009 -0400
+commit 1eabbd976f21f5922e4a2c125c6ed51ebf936763
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sat Dec 19 17:35:07 2009 -0500
- Put dh_clean -k back where it belongs but use dh_prep instead
-
-commit 57a6ba607341cc9c205b18dab259967f00518c6f
-Author: David Nusinow <dnusinow@debian.org>
-Date: Wed Aug 26 23:27:09 2009 -0400
-
- Update xsfbs to 5693792171d885769e58dcccc053c08b11acd12a
-
-commit dc8d4a045d7828c8b20c58a552102e4a530c824a
-Merge: ae793fb 5693792
-Author: David Nusinow <dnusinow@debian.org>
-Date: Wed Aug 26 23:27:06 2009 -0400
-
- Merge xsfbs in to debian-unstable
+ configure.ac: use backticks rather than $() for cmd subs
- Merge commit 'xsfbs/debian-unstable' into debian-unstable
-
-commit 5693792171d885769e58dcccc053c08b11acd12a
-Author: Julien Cristau <jcristau@debian.org>
-Date: Wed Aug 26 18:53:36 2009 +0200
-
- xsfbs.mk: no need for shlibs.local
-
-commit 1f858adff1ce2687cf542dd9b69b81137412f8a4
-Author: Julien Cristau <jcristau@debian.org>
-Date: Wed Aug 26 18:47:09 2009 +0200
-
- xsfbs.sh: remove unused reject_whitespace function
-
-commit 0dd71e12416aa7dc60ed68af8127e04609b125f4
-Author: Julien Cristau <jcristau@debian.org>
-Date: Wed Aug 26 18:23:53 2009 +0200
-
- xsfbs.sh: remove unused find_culprits function
-
-commit b6c6eceec66066ebac16c85cc75bfa8a4f6cf58a
-Author: Julien Cristau <jcristau@debian.org>
-Date: Wed Aug 26 18:23:06 2009 +0200
-
- xsfbs.sh: remove unused maplink function
-
-commit 8eb3d6a5ce9964876e48ea56048f1a5135ef4f28
-Author: Julien Cristau <jcristau@debian.org>
-Date: Wed Aug 26 18:21:34 2009 +0200
-
- xsfbs.sh: remove unused analyze_path
-
-commit 1d0081bdf60944d8ef0935a531dfbcc5f01739c5
-Author: Julien Cristau <jcristau@debian.org>
-Date: Wed Aug 26 18:20:11 2009 +0200
-
- xsfbs.sh: remove unused check_symlinks_and_{bomb,warn}
-
-commit ae793fbc07b96952274c685d340754e19f265d48
-Author: David Nusinow <dnusinow@debian.org>
-Date: Wed Aug 19 21:13:04 2009 -0400
-
- Prepare changelog for upload
-
-commit 8dcd05eaee07ce9ef5203f1e7d864d4c6645aa9f
-Author: David Nusinow <dnusinow@debian.org>
-Date: Wed Aug 19 20:45:14 2009 -0400
-
- Remove dh_clean -k and add a dh_prep in configure target
-
-commit 8c503e6a0ee401b547bfa9d962b8ac1a1da577ae
-Author: David Nusinow <dnusinow@debian.org>
-Date: Wed Aug 19 20:42:45 2009 -0400
-
- Fix the copyright notice to point to the right place
-
-commit a1a4ab3d9a18a39bf986ccbbf6e9019fc3fb7ce5
-Author: David Nusinow <dnusinow@debian.org>
-Date: Wed Aug 19 20:40:55 2009 -0400
-
- Bump debhelper compat to 7. No changes needed.
-
-commit 79aab781011a7f50cd92a4e4cdcde2740a01a1df
-Author: David Nusinow <dnusinow@debian.org>
-Date: Wed Aug 19 20:39:12 2009 -0400
-
- autoreconf at build time. Add automake to build-deps.
-
-commit 4c289884e217eb1c0fe53006b7fe0ed22b3eb4f1
-Author: David Nusinow <dnusinow@debian.org>
-Date: Wed Aug 19 20:25:47 2009 -0400
-
- Add a watch file
-
-commit 92100cb80bf708f227a672e9b10c84667c4e8b80
-Author: David Nusinow <dnusinow@debian.org>
-Date: Wed Aug 19 20:17:57 2009 -0400
-
- Bump standards version to 3.8.3.0
-
-commit 1ade60447fd3b27a8c9c8fdd158906b4fca760b7
-Author: David Nusinow <dnusinow@debian.org>
-Date: Wed Aug 19 20:17:08 2009 -0400
-
- Add support for parallel make
-
-commit 98f4422d532e54548a33ab91999a9d54ef62ea0b
-Author: David Nusinow <dnusinow@debian.org>
-Date: Wed Aug 19 20:06:12 2009 -0400
-
- Remove conflicts and replaces on ancient xlibs-data
-
-commit b1927efbb09134f66ac533c8259d374de4288456
-Author: David Nusinow <dnusinow@debian.org>
-Date: Wed Aug 19 20:03:23 2009 -0400
-
- Remove Branden and Fabio from the Maintainer list
-
-commit 15a0fe5800e86662c9ac89e29866390a62315b6f
-Author: David Nusinow <dnusinow@debian.org>
-Date: Wed Aug 19 20:02:28 2009 -0400
-
- Clean up the package description a little. Closes: #408837
-
-commit 44a95a2757477d0e1cc14791deea72427d66089a
-Author: David Nusinow <dnusinow@debian.org>
-Date: Wed Aug 19 19:58:23 2009 -0400
-
- Add README.Debian explaining how to use these cursors
-
-commit 8ec9786aa2a0e8c53a7fa15b9f8b6bfdfd767ada
-Author: David Nusinow <dnusinow@debian.org>
-Date: Wed Aug 19 19:55:49 2009 -0400
-
- Update xsfbs
-
-commit af6600083f823eeb6a9d76610f7f23187471511d
-Merge: 61a8e37 8f72294
-Author: David Nusinow <dnusinow@debian.org>
-Date: Wed Aug 19 19:23:20 2009 -0400
-
- Merge commit 'xsfbs/debian-unstable' into debian-unstable
-
-commit 8f72294ada477f003888b6776883c1dd98289f3f
-Author: Julien Cristau <jcristau@debian.org>
-Date: Wed Jun 3 03:37:37 2009 +0200
-
- Kill custom readlink function
-
- This was needed for very, very old versions of debianutils.
- Closes: #498890
-
-commit 7deebf983f53c505bc25171ab77fdc408f250a6e
-Author: Julien Cristau <jcristau@debian.org>
-Date: Tue May 26 15:58:19 2009 +0200
-
- xsfbs: don't run dpkg --print-installation-architecture
+ Use "$PKG_CONFIG" rather than hard coded "pkg-config"
- This is deprecated in new dpkg, and had no users anyway.
-
-commit 4178d948cd66a938222d0d7c6353ee8d60229e40
-Author: David Nusinow <dnusinow@debian.org>
-Date: Mon May 25 20:08:50 2009 -0400
-
- Add README.source
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
-commit fa6396d6bf68b9a0154089146287245f9ad60a1e
-Author: Julien Cristau <jcristau@debian.org>
-Date: Wed Feb 25 21:31:03 2009 +0100
+commit c43cf46600ae8c93b85d4e3c956864691e55395e
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sun Nov 29 19:31:54 2009 -0500
- xsfbs: repack.sh needs to be executable
-
-commit 2ed171f9f390de4e97141c0016d3ba615e8c943e
-Author: Julien Cristau <jcristau@debian.org>
-Date: Tue Feb 17 17:20:42 2009 +0100
-
- xsfbs.sh: kill {,de}register_x_lib_dir_with_ld_so
+ Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
- libx11's postinst was the only post-sarge user, and it's gone now.
+ Now that the INSTALL file is generated.
+ Allows running make maintainer-clean.
-commit 84b7d5bf7a57cab80ba3696ce95028c2f67ba76d
-Author: Julien Cristau <jcristau@debian.org>
-Date: Sun Feb 1 01:31:31 2009 +0100
+commit 3cc6cb2fe3142b22931e411e3df5d495f3f57ff5
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sun Nov 29 19:29:06 2009 -0500
- xsfbs: add a repack script for uscan
+ INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
- This will automatically prune upstream tarballs
-
-commit c734aa47795aa1bdbcbd01872a8b0d1a99cd4dd4
-Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
-Date: Tue Jan 27 15:37:07 2009 -0200
+ Automake 'foreign' option is specified in configure.ac.
+ Remove from Makefile.am
- Correct make distcheck.
-
-commit 86e7669f5d912824e341ea487a6257ec5433eb90
-Author: Julien Cristau <jcristau@debian.org>
-Date: Thu Jul 17 15:44:45 2008 +0200
+commit b6cb39282a530930672da3c58132a8cabe54a05b
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Oct 28 14:09:09 2009 -0400
- xsfbs.mk: make 'log' a separate target
+ INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
- 'prepare' runs genscripts, and we don't want that in unpatch,
- so create stampdir/log in a separate target, and make unpatch
- depend on that instead of prepare.
+ Add missing INSTALL file. Use standard GNU file on building tarball
+ README may have been updated
+ Remove AUTHORS file as it is empty and no content available yet.
+ Remove NEWS file as it is empty and no content available yet.
-commit 50619e730fcaf422ffa4451468520526b2a830b8
-Author: Julien Cristau <jcristau@debian.org>
-Date: Wed Jul 16 18:42:14 2008 +0200
+commit 9c250e804fbf7042acc1ab972d93f7f9cf2a128c
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Oct 27 15:07:25 2009 -0400
- xsfbs.mk: update the list of releases, and drop some unused code
+ Deploy the new XORG_DEFAULT_OPTIONS #24242
- we haven't had a separate source tree since modularization.
-
-commit 6c29758eb1a2798f6b77516b7a75dc399769d217
-Author: Julien Cristau <jcristau@debian.org>
-Date: Wed Jul 16 18:22:01 2008 +0200
+ This macro aggregate a number of existing macros that sets commmon
+ X.Org components configuration options. It shields the configuration file from
+ future changes.
- xsfbs.mk: more parallel make fixing
+commit 3ece73c962880db4913100211cb9bbe4c02a6b6f
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Mon Oct 26 22:08:40 2009 -0400
-commit 78b3958b14a5298165d8500d711342be1b7b6463
-Author: Julien Cristau <jcristau@debian.org>
-Date: Wed Jul 16 18:22:01 2008 +0200
-
- xsfbs.mk: fix the prepare target for parallel make
-
-commit 4c2fb5aa80a15b5a9a9b51b03c7dc30496a22561
-Author: Brice Goglin <bgoglin@debian.org>
-Date: Sat May 31 13:23:24 2008 +0200
-
- Update xsfbs/quilt patching rules to be compatible with the
- "3.0 (quilt)" source package.
+ Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432
- Thanks to Raphael Hertzog.
- See http://lists.debian.org/debian-x/2008/05/msg01250.html for details.
+ ChangeLog filename is known to Automake and requires no further
+ coding in the makefile.
-commit dcf4204d5328834172df80951a18de014b0f74ef
-Author: Julien Cristau <jcristau@debian.org>
-Date: Fri May 30 12:26:18 2008 +0200
+commit 52f78d845879524d66e733e75ef27fec7898bc6e
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu Oct 22 12:44:09 2009 -0400
- xsfbs.sh: use 'local' now that policy allows it
+ .gitignore: use common defaults with custom section # 24239
- Policy 3.7.3 allows /bin/sh scripts to use 'local'.
+ Using common defaults will reduce errors and maintenance.
+ Only the very small or inexistent custom section need periodic maintenance
+ when the structure of the component changes. Do not edit defaults.
-commit d9066a28b95e1a74e9f6ebac8e71e07fca321cd1
-Author: Julien Cristau <jcristau@debian.org>
-Date: Tue May 20 18:53:28 2008 +0200
+commit a0209fb0eb221bc72af78f238ad69372d3b2a8d2
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Thu Sep 24 17:12:31 2009 -0700
- xsfbs.sh: add remove_conffile_lookup
+ xcursor-themes 1.0.2
- This variant of remove_conffile_prepare looks for the given conffile's
- canonical md5sum in dpkg's status database itself instead of using
- provided values.
-
-commit 9d66b3441b36e5a47ffc288ba21f2fd929e869d0
-Author: Julien Cristau <jcristau@debian.org>
-Date: Fri May 23 11:12:20 2008 +0200
-
- Remove the .pc directory properly
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
-commit c87ea43906787791a87a659c0a9d6312945ffb32
-Author: Julien Cristau <jcristau@debian.org>
-Date: Sun Apr 13 03:12:18 2008 +0200
+commit f682dfcb3c5ef0051c96f4116d85fd54999b8fbc
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Thu Sep 24 17:16:00 2009 -0700
- Remove xsfbs-autoreconf.mk
+ Fill in COPYING and README
- It has never been used, and that doesn't look likely to change.
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
-commit bef8b301bf7649b4156bef2dc26ebf9f7f9244ad
-Author: Julien Cristau <jcristau@debian.org>
-Date: Fri Mar 21 11:53:16 2008 +0100
+commit 5bc5c8c768c80cf7ca8c09f6a1a0f2f4f5dfa0ae
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Thu Sep 24 17:10:10 2009 -0700
- xsfbs.mk: make 'serverabi' depend on 'install'
+ Remove unnecessary configure steps, since no C code is compiled here
- See bug#471193, thanks to Bernhard R. Link <brlink@debian.org>
-
-commit 844199da71f29556be3436fa0fead2f0cc0bfc1b
-Author: David Nusinow <dnusinow@debian.org>
-Date: Tue Jan 8 20:18:49 2008 -0500
-
- Kill the manifest code.
- It served its purpose for the monolith and is now dead.
-
-commit 61a8e37e0bdb8f1834c72f7c000e4a6155e4bbb8
-Merge: 3ffb5cc 575efb7
-Author: Brice Goglin <bgoglin@debian.org>
-Date: Tue Jan 8 00:25:57 2008 +0100
-
- Merge ../../../xsfbs/xsfbs into debian-unstable
-
-commit 3ffb5cc4a19c34593a395a4f50d7f3c5fe8e804d
-Author: Brice Goglin <bgoglin@debian.org>
-Date: Tue Jan 8 00:25:48 2008 +0100
-
- Replace xbase-clients with x11-apps in Build-Depends
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
-commit 4ad1e4775107314499e53cf1541abb94c29747cd
-Author: Brice Goglin <bgoglin@debian.org>
-Date: Tue Jan 8 00:12:44 2008 +0100
+commit c734aa47795aa1bdbcbd01872a8b0d1a99cd4dd4
+Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
+Date: Tue Jan 27 15:37:07 2009 -0200
- Restore the missing 1.0.1-5 changes
+ Correct make distcheck.
commit 423873fb23e4a12a9745d13d8967956db7e5b28e
Author: James Cloos <cloos@jhcloos.com>
@@ -364,64 +133,6 @@ Date: Thu Dec 6 15:51:12 2007 -0500
Add missing PHONY line for automatic ChangeLog generation
-commit 331c032528ba1faebef1d8eaa56db47f533f0426
-Author: David Nusinow <dnusinow@debian.org>
-Date: Sat Sep 22 23:49:11 2007 -0400
-
- Remove make-orig-tar-gz target
-
- This target wasn't kept up to date and was totally broken for the git
- world. The way we use git has made this target pretty well impossible to
- use in any form, so it's been supersceded by a script that is currently
- located at
- http://people.debian.org/~dnusinow/xsf_scripts/git-make-orig-tar-gz
-
-commit 575efb7249d7cf194f07e45db17e601d9c259231
-Author: Brice Goglin <bgoglin@debian.org>
-Date: Wed Aug 29 09:36:00 2007 +0200
-
- Do not call laptop-detect, let the only user call it directly
-
-commit 12a633f722a2ff9677728d1e2ae56767f804232a
-Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
-Date: Thu Jul 12 16:06:22 2007 +0200
-
- Fix "display the output of quilt push/pop".
-
- Fix commit 16d97b30b91da02d5a3edc2b895cbd4a1995f62d to check the
- return value of quilt, not the one of tee.
-
-commit e29b56820909668b062fdba72458ee9483a4ae44
-Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
-Date: Mon Jul 9 21:50:47 2007 +0200
-
- Minor fixes in the patching system.
-
- * Fix debian/rules to not be confused by ~/.quiltrc or QUILT_PATCHES (as in #369920).
- * Display which patches are applied and removed instead of just the first one (for #428090).
-
-commit 16d97b30b91da02d5a3edc2b895cbd4a1995f62d
-Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
-Date: Mon Jul 9 19:06:05 2007 +0200
-
- Fix displaying of patches applied by quilt.
-
- As requested in bug #428090, we silence the output of quilt next
- and display the output of quilt push/pop.
-
-commit 271778bd6338575afa3e4ae7f614f38cdff8e2fb
-Author: Branden Robinson <branden@sisyphus.(none)>
-Date: Thu Apr 12 23:18:32 2007 -0400
-
- Test for existence of debian/patches directory before creating a symlink to it.
-
- This prevents packages that apply no patches from ending up with a broken
- symlink in them.
-
- Remove SVN keyword.
-
- Update copyright notice.
-
commit 3d4f1cbe3f54f0acbecef5c45d8082b631b67ae4
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Apr 10 19:22:15 2007 -0700
@@ -443,197 +154,6 @@ Date: Tue Apr 10 19:06:38 2007 -0700
X.Org Bugzilla #10492 <http://bugs.freedesktop.org/show_bug.cgi?id=10492>
Patch #9402 <http://bugs.freedesktop.org/attachment.cgi?id=9402>
-commit 72811b4cede7275a35d36b44bcb5f431a8aa0133
-Author: Julien Cristau <jcristau@debian.org>
-Date: Fri Mar 2 20:28:15 2007 +0100
-
- Fix copy/paste typo in the input driver provides.
-
-commit 4a943db2564c4f573ce2f5f676a841267e961f16
-Author: David Nusinow <dnusinow@debian.org>
-Date: Thu Mar 1 22:06:04 2007 -0500
-
- Fix one missed bit from the serverabiver -> serverminver rename
-
-commit 1344bb9deda5ba54215d0ec5b164706999236b0b
-Author: David Nusinow <dnusinow@debian.org>
-Date: Wed Feb 28 23:08:17 2007 -0500
-
- Fix typo that prevented the input abi versioning from working.
- Good catch Julien
-
-commit a0c9602f38e9d47d7a76b7b345e7e8bbb29b752f
-Author: David Nusinow <dnusinow@debian.org>
-Date: Tue Feb 27 21:50:20 2007 -0500
-
- Add support for X server input ABI versioning
-
-commit 00fc799ec3107c0c29286b75e780bef82c1fa137
-Author: David Nusinow <dnusinow@debian.org>
-Date: Wed Feb 21 22:47:30 2007 -0500
-
- Fix name of serverminver
-
-commit dacefd5a6bb9f786c78f35358273e3214c7492e9
-Author: David Nusinow <dnusinow@debian.org>
-Date: Wed Feb 21 21:37:52 2007 -0500
-
- Update serverabi generation to also account for driver Provides
-
- * Have the drivers use the file serverminver instead of serverabiver in order
- to generate the versioned dependency on the server. This is clearer
- naming.
- * Use serverabiver to actually store the server's video ABI version. This
- is used to generate the Provides: line for drivers so the server can
- depend on them properly. This goes in to the substvar
- xviddriver:Provides.
-
-commit 9ed8b0c26438b90f187ef7c165d5a76cf8f340eb
-Author: Julien Cristau <jcristau@debian.org>
-Date: Sat Feb 17 16:01:41 2007 +0100
-
- Add new "serverabi" rule to generate drivers dependency on the server.
-
-commit 01103425efee735f1535ae52529a1e713c8c1811
-Merge: 0d319c8 e7a729e
-Author: David Nusinow <dnusinow@debian.org>
-Date: Sun Feb 4 20:51:07 2007 -0500
-
- Merge branch 'upstream-unstable' into debian-unstable
-
-commit 502f9412dcaa6abd23b94372d86824c895cea3b8
-Author: David Nusinow <dnusinow@debian.org>
-Date: Sun Feb 4 20:43:28 2007 -0500
-
- Move the files so they'll be put in debian/xsfbs automatically when pulled
- in to our git repos
-
-commit d5595eaaa4dc5d692ead5d2889513d325142e4db
-Author: David Nusinow <dnusinow@debian.org>
-Date: Tue Aug 22 03:04:13 2006 +0000
-
- Pull patches from ubuntu for ARCHITECTURE, LAPTOP, RECONFIGURE, FIRSTINST, and UPGRADE variables
-
-commit 34afaedccc1aeb05d2c6a3869f51e78b2dd0d210
-Author: David Nusinow <dnusinow@debian.org>
-Date: Fri Jun 9 02:34:26 2006 +0000
-
- Fix for bug #371152. Thanks Joey Hess.
-
-commit f64226c1d9c22e2f6d908bf46e059561748d4418
-Author: Branden Robinson <branden@debian.org>
-Date: Tue Jun 6 18:14:45 2006 +0000
-
- Add high-level documentation to XSFBS shell library, intended to reduce
- user confusion when reading X package maintainer scripts outside the source
- tree.
-
- Update Vim modeline.
-
-commit 64309731c5939687e4492f0d960802d3eeee2ec1
-Author: Branden Robinson <branden@debian.org>
-Date: Tue Jun 6 18:05:40 2006 +0000
-
- Note probable out-of-dateness of maplink() function body.
-
-commit b07ee1042902cef9587a76dcbf1df1ee0bde0770
-Author: Branden Robinson <branden@debian.org>
-Date: Tue Jun 6 18:02:50 2006 +0000
-
- Set svn:keywords property to "Id" (keyword already present).
-
-commit 0d319c8bfed472a421d42bc32f368324ab203ac0
-Author: Steve Langasek <vorlon@debian.org>
-Date: Sun May 21 03:53:41 2006 +0000
-
- change names of all remaining data package directories to , for a more persistent naming scheme
-
-commit ec25f88d34d3e8a108376352e525701a14765a26
-Author: David Nusinow <dnusinow@debian.org>
-Date: Tue Apr 25 01:30:46 2006 +0000
-
- Prepare changelog for upload
-
-commit 57f953673f896f217badf7af2f9e5cb351541ec1
-Author: Steve Langasek <vorlon@debian.org>
-Date: Wed Apr 19 01:27:05 2006 +0000
-
- update for X11R7 paths
-
-commit 99d4f7e905aea9052e8cbfbfcd30b438b53c7e82
-Author: Steve Langasek <vorlon@debian.org>
-Date: Wed Apr 19 00:29:46 2006 +0000
-
- Add back maintainer scripts for managing default theme alternatives.
- Closes: #362766.
-
-commit ec0c858df66155752a48c29883a90fb498550aa2
-Author: Steve Langasek <vorlon@debian.org>
-Date: Wed Apr 19 00:14:00 2006 +0000
-
- copy in old xlibs-data maintainer scripts lost in the R7 shuffle
-
-commit 5ebde025c1c5cb261ff8b458ffb72a928a88797b
-Author: Steve Langasek <vorlon@debian.org>
-Date: Wed Apr 19 00:13:46 2006 +0000
-
- copy in old xlibs-data maintainer scripts lost in the R7 shuffle
-
-commit 5a669d90089e7430c41f3e0d72e672aa2be6cbd8
-Author: David Nusinow <dnusinow@debian.org>
-Date: Sun Apr 16 00:19:59 2006 +0000
-
- Fix the last commit and fix spelling error. Thanks Brice Goglin for the spelling catch.
-
-commit 7770385a76ddfb208fc6b0f5e8b42b42d6b5a5a0
-Author: David Nusinow <dnusinow@debian.org>
-Date: Sat Apr 15 23:53:37 2006 +0000
-
- Make us error out if we call patch and don't have quilt installed
-
-commit 54b855c3d9ad4d00667fe62cb5cc0fbfe95bbb5e
-Author: David Nusinow <dnusinow@debian.org>
-Date: Thu Apr 13 00:40:37 2006 +0000
-
- * Add libxcursor-dev to buld-depends
-
-commit 040cb4abfd2b5c451f39c0535cf99fc740db0f5b
-Author: David Nusinow <dnusinow@debian.org>
-Date: Wed Apr 12 23:47:51 2006 +0000
-
- * Add pkg-config to build-depends. Thanks Daniel Schepler. (closes: #362097)
-
-commit 43c2db2476d959a5837a50b3ee329afc1d1b1f7d
-Author: David Nusinow <dnusinow@debian.org>
-Date: Wed Apr 12 01:17:17 2006 +0000
-
- Move xsfbs back to its rightful place
-
-commit 748a33413b8feb60bb4ce1fa369b1f05ff326143
-Author: David Nusinow <dnusinow@debian.org>
-Date: Wed Apr 5 00:05:09 2006 +0000
-
- Prepare changelogs for upload to unstable
-
-commit 35d318b67ed480d98fbe00d472f3ac5c97dca67d
-Author: David Nusinow <dnusinow@debian.org>
-Date: Thu Feb 16 01:16:40 2006 +0000
-
- * Hack off versioned build-dep on xbase-clients. Thanks Zephenia E. Hull for
- catching this problem.
-
-commit f0137841540859cb1234db40a20b6734c70aa512
-Author: David Nusinow <dnusinow@debian.org>
-Date: Fri Jan 27 03:07:39 2006 +0000
-
- Pull in xsfbs
-
-commit 500d78b70e75924fd81212427a46902553ebeb1c
-Author: David Nusinow <dnusinow@debian.org>
-Date: Fri Jan 27 02:55:05 2006 +0000
-
- Move the data and add packaging for what ubuntu has already packaged
-
commit e7a729e215ffaca3e60e7850ea0e36d75379d1f9
Author: Kevin E Martin <kem@kem.org>
Date: Wed Dec 21 02:29:55 2005 +0000
diff --git a/debian/changelog b/debian/changelog
index d197ebb..233c2e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
-xcursor-themes (1.0.2-2) UNRELEASED; urgency=low
+xcursor-themes (1.0.3-1) UNRELEASED; urgency=low
+ [ Julien Cristau ]
* Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
good reason. Thanks, Colin Watson!
- -- Julien Cristau <jcristau@debian.org> Sat, 16 Jan 2010 16:47:58 +0000
+ [ Cyril Brulebois ]
+ * New upstream release.
+
+ -- Cyril Brulebois <kibi@debian.org> Fri, 19 Nov 2010 15:48:28 +0100
xcursor-themes (1.0.2-1) unstable; urgency=low
commit 287d4bac2826de32365afcb2cbe0ec24abd2eecd
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Oct 30 08:57:22 2010 -0700
xcursor-themes 1.0.3
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index a9db450..e7b937d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,7 @@
AC_PREREQ([2.60])
-AC_INIT(xcursor-themes, [1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xcursor-themes)
+AC_INIT([xcursor-themes], [1.0.3],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+ [xcursor-themes])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit fd7401bab073b95c2e8d4d45569f03afffda8ee2
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sat Oct 30 08:54:40 2010 -0700
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 <memsize@videotron.ca>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index afefa16..a9db450 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_PREREQ([2.57])
+AC_PREREQ([2.60])
AC_INIT(xcursor-themes, [1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xcursor-themes)
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit 2c8a072222d0cbb7ccf63470af76738b33f1b11f
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Fri Jan 1 13:33:12 2010 -0500
configure: use "$PKG_CONFIG" rather than hard coded "pkg-config"
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 797cc5e..afefa16 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@ fi
AC_SUBST([XCURSORGEN])
PKG_CHECK_MODULES(ICONDEFS, xcursor)
-pkg_cursordir=`pkg-config --variable=icondir xcursor`
+pkg_cursordir=`$PKG_CONFIG --variable=icondir xcursor`
AC_ARG_WITH(cursordir,
AC_HELP_STRING([--with-cursordir=<pathname>],
[specify directory for cursor files (default is autodetected)]),
commit 1eabbd976f21f5922e4a2c125c6ed51ebf936763
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sat Dec 19 17:35:07 2009 -0500
configure.ac: use backticks rather than $() for cmd subs
Use "$PKG_CONFIG" rather than hard coded "pkg-config"
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 5967392..797cc5e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@ fi
AC_SUBST([XCURSORGEN])
PKG_CHECK_MODULES(ICONDEFS, xcursor)
-pkg_cursordir=$(pkg-config --variable=icondir xcursor)
+pkg_cursordir=`pkg-config --variable=icondir xcursor`
AC_ARG_WITH(cursordir,
AC_HELP_STRING([--with-cursordir=<pathname>],
[specify directory for cursor files (default is autodetected)]),
commit c43cf46600ae8c93b85d4e3c956864691e55395e
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Nov 29 19:31:54 2009 -0500
Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
Now that the INSTALL file is generated.
Allows running make maintainer-clean.
diff --git a/Makefile.am b/Makefile.am
index 2643130..61a7bc8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,9 +2,8 @@ DISTCHECK_CONFIGURE_FLAGS = --with-cursordir=\$${datadir}/icons
SUBDIRS = handhelds redglass whiteglass
-EXTRA_DIST = genmakefile.sh
-
-dist-hook: ChangeLog INSTALL
+MAINTAINERCLEANFILES = ChangeLog INSTALL
+EXTRA_DIST = genmakefile.sh
.PHONY: ChangeLog INSTALL
@@ -13,3 +12,5 @@ INSTALL:
ChangeLog:
$(CHANGELOG_CMD)
+
+dist-hook: ChangeLog INSTALL
commit 3cc6cb2fe3142b22931e411e3df5d495f3f57ff5
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Nov 29 19:29:06 2009 -0500
INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
Automake 'foreign' option is specified in configure.ac.
Remove from Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 26ab815..2643130 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,8 +4,6 @@ SUBDIRS = handhelds redglass whiteglass
EXTRA_DIST = genmakefile.sh
-AUTOMAKE_OPTIONS = foreign
-
dist-hook: ChangeLog INSTALL
.PHONY: ChangeLog INSTALL
commit b6cb39282a530930672da3c58132a8cabe54a05b
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Oct 28 14:09:09 2009 -0400
INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
Add missing INSTALL file. Use standard GNU file on building tarball
Reply to: