Author: fabbione
Date: 2004-10-22 12:07:55 -0500 (Fri, 22 Oct 2004)
New Revision: 88
Removed:
xorg-lib-xdmcp/trunk/debian/patches/008_fix_xgetpw_macro.diff
Modified:
xorg-lib-xdmcp/trunk/debian/CHANGESETS
xorg-lib-xdmcp/trunk/debian/control
xorg-lib-xdmcp/trunk/debian/rules
Log:
* Sync the package with xorg-config changes:
+ Update Build-Deps:
- Add xorg-dev.
- Remove xutils-devel xorg-source-include.
+ Remove 008_fix_xgetpw_macro.diff.
+ Update debian/rules:
- Remove call to symlinks target.
Modified: xorg-lib-xdmcp/trunk/debian/CHANGESETS
===================================================================
--- xorg-lib-xdmcp/trunk/debian/CHANGESETS 2004-10-22 17:05:58 UTC (rev 87)
+++ xorg-lib-xdmcp/trunk/debian/CHANGESETS 2004-10-22 17:07:55 UTC (rev 88)
@@ -11,4 +11,13 @@
* Import initial debian/* files
83
+* Sync the package with xorg-config changes:
+ + Update Build-Deps:
+ - Add xorg-dev.
+ - Remove xutils-devel xorg-source-include.
+ + Remove 008_fix_xgetpw_macro.diff.
+ + Update debian/rules:
+ - Remove call to symlinks target.
+ 88
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: xorg-lib-xdmcp/trunk/debian/control
===================================================================
--- xorg-lib-xdmcp/trunk/debian/control 2004-10-22 17:05:58 UTC (rev 87)
+++ xorg-lib-xdmcp/trunk/debian/control 2004-10-22 17:07:55 UTC (rev 88)
@@ -4,7 +4,7 @@
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Branden Robinson <[EMAIL PROTECTED]>, Fabio M. Di Nitto <[EMAIL
PROTECTED]>
Standards-Version: 3.6.1
-Build-Depends: dpkg (>= 1.7.0), dbs, debhelper (>= 4.1.16), xutils-devel (>=
6.8.1-0+SVN), xorg-source-lib-xdmcp (>= 6.8.1-0+SVN), xorg-source-include (>=
6.8.1-0+SVN)
+Build-Depends: dpkg (>= 1.7.0), dbs, debhelper (>= 4.1.16), xorg-dev (>=
6.8.1-0+SVN), xorg-source-lib-xdmcp (>= 6.8.1-0+SVN)
Package: libxdmcp6
Architecture: any
Deleted: xorg-lib-xdmcp/trunk/debian/patches/008_fix_xgetpw_macro.diff
===================================================================
--- xorg-lib-xdmcp/trunk/debian/patches/008_fix_xgetpw_macro.diff
2004-10-22 17:05:58 UTC (rev 87)
+++ xorg-lib-xdmcp/trunk/debian/patches/008_fix_xgetpw_macro.diff
2004-10-22 17:07:55 UTC (rev 88)
@@ -1,90 +0,0 @@
-$Id$
-
-Fix the _XGetpwnam macro to be more consistent; this patch by Robert Millan.
-
---- xc/include/Xos_r.h.old 2003-04-11 14:54:50.000000000 +0200
-+++ xc/include/Xos_r.h 2003-04-11 12:56:19.000000000 +0200
-@@ -217,8 +217,8 @@
- *
- * typedef ... _Xgetpwparams;
- *
-- * struct passwd* _XGetpwnam(const char *name, _Xgetpwparams);
-- * struct passwd* _XGetpwuid(uid_t uid, _Xgetpwparams);
-+ * struct passwd* _XGetpwnam(const char *name, _Xgetpwparams, struct **dummy);
-+ * struct passwd* _XGetpwuid(uid_t uid, _Xgetpwparams, struct **dummy);
- */
-
- #if defined(X_INCLUDE_PWD_H) && !defined(_XOS_INCLUDED_PWD_H)
-@@ -238,8 +238,8 @@
- extern struct passwd *getpwuid(), *getpwnam();
- # endif
- typedef int _Xgetpwparams; /* dummy */
--# define _XGetpwuid(u,p) getpwuid((u))
--# define _XGetpwnam(u,p) getpwnam((u))
-+# define _XGetpwuid(u,p,s) getpwuid((u))
-+# define _XGetpwnam(u,p,s) getpwnam((u))
-
- #elif !defined(XOS_USE_MTSAFE_PWDAPI) || defined(XNO_MTSAFE_PWDAPI)
- /* UnixWare 2.0, or other systems with thread support but no _r API. */
-@@ -316,12 +316,12 @@
- ((p).pwp = &(p).pws), \
- 0 )
- #endif
--# define _XGetpwuid(u,p) \
-+# define _XGetpwuid(u,p,s) \
- ( (_Xos_processLock), \
- (((p).pwp = getpwuid((u))) ? _Xpw_copyPasswd(p), 0 : 0), \
- (_Xos_processUnlock), \
- (p).pwp )
--# define _XGetpwnam(u,p) \
-+# define _XGetpwnam(u,p,s) \
- ( (_Xos_processLock), \
- (((p).pwp = getpwnam((u))) ? _Xpw_copyPasswd(p), 0 : 0), \
- (_Xos_processUnlock), \
-@@ -336,21 +336,21 @@
- } _Xgetpwparams;
- # if defined(_POSIX_REENTRANT_FUNCTIONS) || !defined(SVR4) || defined(Lynx)
- # ifndef Lynx
--# define _XGetpwuid(u,p) \
--((getpwuid_r((u),&(p).pws,(p).pwbuf,sizeof((p).pwbuf)) == -1) ? NULL :
&(p).pws)
--# define _XGetpwnam(u,p) \
--((getpwnam_r((u),&(p).pws,(p).pwbuf,sizeof((p).pwbuf)) == -1) ? NULL :
&(p).pws)
-+# define _XGetpwuid(u,p,s) \
-+((getpwuid_r((u),&(p).pws,(p).pwbuf,sizeof((p).pwbuf),(s)) == -1) ? NULL :
&(p).pws)
-+# define _XGetpwnam(u,p,s) \
-+((getpwnam_r((u),&(p).pws,(p).pwbuf,sizeof((p).pwbuf),(s)) == -1) ? NULL :
&(p).pws)
- # else /* Lynx */
--# define _XGetpwuid(u,p) \
--((getpwuid_r(&(p).pws,(u),(p).pwbuf,sizeof((p).pwbuf)) == -1) ? NULL :
&(p).pws)
--# define _XGetpwnam(u,p) \
--((getpwnam_r(&(p).pws,(u),(p).pwbuf,sizeof((p).pwbuf)) == -1) ? NULL :
&(p).pws)
-+# define _XGetpwuid(u,p,s) \
-+((getpwuid_r(&(p).pws,(u),(p).pwbuf,sizeof((p).pwbuf),(s)) == -1) ? NULL :
&(p).pws)
-+# define _XGetpwnam(u,p,s) \
-+((getpwnam_r(&(p).pws,(u),(p).pwbuf,sizeof((p).pwbuf),(s)) == -1) ? NULL :
&(p).pws)
- # endif
- # else /* SVR4 */
--# define _XGetpwuid(u,p) \
--((getpwuid_r((u),&(p).pws,(p).pwbuf,sizeof((p).pwbuf)) == NULL) ? NULL :
&(p).pws)
--# define _XGetpwnam(u,p) \
--((getpwnam_r((u),&(p).pws,(p).pwbuf,sizeof((p).pwbuf)) == NULL) ? NULL :
&(p).pws)
-+# define _XGetpwuid(u,p,s) \
-+((getpwuid_r((u),&(p).pws,(p).pwbuf,sizeof((p).pwbuf),(s)) == NULL) ? NULL :
&(p).pws)
-+# define _XGetpwnam(u,p,s) \
-+((getpwnam_r((u),&(p).pws,(p).pwbuf,sizeof((p).pwbuf),(s)) == NULL) ? NULL :
&(p).pws)
- # endif /* SVR4 */
-
- #else /* _POSIX_THREAD_SAFE_FUNCTIONS */
-@@ -367,10 +367,10 @@
- struct passwd* pwp;
- } _Xgetpwparams;
- typedef int _Xgetpwret;
--# define _XGetpwuid(u,p) \
-+# define _XGetpwuid(u,p,s) \
- ((getpwuid_r((u),&(p).pws,(p).pwbuf,sizeof((p).pwbuf),&(p).pwp) == -1) ? \
- NULL : (p).pwp)
--# define _XGetpwnam(u,p) \
-+# define _XGetpwnam(u,p,s) \
- ((getpwnam_r((u),&(p).pws,(p).pwbuf,sizeof((p).pwbuf),&(p).pwp) == -1) ? \
- NULL : (p).pwp)
- #endif /* X_INCLUDE_PWD_H */
Modified: xorg-lib-xdmcp/trunk/debian/rules
===================================================================
--- xorg-lib-xdmcp/trunk/debian/rules 2004-10-22 17:05:58 UTC (rev 87)
+++ xorg-lib-xdmcp/trunk/debian/rules 2004-10-22 17:07:55 UTC (rev 88)
@@ -36,7 +36,7 @@
touch $@
build: $(STAMP_DIR)/build
-$(STAMP_DIR)/build: patch-audit symlinks configure
+$(STAMP_DIR)/build: patch-audit configure
dh_testdir
cd $(SOURCE_TREE)/$(PROJECT_DIR) && \
$(MAKE)
