[PATCH 4/6] Use PACKAGE_VERSION as Version for all protos

Yaakov (Cygwin/X) yselkowitz at users.sourceforge.net
Thu Apr 8 12:47:33 PDT 2010


From: Yaakov Selkowitz <yselkowitz at users.sourceforge.net>

Trying to keep individual versions of all protos which don't match the
version of the package with which they are shipped will just cause
confusion.  As the new xproto version will be greater than any split
proto version, existing configure tests will work without any changes.

Signed-off-by: Yaakov Selkowitz <yselkowitz at users.sourceforge.net>
---
 applewmproto/applewmproto.pc.in         |    2 +-
 bigreqsproto/bigreqsproto.pc.in         |    2 +-
 compositeproto/compositeproto.pc.in     |    2 +-
 damageproto/damageproto.pc.in           |    2 +-
 dmxproto/dmxproto.pc.in                 |    2 +-
 dri2proto/dri2proto.pc.in               |    2 +-
 evieproto/evieproto.pc.in               |    2 +-
 fixesproto/fixesproto.pc.in             |    2 +-
 fontsproto/fontsproto.pc.in             |    2 +-
 glproto/glproto.pc.in                   |    2 +-
 inputproto/inputproto.pc.in             |    2 +-
 kbproto/kbproto.pc.in                   |    2 +-
 randrproto/randrproto.pc.in             |    2 +-
 recordproto/recordproto.pc.in           |    2 +-
 renderproto/renderproto.pc.in           |    2 +-
 resourceproto/resourceproto.pc.in       |    2 +-
 scrnsaverproto/scrnsaverproto.pc.in     |    2 +-
 videoproto/videoproto.pc.in             |    2 +-
 windowswmproto/windowswmproto.pc.in     |    2 +-
 xcmiscproto/xcmiscproto.pc.in           |    2 +-
 xextproto/xextproto.pc.in               |    2 +-
 xf86bigfontproto/xf86bigfontproto.pc.in |    2 +-
 xf86dgaproto/xf86dgaproto.pc.in         |    2 +-
 xf86driproto/xf86driproto.pc.in         |    2 +-
 xf86vidmodeproto/xf86vidmodeproto.pc.in |    2 +-
 xineramaproto/xineramaproto.pc.in       |    2 +-
 26 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/applewmproto/applewmproto.pc.in b/applewmproto/applewmproto.pc.in
index abea6b2..6ec1c48 100644
--- a/applewmproto/applewmproto.pc.in
+++ b/applewmproto/applewmproto.pc.in
@@ -5,5 +5,5 @@ includedir=@includedir@
  
 Name: AppleWMProto
 Description: AppleWM extension headers
-Version: @APPLEWMPROTO_VERSION@
+Version: @PACKAGE_VERSION@
 Cflags: -I${includedir}
diff --git a/bigreqsproto/bigreqsproto.pc.in b/bigreqsproto/bigreqsproto.pc.in
index 73ff26a..e3adbfd 100644
--- a/bigreqsproto/bigreqsproto.pc.in
+++ b/bigreqsproto/bigreqsproto.pc.in
@@ -5,5 +5,5 @@ includedir=@includedir@
  
 Name: BigReqsProto
 Description: BigReqs extension headers
-Version: @BIGREQSPROTO_VERSION@
+Version: @PACKAGE_VERSION@
 Cflags: -I${includedir}
diff --git a/compositeproto/compositeproto.pc.in b/compositeproto/compositeproto.pc.in
index 8ec7a92..6348022 100644
--- a/compositeproto/compositeproto.pc.in
+++ b/compositeproto/compositeproto.pc.in
@@ -5,5 +5,5 @@ includedir=@includedir@
 
 Name: CompositeExt
 Description: Composite extension headers
-Version: @COMPOSITEPROTO_VERSION@
+Version: @PACKAGE_VERSION@
 Cflags: -I${includedir}
diff --git a/damageproto/damageproto.pc.in b/damageproto/damageproto.pc.in
index 6cf2dc4..25476b9 100644
--- a/damageproto/damageproto.pc.in
+++ b/damageproto/damageproto.pc.in
@@ -5,5 +5,5 @@ includedir=@includedir@
 
 Name: DamageProto
 Description: Damage extension headers
-Version: @DAMAGEPROTO_VERSION@
+Version: @PACKAGE_VERSION@
 Cflags: -I${includedir}
diff --git a/dmxproto/dmxproto.pc.in b/dmxproto/dmxproto.pc.in
index d50208b..97cd1b8 100644
--- a/dmxproto/dmxproto.pc.in
+++ b/dmxproto/dmxproto.pc.in
@@ -5,5 +5,5 @@ includedir=@includedir@
  
 Name: DMXProto
 Description: DMX extension headers
-Version: @DMXPROTO_VERSION@
+Version: @PACKAGE_VERSION@
 Cflags: -I${includedir}
diff --git a/dri2proto/dri2proto.pc.in b/dri2proto/dri2proto.pc.in
index 387fafb..647416e 100644
--- a/dri2proto/dri2proto.pc.in
+++ b/dri2proto/dri2proto.pc.in
@@ -5,5 +5,5 @@ includedir=@includedir@
  
 Name: DRI2Proto
 Description: DRI2 extension headers
-Version: @DRI2PROTO_VERSION@
+Version: @PACKAGE_VERSION@
 Cflags: -I${includedir}
diff --git a/evieproto/evieproto.pc.in b/evieproto/evieproto.pc.in
index d7214d7..795a1cd 100644
--- a/evieproto/evieproto.pc.in
+++ b/evieproto/evieproto.pc.in
@@ -5,5 +5,5 @@ includedir=@includedir@
  
 Name: EvIEExt
 Description: EvIE extension headers
-Version: @EVIEPROTO_VERSION@
+Version: @PACKAGE_VERSION@
 Cflags: -I${includedir}
diff --git a/fixesproto/fixesproto.pc.in b/fixesproto/fixesproto.pc.in
index 14a16f1..fabce86 100644
--- a/fixesproto/fixesproto.pc.in
+++ b/fixesproto/fixesproto.pc.in
@@ -5,6 +5,6 @@ includedir=@includedir@
 
 Name: FixesProto
 Description: X Fixes extension headers
-Version: @FIXESPROTO_VERSION@
+Version: @PACKAGE_VERSION@
 Cflags: -I${includedir}
 Requires: xextproto >= 7.0.99.1
diff --git a/fontsproto/fontsproto.pc.in b/fontsproto/fontsproto.pc.in
index d4388a7..b7db169 100644
--- a/fontsproto/fontsproto.pc.in
+++ b/fontsproto/fontsproto.pc.in
@@ -5,5 +5,5 @@ includedir=@includedir@
  
 Name: FontsProto
 Description: Fonts extension headers
-Version: @FONTSPROTO_VERSION@
+Version: @PACKAGE_VERSION@
 Cflags: -I${includedir}
diff --git a/glproto/glproto.pc.in b/glproto/glproto.pc.in
index a07c38c..bd275d8 100644
--- a/glproto/glproto.pc.in
+++ b/glproto/glproto.pc.in
@@ -5,5 +5,5 @@ includedir=@includedir@
  
 Name: GLProto
 Description: GL extension headers
-Version: @GLPROTO_VERSION@
+Version: @PACKAGE_VERSION@
 Cflags: -I${includedir}
diff --git a/inputproto/inputproto.pc.in b/inputproto/inputproto.pc.in
index 366382d..c499cda 100644
--- a/inputproto/inputproto.pc.in
+++ b/inputproto/inputproto.pc.in
@@ -5,5 +5,5 @@ includedir=@includedir@
  
 Name: InputProto
 Description: Input extension headers
-Version: @INPUTPROTO_VERSION@
+Version: @PACKAGE_VERSION@
 Cflags: -I${includedir}
diff --git a/kbproto/kbproto.pc.in b/kbproto/kbproto.pc.in
index f24de9a..02a6d44 100644
--- a/kbproto/kbproto.pc.in
+++ b/kbproto/kbproto.pc.in
@@ -5,5 +5,5 @@ includedir=@includedir@
  
 Name: KBProto
 Description: KB extension headers
-Version: @KBPROTO_VERSION@
+Version: @PACKAGE_VERSION@
 Cflags: -I${includedir}
diff --git a/randrproto/randrproto.pc.in b/randrproto/randrproto.pc.in
index cf645f5..d94d353 100644
--- a/randrproto/randrproto.pc.in
+++ b/randrproto/randrproto.pc.in
@@ -5,5 +5,5 @@ includedir=@includedir@
  
 Name: RandrProto
 Description: Randr extension headers
-Version: @RANDRPROTO_VERSION@
+Version: @PACKAGE_VERSION@
 Cflags: -I${includedir}
diff --git a/recordproto/recordproto.pc.in b/recordproto/recordproto.pc.in
index cba91fd..77cd38f 100644
--- a/recordproto/recordproto.pc.in
+++ b/recordproto/recordproto.pc.in
@@ -5,5 +5,5 @@ includedir=@includedir@
  
 Name: RecordProto
 Description: Record extension headers
-Version: @RECORDPROTO_VERSION@
+Version: @PACKAGE_VERSION@
 Cflags: -I${includedir}
diff --git a/renderproto/renderproto.pc.in b/renderproto/renderproto.pc.in
index eb99bf9..17331e9 100644
--- a/renderproto/renderproto.pc.in
+++ b/renderproto/renderproto.pc.in
@@ -5,5 +5,5 @@ includedir=@includedir@
  
 Name: RenderProto
 Description: Render extension headers
-Version: @RENDERPROTO_VERSION@
+Version: @PACKAGE_VERSION@
 Cflags: -I${includedir}
diff --git a/resourceproto/resourceproto.pc.in b/resourceproto/resourceproto.pc.in
index 6a1a50d..2851df1 100644
--- a/resourceproto/resourceproto.pc.in
+++ b/resourceproto/resourceproto.pc.in
@@ -5,5 +5,5 @@ includedir=@includedir@
  
 Name: ResourceProto
 Description: Resource extension headers
-Version: @RESOURCEPROTO_VERSION@
+Version: @PACKAGE_VERSION@
 Cflags: -I${includedir}
diff --git a/scrnsaverproto/scrnsaverproto.pc.in b/scrnsaverproto/scrnsaverproto.pc.in
index b6fbf6a..87f9ddc 100644
--- a/scrnsaverproto/scrnsaverproto.pc.in
+++ b/scrnsaverproto/scrnsaverproto.pc.in
@@ -5,5 +5,5 @@ includedir=@includedir@
  
 Name: ScrnSaverProto
 Description: ScrnSaver extension headers
-Version: @SCRNSAVERPROTO_VERSION@
+Version: @PACKAGE_VERSION@
 Cflags: -I${includedir}
diff --git a/videoproto/videoproto.pc.in b/videoproto/videoproto.pc.in
index 55cbd16..5840540 100644
--- a/videoproto/videoproto.pc.in
+++ b/videoproto/videoproto.pc.in
@@ -5,5 +5,5 @@ includedir=@includedir@
  
 Name: VideoProto
 Description: Video extension headers
-Version: @VIDEOPROTO_VERSION@
+Version: @PACKAGE_VERSION@
 Cflags: -I${includedir}
diff --git a/windowswmproto/windowswmproto.pc.in b/windowswmproto/windowswmproto.pc.in
index cc621aa..09f8a3a 100644
--- a/windowswmproto/windowswmproto.pc.in
+++ b/windowswmproto/windowswmproto.pc.in
@@ -5,5 +5,5 @@ includedir=@includedir@
  
 Name: WindowsWMProto
 Description: WindowsWM extension headers
-Version: @WINDOWSWMPROTO_VERSION@
+Version: @PACKAGE_VERSION@
 Cflags: -I${includedir}
diff --git a/xcmiscproto/xcmiscproto.pc.in b/xcmiscproto/xcmiscproto.pc.in
index 107aad8..86b030a 100644
--- a/xcmiscproto/xcmiscproto.pc.in
+++ b/xcmiscproto/xcmiscproto.pc.in
@@ -5,5 +5,5 @@ includedir=@includedir@
  
 Name: XCMiscProto
 Description: XCMisc extension headers
-Version: @XCMISCPROTO_VERSION@
+Version: @PACKAGE_VERSION@
 Cflags: -I${includedir}
diff --git a/xextproto/xextproto.pc.in b/xextproto/xextproto.pc.in
index 90c2fc4..e85200f 100644
--- a/xextproto/xextproto.pc.in
+++ b/xextproto/xextproto.pc.in
@@ -5,5 +5,5 @@ includedir=@includedir@
  
 Name: XExtProto
 Description: XExt extension headers
-Version: @XEXTPROTO_VERSION@
+Version: @PACKAGE_VERSION@
 Cflags: -I${includedir}
diff --git a/xf86bigfontproto/xf86bigfontproto.pc.in b/xf86bigfontproto/xf86bigfontproto.pc.in
index 14a6793..0db8c18 100644
--- a/xf86bigfontproto/xf86bigfontproto.pc.in
+++ b/xf86bigfontproto/xf86bigfontproto.pc.in
@@ -5,5 +5,5 @@ includedir=@includedir@
  
 Name: XF86BigFontProto
 Description: XF86BigFont extension headers
-Version: @XF86BIGFONTPROTO_VERSION@
+Version: @PACKAGE_VERSION@
 Cflags: -I${includedir}
diff --git a/xf86dgaproto/xf86dgaproto.pc.in b/xf86dgaproto/xf86dgaproto.pc.in
index 2e9a83c..fd1fc6e 100644
--- a/xf86dgaproto/xf86dgaproto.pc.in
+++ b/xf86dgaproto/xf86dgaproto.pc.in
@@ -5,5 +5,5 @@ includedir=@includedir@
  
 Name: XF86DGAProto
 Description: XF86DGA extension headers
-Version: @XF86DGAPROTO_VERSION@
+Version: @PACKAGE_VERSION@
 Cflags: -I${includedir}
diff --git a/xf86driproto/xf86driproto.pc.in b/xf86driproto/xf86driproto.pc.in
index bcaf457..b52f9e3 100644
--- a/xf86driproto/xf86driproto.pc.in
+++ b/xf86driproto/xf86driproto.pc.in
@@ -5,5 +5,5 @@ includedir=@includedir@
  
 Name: XF86DRIProto
 Description: XF86DRI extension headers
-Version: @XF86DRIPROTO_VERSION@
+Version: @PACKAGE_VERSION@
 Cflags: -I${includedir}/X11/dri
diff --git a/xf86vidmodeproto/xf86vidmodeproto.pc.in b/xf86vidmodeproto/xf86vidmodeproto.pc.in
index bb7516c..afbb702 100644
--- a/xf86vidmodeproto/xf86vidmodeproto.pc.in
+++ b/xf86vidmodeproto/xf86vidmodeproto.pc.in
@@ -5,5 +5,5 @@ includedir=@includedir@
  
 Name: XF86VidModeProto
 Description: XF86VidMode extension headers
-Version: @XF86VIDMODEPROTO_VERSION@
+Version: @PACKAGE_VERSION@
 Cflags: -I${includedir}
diff --git a/xineramaproto/xineramaproto.pc.in b/xineramaproto/xineramaproto.pc.in
index ae1a628..8d1074d 100644
--- a/xineramaproto/xineramaproto.pc.in
+++ b/xineramaproto/xineramaproto.pc.in
@@ -5,5 +5,5 @@ includedir=@includedir@
  
 Name: XineramaProto
 Description: Xinerama extension headers
-Version: @XINERAMAPROTO_VERSION@
+Version: @PACKAGE_VERSION@
 Cflags: -I${includedir}
-- 
1.6.6.1



More information about the xorg-devel mailing list