X Strike Force XOrg SVN commit: r52 - in xorg-config/trunk/debian: . patches shared
Author: fabbione
Date: 2004-10-18 10:01:41 -0500 (Mon, 18 Oct 2004)
New Revision: 52
Added:
xorg-config/trunk/debian/shared/patch-audit.mk
Modified:
xorg-config/trunk/debian/CHANGESETS
xorg-config/trunk/debian/MANIFEST.any
xorg-config/trunk/debian/patches/004_imake_manpage_handling_overhaul.diff
xorg-config/trunk/debian/patches/099c_support_loadable_external_Xcursor_lib.diff
xorg-config/trunk/debian/patches/600_amd64_support.diff
xorg-config/trunk/debian/patches/842_netbsd_NetBSD.cf_fixes.diff
xorg-config/trunk/debian/patches/900_debian_config.diff
xorg-config/trunk/debian/patches/909_debian_piclib_support.diff
xorg-config/trunk/debian/rules
xorg-config/trunk/debian/xutils-devel.install
xorg-config/trunk/debian/xutils-devel.lintian
Log:
* Add patch-audit target:
+ Add debian/shared/patch-audit.mk.
+ Modify debian/rules to use and shipt patch-audit.mk.
+ Fix several offests and fuzz on previosuly imported patches.
+ Update lintian override.
+ Update xutils-devel.install.
Modified: xorg-config/trunk/debian/CHANGESETS
===================================================================
--- xorg-config/trunk/debian/CHANGESETS 2004-10-18 14:29:56 UTC (rev 51)
+++ xorg-config/trunk/debian/CHANGESETS 2004-10-18 15:01:41 UTC (rev 52)
@@ -83,4 +83,12 @@
+ Add 915_debian_X11R6_and_X11_various_fixups.diff.
51
+* Add patch-audit target:
+ + Add debian/shared/patch-audit.mk.
+ + Modify debian/rules to use and shipt patch-audit.mk.
+ + Fix several offests and fuzz on previosuly imported patches.
+ + Update lintian override.
+ + Update xutils-devel.install.
+ 52
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: xorg-config/trunk/debian/MANIFEST.any
===================================================================
--- xorg-config/trunk/debian/MANIFEST.any 2004-10-18 14:29:56 UTC (rev 51)
+++ xorg-config/trunk/debian/MANIFEST.any 2004-10-18 15:01:41 UTC (rev 52)
@@ -151,3 +151,4 @@
usr/share/xorg/config/xorg.tmpl
usr/share/xorg/dbuild-scripts/arch.mk
usr/share/xorg/dbuild-scripts/check-manifest.mk
+usr/share/xorg/dbuild-scripts/patch-audit.mk
Modified: xorg-config/trunk/debian/patches/004_imake_manpage_handling_overhaul.diff
===================================================================
--- xorg-config/trunk/debian/patches/004_imake_manpage_handling_overhaul.diff 2004-10-18 14:29:56 UTC (rev 51)
+++ xorg-config/trunk/debian/patches/004_imake_manpage_handling_overhaul.diff 2004-10-18 15:01:41 UTC (rev 52)
@@ -250,7 +250,7 @@
diff -ruN xc-old/config/cf/linux.cf xc/config/cf/linux.cf
--- xc-old/config/cf/linux.cf 2004-10-18 13:15:39.570666000 +0200
+++ xc/config/cf/linux.cf 2004-10-18 13:15:39.634656848 +0200
-@@ -1040,26 +1041,6 @@
+@@ -1043,26 +1044,6 @@
# define ConnectionFlags -DUNIXCONN -DTCPCONN
#endif
Modified: xorg-config/trunk/debian/patches/099c_support_loadable_external_Xcursor_lib.diff
===================================================================
--- xorg-config/trunk/debian/patches/099c_support_loadable_external_Xcursor_lib.diff 2004-10-18 14:29:56 UTC (rev 51)
+++ xorg-config/trunk/debian/patches/099c_support_loadable_external_Xcursor_lib.diff 2004-10-18 15:01:41 UTC (rev 52)
@@ -13,7 +13,7 @@
diff -ruN xc-old/config/cf/linux.cf xc/config/cf/linux.cf
--- xc-old/config/cf/linux.cf 2004-10-18 14:14:34.492276000 +0200
+++ xc/config/cf/linux.cf 2004-10-18 14:15:09.864899352 +0200
-@@ -205,6 +205,8 @@
+@@ -206,6 +206,8 @@
# define HasRenderLibrary YES
# define BuildXcursorLibrary NO
# define HasXcursorLibrary YES
Modified: xorg-config/trunk/debian/patches/600_amd64_support.diff
===================================================================
--- xorg-config/trunk/debian/patches/600_amd64_support.diff 2004-10-18 14:29:56 UTC (rev 51)
+++ xorg-config/trunk/debian/patches/600_amd64_support.diff 2004-10-18 15:01:41 UTC (rev 52)
@@ -19,7 +19,7 @@
diff -ruN xc-old/config/cf/linux.cf xc/config/cf/linux.cf
--- xc-old/config/cf/linux.cf 2004-10-18 14:39:52.737468000 +0200
+++ xc/config/cf/linux.cf 2004-10-18 14:41:57.429512384 +0200
-@@ -617,7 +617,7 @@
+@@ -618,7 +618,7 @@
#define MkdirHierCmd mkdir -p
#ifndef HaveLib64
Modified: xorg-config/trunk/debian/patches/842_netbsd_NetBSD.cf_fixes.diff
===================================================================
--- xorg-config/trunk/debian/patches/842_netbsd_NetBSD.cf_fixes.diff 2004-10-18 14:29:56 UTC (rev 51)
+++ xorg-config/trunk/debian/patches/842_netbsd_NetBSD.cf_fixes.diff 2004-10-18 15:01:41 UTC (rev 52)
@@ -196,7 +196,7 @@
/*
* C library features
*/
-@@ -87,8 +260,12 @@
+@@ -93,8 +266,12 @@
#define HasUsableFileMmap YES
@@ -210,7 +210,7 @@
#define HasShadowPasswd NO
-@@ -194,6 +371,8 @@
+@@ -203,6 +380,8 @@
#if UseElfFormat
#define DlLibrary -rdynamic /* no -ldl yet */
@@ -219,7 +219,7 @@
#else
#define DlLibrary /**/
#endif
-@@ -318,7 +497,11 @@
+@@ -330,7 +509,11 @@
/* NetBSD doesn't have gperf in the base install */
#define DontRebuildGperfOutput YES
@@ -232,7 +232,7 @@
* NetBSD doesn't have perl in default system
* you may override this in host.def if you installed perl from the packages
*/
-@@ -337,7 +520,13 @@
+@@ -349,7 +522,13 @@
/*
* Make & install Features
*/
@@ -246,7 +246,7 @@
#define CompressAllFonts YES
#define GzipFontCompression YES
#define DefaultUserPath /bin:/usr/bin:/usr/pkg/bin:/usr/local/bin:$(BINDIR)
-@@ -441,6 +630,8 @@
+@@ -453,6 +642,8 @@
@@\
.EXEC:
@@ -255,7 +255,7 @@
/*
* Man pages need to be formatted when installed, so override the default
* imake rules.
-@@ -532,6 +723,8 @@
+@@ -544,6 +735,8 @@
@@\
InstallManPageAliasesBase(file,destdir,aliases)
Modified: xorg-config/trunk/debian/patches/900_debian_config.diff
===================================================================
--- xorg-config/trunk/debian/patches/900_debian_config.diff 2004-10-18 14:29:56 UTC (rev 51)
+++ xorg-config/trunk/debian/patches/900_debian_config.diff 2004-10-18 15:01:41 UTC (rev 52)
@@ -1,27 +1,29 @@
-$Id$
+Id: 900_debian_config.diff 51 2004-10-18 14:29:56Z fabbione $
Enable various official-Debian-package-specific settings.
This patch by Branden Robinson.
---- xc/config/cf/NetBSD.cf~ 2004-07-21 02:08:24.000000000 -0500
-+++ xc/config/cf/NetBSD.cf 2004-07-21 02:08:36.000000000 -0500
-@@ -89,13 +89,7 @@
- # define NormalLibGlu YES
- # define FSUseSyslog YES
+diff -ruN xc-old/config/cf/gnu.cf xc/config/cf/gnu.cf
+--- xc-old/config/cf/gnu.cf 2004-10-18 16:44:20.820147000 +0200
++++ xc/config/cf/gnu.cf 2004-10-18 16:44:20.948127864 +0200
+@@ -61,13 +61,7 @@
+ #define NormalLibGlu YES
+ #define FSUseSyslog YES
-/*
- *
- *
- # define DebianMaintainer YES
+ #define DebianMaintainer YES
- *
- *
- */
- # ifdef DebianMaintainer
- # ifndef XFree86CustomVersion
---- xc/config/cf/gnu.cf~ 2004-07-21 01:41:03.000000000 -0500
-+++ xc/config/cf/gnu.cf 2004-07-21 01:41:50.000000000 -0500
+ #ifdef DebianMaintainer
+ # ifndef XFree86CustomVersion
+diff -ruN xc-old/config/cf/gnu-freebsd.cf xc/config/cf/gnu-freebsd.cf
+--- xc-old/config/cf/gnu-freebsd.cf 2004-10-18 16:44:20.834145000 +0200
++++ xc/config/cf/gnu-freebsd.cf 2004-10-18 16:44:20.948127864 +0200
@@ -60,13 +60,7 @@
#define NormalLibGlu YES
#define FSUseSyslog YES
@@ -36,25 +38,27 @@
#ifdef DebianMaintainer
# ifndef XFree86CustomVersion
---- xc/config/cf/gnu-freebsd.cf~ 2004-07-21 01:53:20.000000000 -0500
-+++ xc/config/cf/gnu-freebsd.cf 2004-07-21 01:53:32.000000000 -0500
-@@ -60,13 +60,7 @@
- #define NormalLibGlu YES
- #define FSUseSyslog YES
+diff -ruN xc-old/config/cf/linux.cf xc/config/cf/linux.cf
+--- xc-old/config/cf/linux.cf 2004-10-18 16:44:20.807149000 +0200
++++ xc/config/cf/linux.cf 2004-10-18 16:44:20.950127560 +0200
+@@ -152,13 +152,7 @@
+ # define MiscManSuffix 7x
+ # define MiscManDir $(MANSOURCEPATH)7
-/*
- *
- *
- #define DebianMaintainer YES
+ # define DebianMaintainer YES
- *
- *
- */
- #ifdef DebianMaintainer
- # ifndef XFree86CustomVersion
---- xc/config/cf/linux.cf~ 2003-09-18 12:11:37.000000000 -0500
-+++ xc/config/cf/linux.cf 2003-09-18 12:11:43.000000000 -0500
-@@ -135,13 +135,7 @@
+ # ifdef DebianMaintainer
+ # ifndef XFree86CustomVersion
+diff -ruN xc-old/config/cf/NetBSD.cf xc/config/cf/NetBSD.cf
+--- xc-old/config/cf/NetBSD.cf 2004-10-18 16:44:20.875138000 +0200
++++ xc/config/cf/NetBSD.cf 2004-10-18 16:44:20.948127864 +0200
+@@ -89,13 +89,7 @@
# define NormalLibGlu YES
# define FSUseSyslog YES
Modified: xorg-config/trunk/debian/patches/909_debian_piclib_support.diff
===================================================================
--- xorg-config/trunk/debian/patches/909_debian_piclib_support.diff 2004-10-18 14:29:56 UTC (rev 51)
+++ xorg-config/trunk/debian/patches/909_debian_piclib_support.diff 2004-10-18 15:01:41 UTC (rev 52)
@@ -12,10 +12,10 @@
versions, and then only on architectures where PIC info is not included in
static ("normal") libraries by default.
-diff -urN xc.orig/config/cf/Imake.rules xc/config/cf/Imake.rules
---- xc.orig/config/cf/Imake.rules 2003-06-12 20:08:46.000000000 +0900
-+++ xc/config/cf/Imake.rules 2003-06-12 20:14:17.000000000 +0900
-@@ -2608,6 +2608,20 @@
+diff -ruN xc-old/config/cf/Imake.rules xc/config/cf/Imake.rules
+--- xc-old/config/cf/Imake.rules 2004-10-18 16:45:34.820897000 +0200
++++ xc/config/cf/Imake.rules 2004-10-18 16:45:35.031865424 +0200
+@@ -2722,6 +2722,20 @@
/*
@@ -36,8 +36,9 @@
* SubdirLibraryRule -
*/
#ifndef SubdirLibraryRule
---- xc/config/cf/Library.tmpl~ 2003-06-14 05:23:52.000000000 -0500
-+++ xc/config/cf/Library.tmpl 2003-06-14 05:33:43.000000000 -0500
+diff -ruN xc-old/config/cf/Library.tmpl xc/config/cf/Library.tmpl
+--- xc-old/config/cf/Library.tmpl 2004-05-24 21:06:57.000000000 +0200
++++ xc/config/cf/Library.tmpl 2004-10-18 16:45:35.033865120 +0200
@@ -37,6 +37,14 @@
#define DoExtraLib NO
#endif
@@ -53,7 +54,7 @@
#ifndef HasSharedData
#define HasSharedData NO
#endif
-@@ -53,7 +60,7 @@
+@@ -53,7 +61,7 @@
#endif
#ifndef LibraryCplusplusOptions
@@ -90,7 +91,7 @@
# define LibraryCplusplusCmd CplusplusCmd
@@ -129,7 +137,7 @@
# endif
- # else
+ # else
# ifndef CrossLibraryCplusplusCmd
-# if DoSharedLib && defined(SharedLibraryCplusplusCmd)
+# if (DoSharedLib || DoPicLib) && defined(SharedLibraryCplusplusCmd)
@@ -106,7 +107,7 @@
# define LibraryCplusplusOptions SharedLibraryCplusplusOptions
# else
# define LibraryCplusplusOptions DefaultCplusplusOptions
-@@ -202,14 +210,14 @@
+@@ -204,14 +212,14 @@
# define _NormalObjCplusplusCompile(options) $(_NULLCMD_)
# define _NormalCleanDir() $(_NULLCMD_)
#else
@@ -123,7 +124,7 @@
# define _NormalObjCompile(options) NormalRelocLibObjCompile(options)
# else
# define _NormalObjCompile(options) NormalLibObjCompile(options)
-@@ -219,7 +227,7 @@
+@@ -221,7 +229,7 @@
# endif
#endif
@@ -132,7 +133,7 @@
# define _SharedObjCompile(options) $(_NULLCMD_)
# define _SharedObjCplusplusCompile(options) $(_NULLCMD_)
#else
-@@ -501,6 +509,12 @@
+@@ -517,6 +525,12 @@
InstallLibrary($(LIBNAME)_d,$(USRLIBDIR))
# endif
# endif
Modified: xorg-config/trunk/debian/rules
===================================================================
--- xorg-config/trunk/debian/rules 2004-10-18 14:29:56 UTC (rev 51)
+++ xorg-config/trunk/debian/rules 2004-10-18 15:01:41 UTC (rev 52)
@@ -28,6 +28,9 @@
# Import standard check-manifest.
include debian/shared/check-manifest.mk
+# Import anal patch-audit check.
+include debian/shared/patch-audit.mk
+
configure: $(STAMP_DIR)/configure
$(STAMP_DIR)/configure: $(patched)
dh_testdir
@@ -39,7 +42,7 @@
touch $@
build: $(STAMP_DIR)/build
-$(STAMP_DIR)/build: configure
+$(STAMP_DIR)/build: patch-audit configure
dh_testdir
# bootstrap imake and create version.def
cd $(SOURCE_TREE) && \
@@ -67,6 +70,7 @@
install -d -m 755 debian/tmp/usr/share/xorg/dbuild-scripts/
install -m 644 debian/shared/arch.mk debian/tmp/usr/share/xorg/dbuild-scripts/arch.mk
install -m 644 debian/shared/check-manifest.mk debian/tmp/usr/share/xorg/dbuild-scripts/check-manifest.mk
+ install -m 644 debian/shared/patch-audit.mk debian/tmp/usr/share/xorg/dbuild-scripts/patch-audit.mk
touch $@
binary-arch: check-manifest
Added: xorg-config/trunk/debian/shared/patch-audit.mk
===================================================================
--- xorg-config/trunk/debian/shared/patch-audit.mk 2004-10-18 14:29:56 UTC (rev 51)
+++ xorg-config/trunk/debian/shared/patch-audit.mk 2004-10-18 15:01:41 UTC (rev 52)
@@ -0,0 +1,20 @@
+#!/usr/bin/make -f
+# Original by Fabio M. Di Nitto <fabbione@fabbione.net>
+# Licensed under the GNU General Public License, version 2. See the file
+# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>
+
+# $Id$
+
+# Branden Robinson:
+# "I am more anal than the dbs package maintainer about diffs, it seems."
+
+patch-audit: $(STAMP_DIR)/patch-audit
+$(STAMP_DIR)/patch-audit: $(patched)
+ @if egrep -il 'Hunk.*succeeded at.*(fuzz|offset)' \
+ stampdir/log/patches/*; then \
+ echo "The above patches had fuzz or offsets. Please fix." >&2; \
+ exit 1; \
+ fi
+ touch $@
+
+# vim:set noet ai sts=8 sw=8 tw=0:
Property changes on: xorg-config/trunk/debian/shared/patch-audit.mk
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: xorg-config/trunk/debian/xutils-devel.install
===================================================================
--- xorg-config/trunk/debian/xutils-devel.install 2004-10-18 14:29:56 UTC (rev 51)
+++ xorg-config/trunk/debian/xutils-devel.install 2004-10-18 15:01:41 UTC (rev 52)
@@ -151,3 +151,4 @@
usr/share/xorg/config/xorg.tmpl
usr/share/xorg/dbuild-scripts/arch.mk
usr/share/xorg/dbuild-scripts/check-manifest.mk
+usr/share/xorg/dbuild-scripts/patch-audit.mk
Modified: xorg-config/trunk/debian/xutils-devel.lintian
===================================================================
--- xorg-config/trunk/debian/xutils-devel.lintian 2004-10-18 14:29:56 UTC (rev 51)
+++ xorg-config/trunk/debian/xutils-devel.lintian 2004-10-18 15:01:41 UTC (rev 52)
@@ -3,3 +3,4 @@
xutils-devel: script-not-executable ./usr/share/xorg/dbuild-scripts/arch.mk
xutils-devel: script-not-executable ./usr/share/xorg/dbuild-scripts/check-manifest.mk
+xutils-devel: script-not-executable ./usr/share/xorg/dbuild-scripts/patch-audit.mk
Reply to: