Author: fabbione Date: 2004-10-22 01:29:02 -0500 (Fri, 22 Oct 2004) New Revision: 80
Added: xorg-lib-xau/trunk/debian/libxau-dev.install xorg-lib-xau/trunk/debian/libxau-dev.lintian xorg-lib-xau/trunk/debian/libxau6.install xorg-lib-xau/trunk/debian/libxau6.lintian xorg-lib-xau/trunk/debian/patches/008_fix_xgetpw_macro.diff xorg-lib-xau/trunk/debian/patches/915_debian_fix_Imakefiles.diff Modified: xorg-lib-xau/trunk/debian/CHANGESETS xorg-lib-xau/trunk/debian/MANIFEST.any xorg-lib-xau/trunk/debian/changelog xorg-lib-xau/trunk/debian/control xorg-lib-xau/trunk/debian/rules Log: * Import initial debian/* files Modified: xorg-lib-xau/trunk/debian/CHANGESETS =================================================================== --- xorg-lib-xau/trunk/debian/CHANGESETS 2004-10-22 06:18:02 UTC (rev 79) +++ xorg-lib-xau/trunk/debian/CHANGESETS 2004-10-22 06:29:02 UTC (rev 80) @@ -9,6 +9,6 @@ files anywhere.) * Import initial debian/* files + 80 - vim:set ai et sts=4 sw=4 tw=80: Property changes on: xorg-lib-xau/trunk/debian/CHANGESETS ___________________________________________________________________ Name: svn:keywords + Id Modified: xorg-lib-xau/trunk/debian/MANIFEST.any =================================================================== --- xorg-lib-xau/trunk/debian/MANIFEST.any 2004-10-22 06:18:02 UTC (rev 79) +++ xorg-lib-xau/trunk/debian/MANIFEST.any 2004-10-22 06:29:02 UTC (rev 80) @@ -0,0 +1,5 @@ +usr/X11R6/include/X11/Xauth.h +usr/X11R6/lib/libXau.a +usr/X11R6/lib/libXau.so.6.0 +usr/share/lintian/overrides/libxau6 +usr/share/lintian/overrides/libxau-dev Modified: xorg-lib-xau/trunk/debian/changelog =================================================================== --- xorg-lib-xau/trunk/debian/changelog 2004-10-22 06:18:02 UTC (rev 79) +++ xorg-lib-xau/trunk/debian/changelog 2004-10-22 06:29:02 UTC (rev 80) @@ -1,4 +1,4 @@ [EMAIL PROTECTED]@ (6.8.1-0+SVN) unstable; urgency=low +xorg-lib-xau (6.8.1-0+SVN) unstable; urgency=low * First release. Property changes on: xorg-lib-xau/trunk/debian/changelog ___________________________________________________________________ Name: svn:keywords + Id Modified: xorg-lib-xau/trunk/debian/control =================================================================== --- xorg-lib-xau/trunk/debian/control 2004-10-22 06:18:02 UTC (rev 79) +++ xorg-lib-xau/trunk/debian/control 2004-10-22 06:29:02 UTC (rev 80) @@ -1,12 +1,19 @@ -Source: [EMAIL PROTECTED]@ +Source: xorg-lib-xau Section: x11 Priority: optional Maintainer: Debian X Strike Force <[email protected]> Uploaders: Branden Robinson <[EMAIL PROTECTED]>, Fabio M. Di Nitto <[EMAIL PROTECTED]> Standards-Version: 3.6.1 -Build-Depends-Indep: dpkg (>= 1.7.0), dbs, debhelper (>= 4.1.16), xutils-devel (>= 6.8.1-0+SVN) +Build-Depends: dpkg (>= 1.7.0), dbs, debhelper (>= 4.1.16), xutils-devel (>= 6.8.1-0+SVN), xorg-source-lib-xau (>= 6.8.1-0+SVN), xorg-source-include (>= 6.8.1-0+SVN) -Package: @FOO@ -Architecture: all|any -Description: @BAR@ - @BAZ@ +Package: libxau6 +Architecture: any +Depends: ${shlibs:Depends} +Description: X.org libxau6 files + BAZ + +Package: libxau-dev +Architecture: any +Depends: libxau6 (= ${Source-Version}) +Description: X.org libxau6 development files + BAZ devel. Added: xorg-lib-xau/trunk/debian/libxau-dev.install =================================================================== --- xorg-lib-xau/trunk/debian/libxau-dev.install 2004-10-22 06:18:02 UTC (rev 79) +++ xorg-lib-xau/trunk/debian/libxau-dev.install 2004-10-22 06:29:02 UTC (rev 80) @@ -0,0 +1,4 @@ +usr/X11R6/include/X11/Xauth.h +usr/X11R6/lib/libXau.a +usr/X11R6/lib/libXau.so +usr/share/lintian/overrides/libxau-dev Added: xorg-lib-xau/trunk/debian/libxau-dev.lintian =================================================================== --- xorg-lib-xau/trunk/debian/libxau-dev.lintian 2004-10-22 06:18:02 UTC (rev 79) +++ xorg-lib-xau/trunk/debian/libxau-dev.lintian 2004-10-22 06:29:02 UTC (rev 80) @@ -0,0 +1,4 @@ +# lintian doesn't know that we ARE a X Windows System as per +# http://www.debian.org/doc/debian-policy/ch-customized-programs.html#s11.8.7 + +libxau-dev: packages-installs-file-to-usr-x11r6 Added: xorg-lib-xau/trunk/debian/libxau6.install =================================================================== --- xorg-lib-xau/trunk/debian/libxau6.install 2004-10-22 06:18:02 UTC (rev 79) +++ xorg-lib-xau/trunk/debian/libxau6.install 2004-10-22 06:29:02 UTC (rev 80) @@ -0,0 +1,3 @@ +usr/X11R6/lib/libXau.so.6.0 +usr/X11R6/lib/libXau.so.6 +usr/share/lintian/overrides/libxau6 Added: xorg-lib-xau/trunk/debian/libxau6.lintian =================================================================== --- xorg-lib-xau/trunk/debian/libxau6.lintian 2004-10-22 06:18:02 UTC (rev 79) +++ xorg-lib-xau/trunk/debian/libxau6.lintian 2004-10-22 06:29:02 UTC (rev 80) @@ -0,0 +1,4 @@ +# lintian doesn't know that we ARE a X Windows System as per +# http://www.debian.org/doc/debian-policy/ch-customized-programs.html#s11.8.7 + +libxau6: packages-installs-file-to-usr-x11r6 Added: xorg-lib-xau/trunk/debian/patches/008_fix_xgetpw_macro.diff =================================================================== --- xorg-lib-xau/trunk/debian/patches/008_fix_xgetpw_macro.diff 2004-10-22 06:18:02 UTC (rev 79) +++ xorg-lib-xau/trunk/debian/patches/008_fix_xgetpw_macro.diff 2004-10-22 06:29:02 UTC (rev 80) @@ -0,0 +1,90 @@ +$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 */ Property changes on: xorg-lib-xau/trunk/debian/patches/008_fix_xgetpw_macro.diff ___________________________________________________________________ Name: svn:keywords + Id Added: xorg-lib-xau/trunk/debian/patches/915_debian_fix_Imakefiles.diff =================================================================== --- xorg-lib-xau/trunk/debian/patches/915_debian_fix_Imakefiles.diff 2004-10-22 06:18:02 UTC (rev 79) +++ xorg-lib-xau/trunk/debian/patches/915_debian_fix_Imakefiles.diff 2004-10-22 06:29:02 UTC (rev 80) @@ -0,0 +1,19 @@ +$Id$ + +This patch will collect all the bits required to fix up the changes +introduced by splitting the tree. + +Patch by Fabio M. Di Nitto. + +diff -ruN xc-old/lib/Xau/Imakefile xc/lib/Xau/Imakefile +--- xc-old/lib/Xau/Imakefile 2004-04-23 18:43:36.000000000 +0000 ++++ xc/lib/Xau/Imakefile 2004-10-22 05:36:04.685022704 +0000 +@@ -28,6 +28,8 @@ + INCLUDES = + #endif + ++INCLUDES = -I$(TOP)/include ++ + HEADERS = \ + Xauth.h + Property changes on: xorg-lib-xau/trunk/debian/patches/915_debian_fix_Imakefiles.diff ___________________________________________________________________ Name: svn:keywords + Id Modified: xorg-lib-xau/trunk/debian/rules =================================================================== --- xorg-lib-xau/trunk/debian/rules 2004-10-22 06:18:02 UTC (rev 79) +++ xorg-lib-xau/trunk/debian/rules 2004-10-22 06:29:02 UTC (rev 80) @@ -3,7 +3,7 @@ # 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: rules 54 2004-10-19 08:45:53Z fabbione $ +# $Id$ # debhelper export DH_OPTIONS @@ -16,7 +16,7 @@ SOURCE_TREE=build-tree/xc SOURCE_DIR=build-tree [EMAIL PROTECTED]@ +PROJECT_DIR=lib/Xau # dpkg-arch rules ifeq (,$(DEB_BUILD_GNU_TYPE)) @@ -31,7 +31,7 @@ dh_testdir abspath=`pwd` && \ cd $(SOURCE_TREE)/$(PROJECT_DIR) && \ - imake -I/usr/X11R6/lib/X11/config -DTOPDIR=$$abspath/$(SOURCE_TREE) -DCURDIR=$$abspath/$(SOURCE_TREE)/$(PROJECT_DIR) -DUseInstalled && \ + imake -I/usr/X11R6/lib/X11/config -DTOPDIR=$$abspath/$(SOURCE_TREE) -DCURDIR=$$abspath/$(SOURCE_TREE)/$(PROJECT_DIR) -DUseInstalled -DSharedLibXau='YES' && \ $(MAKE) Makefiles touch $@ @@ -39,7 +39,7 @@ $(STAMP_DIR)/build: patch-audit symlinks configure dh_testdir cd $(SOURCE_TREE)/$(PROJECT_DIR) && \ - $(MAKE) + $(MAKE) depend all touch $@ install: $(STAMP_DIR)/install @@ -50,8 +50,9 @@ cd $(SOURCE_TREE)/$(PROJECT_DIR) && \ $(MAKE) install install.man DESTDIR=$$abspath/debian/tmp # Install lintian override. - #install -d -m 755 debian/tmp/usr/share/lintian/overrides/ - #install -m 644 debian/@[EMAIL PROTECTED] debian/tmp/usr/share/lintian/overrides/@FOO@ + install -d -m 755 debian/tmp/usr/share/lintian/overrides/ + install -m 644 debian/libxau6.lintian debian/tmp/usr/share/lintian/overrides/libxau6 + install -m 644 debian/libxau-dev.lintian debian/tmp/usr/share/lintian/overrides/libxau-dev touch $@ binary-arch: check-manifest @@ -63,6 +64,7 @@ dh_compress -a dh_fixperms -a dh_installdeb -a + dh_makeshlibs -a dh_shlibdeps -a dh_gencontrol -a dh_md5sums -a @@ -70,15 +72,6 @@ binary-indep: check-manifest dh_testdir - dh_install --sourcedir=debian/tmp - dh_installchangelogs -i - dh_installdocs -i - dh_compress -i - dh_fixperms -i - dh_installdeb -i - dh_gencontrol -i - dh_md5sums -i - dh_builddeb -i binary: binary-arch binary-indep Property changes on: xorg-lib-xau/trunk/debian/rules ___________________________________________________________________ Name: svn:keywords + Id
