X Strike Force XOrg SVN commit: r86 - in xorg-lib-fs/trunk/debian: . patches

To: debian-x@lists.debian.org
Subject: X Strike Force XOrg SVN commit: r86 - in xorg-lib-fs/trunk/debian: . patches
From: X Strike Force SVN Repository Admin <branden+svnadmin@deadbeast.net>
Date: Fri, 22 Oct 2004 12:03:11 -0500 (EST)
Message-id: <[🔎] 20041022170311.381775C063@necrotic.deadbeast.net>
Reply-to: debian-x@lists.debian.org

Author: fabbione
Date: 2004-10-22 12:03:09 -0500 (Fri, 22 Oct 2004)
New Revision: 86

Removed:
   xorg-lib-fs/trunk/debian/patches/008_fix_xgetpw_macro.diff
Modified:
   xorg-lib-fs/trunk/debian/CHANGESETS
   xorg-lib-fs/trunk/debian/control
   xorg-lib-fs/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.
    - Create required symlinks.



Modified: xorg-lib-fs/trunk/debian/CHANGESETS
===================================================================
--- xorg-lib-fs/trunk/debian/CHANGESETS	2004-10-22 16:57:24 UTC (rev 85)
+++ xorg-lib-fs/trunk/debian/CHANGESETS	2004-10-22 17:03:09 UTC (rev 86)
@@ -16,4 +16,14 @@
   proper header to the patch.
     77
 
+* 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.
+    - Create required symlinks.
+    86
+
 vim:set ai et sts=4 sw=4 tw=80:

Modified: xorg-lib-fs/trunk/debian/control
===================================================================
--- xorg-lib-fs/trunk/debian/control	2004-10-22 16:57:24 UTC (rev 85)
+++ xorg-lib-fs/trunk/debian/control	2004-10-22 17:03:09 UTC (rev 86)
@@ -4,7 +4,7 @@
 Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
 Uploaders: Branden Robinson <branden@debian.org>, Fabio M. Di Nitto <fabbione@fabbione.net>
 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-fs (>= 6.8.1-0+SVN), xorg-source-lib-xtrans (>= 6.8.1-0+SVN), xorg-source-include (>= 6.8.1-0+SVN), xorg-source-include-fonts (>= 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-fs (>= 6.8.1-0+SVN), xorg-source-lib-xtrans (>= 6.8.1-0+SVN), xorg-source-include-fonts (>= 6.8.1-0+SVN)
 
 Package: libfs6
 Architecture: any

Deleted: xorg-lib-fs/trunk/debian/patches/008_fix_xgetpw_macro.diff
===================================================================
--- xorg-lib-fs/trunk/debian/patches/008_fix_xgetpw_macro.diff	2004-10-22 16:57:24 UTC (rev 85)
+++ xorg-lib-fs/trunk/debian/patches/008_fix_xgetpw_macro.diff	2004-10-22 17:03:09 UTC (rev 86)
@@ -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-fs/trunk/debian/rules
===================================================================
--- xorg-lib-fs/trunk/debian/rules	2004-10-22 16:57:24 UTC (rev 85)
+++ xorg-lib-fs/trunk/debian/rules	2004-10-22 17:03:09 UTC (rev 86)
@@ -33,10 +33,17 @@
 	cd $(SOURCE_TREE)/$(PROJECT_DIR) && \
 	  imake -I/usr/X11R6/lib/X11/config -DTOPDIR=$$abspath/$(SOURCE_TREE) -DCURDIR=$$abspath/$(SOURCE_TREE)/$(PROJECT_DIR) -DUseInstalled && \
 	  $(MAKE) Makefiles
+	if [ -d $(SOURCE_TREE)/include ]; then \
+	  cd $(SOURCE_TREE)/include && \
+	  ln -sf . X11 && \
+	  if [ -e ../lib/xtrans/Xtrans.c ]; then \
+	    ln -sf ../lib/xtrans/Xtrans.h Xtrans.h; \
+	  fi; \
+	fi
 	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) depend all

Reply to:

Prev by Date: X Strike Force XOrg SVN commit: r85 - xorg-doc/trunk/debian
Next by Date: X Strike Force XOrg SVN commit: r87 - in xorg-lib-xau/trunk/debian: . patches
Previous by thread: X Strike Force XOrg SVN commit: r85 - xorg-doc/trunk/debian
Next by thread: X Strike Force XOrg SVN commit: r87 - in xorg-lib-xau/trunk/debian: . patches
Index(es):
- Date
- Thread