X Strike Force X.Org X11 SVN commit: r1181 - in branches/modular/proto: bigreqsproto-X11R7.0-1.0.2/debian compositeproto-X11R7.0-0.2.2/debian damageproto-X11R7.0-1.0.3/debian dmxproto-X11R7.0-2.2.2/debian evieext-X11R7.0-1.0.2/debian fixesproto-X11R7.0-3.0.2/debian fontcacheproto-X11R7.0-0.1.2/debian fontsproto-X11R7.0-2.0.2/debian inputproto-X11R7.0-1.3.2/debian kbproto-X11R7.0-1.0.2/debian randrproto-X11R7.0-1.1.2/debian recordproto-X11R7.0-1.13.2/debian renderproto-X11R7.0-0.9.2/debian resourceproto-X11R7.0-1.0.2/debian scrnsaverproto-X11R7.0-1.0.2/debian trapproto-X11R7.0-3.4.3/debian videoproto-X11R7.0-2.2.2/debian xcmiscproto-X11R7.0-1.1.2/debian xextproto-X11R7.0-7.0.2/debian xf86bigfontproto-X11R7.0-1.1.2/debian xf86dgaproto-X11R7.0-2.0.2/debian xf86driproto-X11R7.0-2.0.3/debian xf86miscproto-X11R7.0-0.9.2/debian xf86vidmodeproto-X11R7.0-2.2.2/debian xineramaproto-X11R7.0-1.1.2/debian xproto-X11R7.0-7.0.4/debian

[X Strike Force SVN Repository Admin <branden+svnadmin@deadbeast.net>]

Author: daenzer
Date: 2006-02-09 11:08:24 -0500 (Thu, 09 Feb 2006)
New Revision: 1181

Modified:
   branches/modular/proto/bigreqsproto-X11R7.0-1.0.2/debian/changelog
   branches/modular/proto/bigreqsproto-X11R7.0-1.0.2/debian/control
   branches/modular/proto/compositeproto-X11R7.0-0.2.2/debian/changelog
   branches/modular/proto/compositeproto-X11R7.0-0.2.2/debian/control
   branches/modular/proto/damageproto-X11R7.0-1.0.3/debian/changelog
   branches/modular/proto/damageproto-X11R7.0-1.0.3/debian/control
   branches/modular/proto/dmxproto-X11R7.0-2.2.2/debian/changelog
   branches/modular/proto/dmxproto-X11R7.0-2.2.2/debian/control
   branches/modular/proto/evieext-X11R7.0-1.0.2/debian/changelog
   branches/modular/proto/evieext-X11R7.0-1.0.2/debian/control
   branches/modular/proto/fixesproto-X11R7.0-3.0.2/debian/changelog
   branches/modular/proto/fixesproto-X11R7.0-3.0.2/debian/control
   branches/modular/proto/fontcacheproto-X11R7.0-0.1.2/debian/changelog
   branches/modular/proto/fontcacheproto-X11R7.0-0.1.2/debian/control
   branches/modular/proto/fontsproto-X11R7.0-2.0.2/debian/changelog
   branches/modular/proto/fontsproto-X11R7.0-2.0.2/debian/control
   branches/modular/proto/inputproto-X11R7.0-1.3.2/debian/changelog
   branches/modular/proto/inputproto-X11R7.0-1.3.2/debian/control
   branches/modular/proto/kbproto-X11R7.0-1.0.2/debian/changelog
   branches/modular/proto/kbproto-X11R7.0-1.0.2/debian/control
   branches/modular/proto/randrproto-X11R7.0-1.1.2/debian/changelog
   branches/modular/proto/randrproto-X11R7.0-1.1.2/debian/control
   branches/modular/proto/recordproto-X11R7.0-1.13.2/debian/changelog
   branches/modular/proto/recordproto-X11R7.0-1.13.2/debian/control
   branches/modular/proto/renderproto-X11R7.0-0.9.2/debian/changelog
   branches/modular/proto/renderproto-X11R7.0-0.9.2/debian/control
   branches/modular/proto/resourceproto-X11R7.0-1.0.2/debian/changelog
   branches/modular/proto/resourceproto-X11R7.0-1.0.2/debian/control
   branches/modular/proto/scrnsaverproto-X11R7.0-1.0.2/debian/changelog
   branches/modular/proto/scrnsaverproto-X11R7.0-1.0.2/debian/control
   branches/modular/proto/trapproto-X11R7.0-3.4.3/debian/changelog
   branches/modular/proto/trapproto-X11R7.0-3.4.3/debian/control
   branches/modular/proto/videoproto-X11R7.0-2.2.2/debian/changelog
   branches/modular/proto/videoproto-X11R7.0-2.2.2/debian/control
   branches/modular/proto/xcmiscproto-X11R7.0-1.1.2/debian/changelog
   branches/modular/proto/xcmiscproto-X11R7.0-1.1.2/debian/control
   branches/modular/proto/xextproto-X11R7.0-7.0.2/debian/changelog
   branches/modular/proto/xextproto-X11R7.0-7.0.2/debian/control
   branches/modular/proto/xf86bigfontproto-X11R7.0-1.1.2/debian/changelog
   branches/modular/proto/xf86bigfontproto-X11R7.0-1.1.2/debian/control
   branches/modular/proto/xf86dgaproto-X11R7.0-2.0.2/debian/changelog
   branches/modular/proto/xf86dgaproto-X11R7.0-2.0.2/debian/control
   branches/modular/proto/xf86driproto-X11R7.0-2.0.3/debian/changelog
   branches/modular/proto/xf86driproto-X11R7.0-2.0.3/debian/control
   branches/modular/proto/xf86miscproto-X11R7.0-0.9.2/debian/changelog
   branches/modular/proto/xf86miscproto-X11R7.0-0.9.2/debian/control
   branches/modular/proto/xf86vidmodeproto-X11R7.0-2.2.2/debian/changelog
   branches/modular/proto/xf86vidmodeproto-X11R7.0-2.2.2/debian/control
   branches/modular/proto/xineramaproto-X11R7.0-1.1.2/debian/changelog
   branches/modular/proto/xineramaproto-X11R7.0-1.1.2/debian/control
   branches/modular/proto/xproto-X11R7.0-7.0.4/debian/changelog
   branches/modular/proto/xproto-X11R7.0-7.0.4/debian/control
Log:
Add epoch to versioned Pre-Depends on x11-common to make upgrades from
monolithic x11-common work.


Modified: branches/modular/proto/bigreqsproto-X11R7.0-1.0.2/debian/changelog
===================================================================
--- branches/modular/proto/bigreqsproto-X11R7.0-1.0.2/debian/changelog	2006-02-09 02:19:18 UTC (rev 1180)
+++ branches/modular/proto/bigreqsproto-X11R7.0-1.0.2/debian/changelog	2006-02-09 16:08:24 UTC (rev 1181)
@@ -1,3 +1,10 @@
+x11proto-bigreqs (1.0.2-2) experimental; urgency=low
+
+  * Add epoch to versioned Pre-Depends on x11-common to make upgrades
+    from monolithic x11-common work (Closes: #351779).
+
+ -- Michel Dänzer <daenzer@debian.org>  Thu,  9 Feb 2006 16:40:54 +0100
+
 x11proto-bigreqs (1.0.2-1) experimental; urgency=low
 
   * First x11proto-bigreqs release to Debian.

Modified: branches/modular/proto/bigreqsproto-X11R7.0-1.0.2/debian/control
===================================================================
--- branches/modular/proto/bigreqsproto-X11R7.0-1.0.2/debian/control	2006-02-09 02:19:18 UTC (rev 1180)
+++ branches/modular/proto/bigreqsproto-X11R7.0-1.0.2/debian/control	2006-02-09 16:08:24 UTC (rev 1181)
@@ -11,7 +11,7 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common
 Conflicts: xlibs-static-dev (<< 6.8.2-16)
 Replaces: xlibs-static-dev (<< 6.8.2-16)
-Pre-Depends: x11-common (>= 1.0)
+Pre-Depends: x11-common (>= 1:1.0)
 Description: X11 Big Requests extension wire protocol
  This package provides the wire protocol for the BIG-REQUESTS extension, used to
  send larger requests than usual in order to avoid fragmentation.

Modified: branches/modular/proto/compositeproto-X11R7.0-0.2.2/debian/changelog
===================================================================
--- branches/modular/proto/compositeproto-X11R7.0-0.2.2/debian/changelog	2006-02-09 02:19:18 UTC (rev 1180)
+++ branches/modular/proto/compositeproto-X11R7.0-0.2.2/debian/changelog	2006-02-09 16:08:24 UTC (rev 1181)
@@ -1,3 +1,10 @@
+x11proto-composite (0.2.2-2) experimental; urgency=low
+
+  * Add epoch to versioned Pre-Depends on x11-common to make upgrades
+    from monolithic x11-common work (Closes: #351779).
+
+ -- Michel Dänzer <daenzer@debian.org>  Thu,  9 Feb 2006 16:40:55 +0100
+
 x11proto-composite (0.2.2-1) experimental; urgency=low
 
   * First release for Debian

Modified: branches/modular/proto/compositeproto-X11R7.0-0.2.2/debian/control
===================================================================
--- branches/modular/proto/compositeproto-X11R7.0-0.2.2/debian/control	2006-02-09 02:19:18 UTC (rev 1180)
+++ branches/modular/proto/compositeproto-X11R7.0-0.2.2/debian/control	2006-02-09 16:08:24 UTC (rev 1181)
@@ -11,7 +11,7 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common, x11proto-core-dev, x11proto-fixes-dev
 Conflicts: libxcomposite-dev (<< 6.8.2-16)
 Replaces: libxcomposite-dev (<< 6.8.2-16)
-Pre-Depends: x11-common (>= 1.0)
+Pre-Depends: x11-common (>= 1:1.0)
 Description: X11 Composite extension wire protocol
  This package provides the wire protocol for the Composite extension, used to
  let arbitrary client programs control drawing of the final image.

Modified: branches/modular/proto/damageproto-X11R7.0-1.0.3/debian/changelog
===================================================================
--- branches/modular/proto/damageproto-X11R7.0-1.0.3/debian/changelog	2006-02-09 02:19:18 UTC (rev 1180)
+++ branches/modular/proto/damageproto-X11R7.0-1.0.3/debian/changelog	2006-02-09 16:08:24 UTC (rev 1181)
@@ -1,3 +1,10 @@
+x11proto-damage (1.0.3-2) experimental; urgency=low
+
+  * Add epoch to versioned Pre-Depends on x11-common to make upgrades
+    from monolithic x11-common work (Closes: #351779).
+
+ -- Michel Dänzer <daenzer@debian.org>  Thu,  9 Feb 2006 16:40:55 +0100
+
 x11proto-damage (1.0.3-1) experimental; urgency=low
 
   * First packaging for Debian

Modified: branches/modular/proto/damageproto-X11R7.0-1.0.3/debian/control
===================================================================
--- branches/modular/proto/damageproto-X11R7.0-1.0.3/debian/control	2006-02-09 02:19:18 UTC (rev 1180)
+++ branches/modular/proto/damageproto-X11R7.0-1.0.3/debian/control	2006-02-09 16:08:24 UTC (rev 1181)
@@ -11,7 +11,7 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common, x11proto-fixes-dev, x11proto-core-dev
 Conflicts: libxdamage-dev (<< 6.8.2-16)
 Replaces: libxdamage-dev (<< 6.8.2-16)
-Pre-Depends: x11-common (>= 1.0)
+Pre-Depends: x11-common (>= 1:1.0)
 Description: X11 Damage extension wire protocol
  This package provides the wire protocol for the Damage extension, used to
  notify clients of changes made to particular areas.

Modified: branches/modular/proto/dmxproto-X11R7.0-2.2.2/debian/changelog
===================================================================
--- branches/modular/proto/dmxproto-X11R7.0-2.2.2/debian/changelog	2006-02-09 02:19:18 UTC (rev 1180)
+++ branches/modular/proto/dmxproto-X11R7.0-2.2.2/debian/changelog	2006-02-09 16:08:24 UTC (rev 1181)
@@ -1,3 +1,10 @@
+x11proto-dmx (2.2.2-2) experimental; urgency=low
+
+  * Add epoch to versioned Pre-Depends on x11-common to make upgrades
+    from monolithic x11-common work (Closes: #351779).
+
+ -- Michel Dänzer <daenzer@debian.org>  Thu,  9 Feb 2006 16:40:56 +0100
+
 x11proto-dmx (2.2.2-1) experimental; urgency=low
 
   * First release to Debian

Modified: branches/modular/proto/dmxproto-X11R7.0-2.2.2/debian/control
===================================================================
--- branches/modular/proto/dmxproto-X11R7.0-2.2.2/debian/control	2006-02-09 02:19:18 UTC (rev 1180)
+++ branches/modular/proto/dmxproto-X11R7.0-2.2.2/debian/control	2006-02-09 16:08:24 UTC (rev 1181)
@@ -11,7 +11,7 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common
 Conflicts: libdmx-dev (<< 6.8.2-16)
 Replaces: libdmx-dev (<< 6.8.2-16)
-Pre-Depends: x11-common (>= 1.0)
+Pre-Depends: x11-common (>= 1:1.0)
 Description: X11 Distributed Multihead X extension wire protocol
  This package provides the wire protocol for the DMX extension, used to set up
  a distributed multi-head environment with a single server acting as a gateway

Modified: branches/modular/proto/evieext-X11R7.0-1.0.2/debian/changelog
===================================================================
--- branches/modular/proto/evieext-X11R7.0-1.0.2/debian/changelog	2006-02-09 02:19:18 UTC (rev 1180)
+++ branches/modular/proto/evieext-X11R7.0-1.0.2/debian/changelog	2006-02-09 16:08:24 UTC (rev 1181)
@@ -1,3 +1,10 @@
+x11proto-evie (1:1.0.2-2) experimental; urgency=low
+
+  * Add epoch to versioned Pre-Depends on x11-common to make upgrades
+    from monolithic x11-common work (Closes: #351779).
+
+ -- Michel Dänzer <daenzer@debian.org>  Thu,  9 Feb 2006 16:40:57 +0100
+
 x11proto-evie (1:1.0.2-1) experimental; urgency=low
 
   * First release to Debian

Modified: branches/modular/proto/evieext-X11R7.0-1.0.2/debian/control
===================================================================
--- branches/modular/proto/evieext-X11R7.0-1.0.2/debian/control	2006-02-09 02:19:18 UTC (rev 1180)
+++ branches/modular/proto/evieext-X11R7.0-1.0.2/debian/control	2006-02-09 16:08:24 UTC (rev 1181)
@@ -11,7 +11,7 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common
 Conflicts: libxevie-dev (<< 6.8.2-16)
 Replaces: libxevie-dev (<< 6.8.2-16)
-Pre-Depends: x11-common (>= 1.0)
+Pre-Depends: x11-common (>= 1:1.0)
 Description: X11 Event Interception extension wire protocol
  This package provides the wire protocol for the EvIE extension, used to
  let arbitrary clients recieve, filter, and potentially modify all events.

Modified: branches/modular/proto/fixesproto-X11R7.0-3.0.2/debian/changelog
===================================================================
--- branches/modular/proto/fixesproto-X11R7.0-3.0.2/debian/changelog	2006-02-09 02:19:18 UTC (rev 1180)
+++ branches/modular/proto/fixesproto-X11R7.0-3.0.2/debian/changelog	2006-02-09 16:08:24 UTC (rev 1181)
@@ -1,3 +1,10 @@
+x11proto-fixes (3.0.2-2) experimental; urgency=low
+
+  * Add epoch to versioned Pre-Depends on x11-common to make upgrades
+    from monolithic x11-common work (Closes: #351779).
+
+ -- Michel Dänzer <daenzer@debian.org>  Thu,  9 Feb 2006 16:40:57 +0100
+
 x11proto-fixes (3.0.2-1) experimental; urgency=low
 
   * Initial upload to Debian

Modified: branches/modular/proto/fixesproto-X11R7.0-3.0.2/debian/control
===================================================================
--- branches/modular/proto/fixesproto-X11R7.0-3.0.2/debian/control	2006-02-09 02:19:18 UTC (rev 1180)
+++ branches/modular/proto/fixesproto-X11R7.0-3.0.2/debian/control	2006-02-09 16:08:24 UTC (rev 1181)
@@ -11,7 +11,7 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common, x11proto-core-dev, x11proto-xext-dev
 Conflicts: libxfixes-dev (<< 6.8.2-16)
 Replaces: libxfixes-dev (<< 6.8.2-16)
-Pre-Depends: x11-common (>= 1.0)
+Pre-Depends: x11-common (>= 1:1.0)
 Description: X11 Fixes extension wire protocol
  This package provides the wire protocol for the Fixes extension, which contains
  a few small extensions to the X protocol, including a Region type.

Modified: branches/modular/proto/fontcacheproto-X11R7.0-0.1.2/debian/changelog
===================================================================
--- branches/modular/proto/fontcacheproto-X11R7.0-0.1.2/debian/changelog	2006-02-09 02:19:18 UTC (rev 1180)
+++ branches/modular/proto/fontcacheproto-X11R7.0-0.1.2/debian/changelog	2006-02-09 16:08:24 UTC (rev 1181)
@@ -1,3 +1,10 @@
+x11proto-fontcache (0.1.2-2) experimental; urgency=low
+
+  * Add epoch to versioned Pre-Depends on x11-common to make upgrades
+    from monolithic x11-common work (Closes: #351779).
+
+ -- Michel Dänzer <daenzer@debian.org>  Thu,  9 Feb 2006 16:40:58 +0100
+
 x11proto-fontcache (0.1.2-1) experimental; urgency=low
 
   * First upload to Debian

Modified: branches/modular/proto/fontcacheproto-X11R7.0-0.1.2/debian/control
===================================================================
--- branches/modular/proto/fontcacheproto-X11R7.0-0.1.2/debian/control	2006-02-09 02:19:18 UTC (rev 1180)
+++ branches/modular/proto/fontcacheproto-X11R7.0-0.1.2/debian/control	2006-02-09 16:08:24 UTC (rev 1181)
@@ -9,7 +9,7 @@
 Package: x11proto-fontcache-dev
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common
-Pre-Depends: x11-common (>= 1.0)
+Pre-Depends: x11-common (>= 1:1.0)
 Description: X11 font cache extension wire protocol
  This package provides the wire protocol for the Fontcache extension, used to
  configure the caching of core fonts.

Modified: branches/modular/proto/fontsproto-X11R7.0-2.0.2/debian/changelog
===================================================================
--- branches/modular/proto/fontsproto-X11R7.0-2.0.2/debian/changelog	2006-02-09 02:19:18 UTC (rev 1180)
+++ branches/modular/proto/fontsproto-X11R7.0-2.0.2/debian/changelog	2006-02-09 16:08:24 UTC (rev 1181)
@@ -1,3 +1,10 @@
+x11proto-fonts (2.0.2-2) experimental; urgency=low
+
+  * Add epoch to versioned Pre-Depends on x11-common to make upgrades
+    from monolithic x11-common work (Closes: #351779).
+
+ -- Michel Dänzer <daenzer@debian.org>  Thu,  9 Feb 2006 16:40:58 +0100
+
 x11proto-fonts (2.0.2-1) experimental; urgency=low
 
   * First upload to Debian

Modified: branches/modular/proto/fontsproto-X11R7.0-2.0.2/debian/control
===================================================================
--- branches/modular/proto/fontsproto-X11R7.0-2.0.2/debian/control	2006-02-09 02:19:18 UTC (rev 1180)
+++ branches/modular/proto/fontsproto-X11R7.0-2.0.2/debian/control	2006-02-09 16:08:24 UTC (rev 1181)
@@ -9,7 +9,7 @@
 Package: x11proto-fonts-dev
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common
-Pre-Depends: x11-common (>= 1.0)
+Pre-Depends: x11-common (>= 1:1.0)
 Conflicts: libfs-dev (<< 6.8.2-16)
 Replaces: libfs-dev (<< 6.8.2-16)
 Description: X11 font extension wire protocol

Modified: branches/modular/proto/inputproto-X11R7.0-1.3.2/debian/changelog
===================================================================
--- branches/modular/proto/inputproto-X11R7.0-1.3.2/debian/changelog	2006-02-09 02:19:18 UTC (rev 1180)
+++ branches/modular/proto/inputproto-X11R7.0-1.3.2/debian/changelog	2006-02-09 16:08:24 UTC (rev 1181)
@@ -1,3 +1,10 @@
+x11proto-input (1.3.2-2) experimental; urgency=low
+
+  * Add epoch to versioned Pre-Depends on x11-common to make upgrades
+    from monolithic x11-common work (Closes: #351779).
+
+ -- Michel Dänzer <daenzer@debian.org>  Thu,  9 Feb 2006 16:40:59 +0100
+
 x11proto-input (1.3.2-1) experimental; urgency=low
 
   * First upload to Debian

Modified: branches/modular/proto/inputproto-X11R7.0-1.3.2/debian/control
===================================================================
--- branches/modular/proto/inputproto-X11R7.0-1.3.2/debian/control	2006-02-09 02:19:18 UTC (rev 1180)
+++ branches/modular/proto/inputproto-X11R7.0-1.3.2/debian/control	2006-02-09 16:08:24 UTC (rev 1181)
@@ -9,7 +9,7 @@
 Package: x11proto-input-dev
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common
-Pre-Depends: x11-common (>= 1.0)
+Pre-Depends: x11-common (>= 1:1.0)
 Conflicts: libxi-dev (<< 6.8.2-16)
 Replaces: libxi-dev (<< 6.8.2-16)
 Description: X11 Input extension wire protocol

Modified: branches/modular/proto/kbproto-X11R7.0-1.0.2/debian/changelog
===================================================================
--- branches/modular/proto/kbproto-X11R7.0-1.0.2/debian/changelog	2006-02-09 02:19:18 UTC (rev 1180)
+++ branches/modular/proto/kbproto-X11R7.0-1.0.2/debian/changelog	2006-02-09 16:08:24 UTC (rev 1181)
@@ -1,3 +1,10 @@
+x11proto-kb (1.0.2-2) experimental; urgency=low
+
+  * Add epoch to versioned Pre-Depends on x11-common to make upgrades
+    from monolithic x11-common work (Closes: #351779).
+
+ -- Michel Dänzer <daenzer@debian.org>  Thu,  9 Feb 2006 16:40:59 +0100
+
 x11proto-kb (1.0.2-1) experimental; urgency=low
 
   * First release to Debian

Modified: branches/modular/proto/kbproto-X11R7.0-1.0.2/debian/control
===================================================================
--- branches/modular/proto/kbproto-X11R7.0-1.0.2/debian/control	2006-02-09 02:19:18 UTC (rev 1180)
+++ branches/modular/proto/kbproto-X11R7.0-1.0.2/debian/control	2006-02-09 16:08:24 UTC (rev 1181)
@@ -9,7 +9,7 @@
 Package: x11proto-kb-dev
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common
-Pre-Depends: x11-common (>= 1.0)
+Pre-Depends: x11-common (>= 1:1.0)
 Conflicts: libxkbfile-dev (<< 6.8.2-20)
 Replaces: libxkbfile-dev (<< 6.8.2-20)
 Description: X11 XKB extension wire protocol

Modified: branches/modular/proto/randrproto-X11R7.0-1.1.2/debian/changelog
===================================================================
--- branches/modular/proto/randrproto-X11R7.0-1.1.2/debian/changelog	2006-02-09 02:19:18 UTC (rev 1180)
+++ branches/modular/proto/randrproto-X11R7.0-1.1.2/debian/changelog	2006-02-09 16:08:24 UTC (rev 1181)
@@ -1,3 +1,10 @@
+x11proto-randr (1.1.2-2) experimental; urgency=low
+
+  * Add epoch to versioned Pre-Depends on x11-common to make upgrades
+    from monolithic x11-common work (Closes: #351779).
+
+ -- Michel Dänzer <daenzer@debian.org>  Thu,  9 Feb 2006 16:41:00 +0100
+
 x11proto-randr (1.1.2-1) experimental; urgency=low
 
   * First upload to Debian

Modified: branches/modular/proto/randrproto-X11R7.0-1.1.2/debian/control
===================================================================
--- branches/modular/proto/randrproto-X11R7.0-1.1.2/debian/control	2006-02-09 02:19:18 UTC (rev 1180)
+++ branches/modular/proto/randrproto-X11R7.0-1.1.2/debian/control	2006-02-09 16:08:24 UTC (rev 1181)
@@ -11,7 +11,7 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common
 Conflicts: libxrandr-dev (<< 6.8.2-21)
 Replaces: libxrandr-dev (<< 6.8.2-21)
-Pre-Depends: x11-common (>= 1.0)
+Pre-Depends: x11-common (>= 1:1.0)
 Description: X11 RandR extension wire protocol
  This package provides the wire protocol for the RandR extension, used to
  change display properties such as resolution, rotation, reflection, et al,

Modified: branches/modular/proto/recordproto-X11R7.0-1.13.2/debian/changelog
===================================================================
--- branches/modular/proto/recordproto-X11R7.0-1.13.2/debian/changelog	2006-02-09 02:19:18 UTC (rev 1180)
+++ branches/modular/proto/recordproto-X11R7.0-1.13.2/debian/changelog	2006-02-09 16:08:24 UTC (rev 1181)
@@ -1,3 +1,10 @@
+x11proto-record (1.13.2-2) experimental; urgency=low
+
+  * Add epoch to versioned Pre-Depends on x11-common to make upgrades
+    from monolithic x11-common work (Closes: #351779).
+
+ -- Michel Dänzer <daenzer@debian.org>  Thu,  9 Feb 2006 16:41:01 +0100
+
 x11proto-record (1.13.2-1) experimental; urgency=low
 
   * First upload to Debian

Modified: branches/modular/proto/recordproto-X11R7.0-1.13.2/debian/control
===================================================================
--- branches/modular/proto/recordproto-X11R7.0-1.13.2/debian/control	2006-02-09 02:19:18 UTC (rev 1180)
+++ branches/modular/proto/recordproto-X11R7.0-1.13.2/debian/control	2006-02-09 16:08:24 UTC (rev 1181)
@@ -11,7 +11,7 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common
 Conflicts: libxtst-dev (<< 6.8.2-21)
 Replaces: libxtst-dev (<< 6.8.2-21)
-Pre-Depends: x11-common (>= 1.0)
+Pre-Depends: x11-common (>= 1:1.0)
 Description: X11 Record extension wire protocol
  This package provides the wire protocol for the Record extension, used to
  record and play back event sequences.

Modified: branches/modular/proto/renderproto-X11R7.0-0.9.2/debian/changelog
===================================================================
--- branches/modular/proto/renderproto-X11R7.0-0.9.2/debian/changelog	2006-02-09 02:19:18 UTC (rev 1180)
+++ branches/modular/proto/renderproto-X11R7.0-0.9.2/debian/changelog	2006-02-09 16:08:24 UTC (rev 1181)
@@ -1,3 +1,10 @@
+x11proto-render (2:0.9.2-2) experimental; urgency=low
+
+  * Add epoch to versioned Pre-Depends on x11-common to make upgrades
+    from monolithic x11-common work (Closes: #351779).
+
+ -- Michel Dänzer <daenzer@debian.org>  Thu,  9 Feb 2006 16:41:02 +0100
+
 x11proto-render (2:0.9.2-1) experimental; urgency=low
 
   * First upload to Debian

Modified: branches/modular/proto/renderproto-X11R7.0-0.9.2/debian/control
===================================================================
--- branches/modular/proto/renderproto-X11R7.0-0.9.2/debian/control	2006-02-09 02:19:18 UTC (rev 1180)
+++ branches/modular/proto/renderproto-X11R7.0-0.9.2/debian/control	2006-02-09 16:08:24 UTC (rev 1181)
@@ -11,7 +11,7 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common
 Conflicts: render-dev (<< 1:0.9.0-1)
 Replaces: render-dev (<< 1:0.9.0-1)
-Pre-Depends: x11-common (>= 1.0)
+Pre-Depends: x11-common (>= 1:1.0)
 Description: X11 Render extension wire protocol
  This package provides the wire protocol for the Render extension, used to
  implement Porter-Duff operations within X.

Modified: branches/modular/proto/resourceproto-X11R7.0-1.0.2/debian/changelog
===================================================================
--- branches/modular/proto/resourceproto-X11R7.0-1.0.2/debian/changelog	2006-02-09 02:19:18 UTC (rev 1180)
+++ branches/modular/proto/resourceproto-X11R7.0-1.0.2/debian/changelog	2006-02-09 16:08:24 UTC (rev 1181)
@@ -1,3 +1,10 @@
+x11proto-resource (1.0.2-2) experimental; urgency=low
+
+  * Add epoch to versioned Pre-Depends on x11-common to make upgrades
+    from monolithic x11-common work (Closes: #351779).
+
+ -- Michel Dänzer <daenzer@debian.org>  Thu,  9 Feb 2006 16:41:03 +0100
+
 x11proto-resource (1.0.2-1) experimental; urgency=low
 
   * First upload to Debian

Modified: branches/modular/proto/resourceproto-X11R7.0-1.0.2/debian/control
===================================================================
--- branches/modular/proto/resourceproto-X11R7.0-1.0.2/debian/control	2006-02-09 02:19:18 UTC (rev 1180)
+++ branches/modular/proto/resourceproto-X11R7.0-1.0.2/debian/control	2006-02-09 16:08:24 UTC (rev 1181)
@@ -11,7 +11,7 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common
 Conflicts: libxres-dev (<< 6.8.2-21)
 Replaces: libxres-dev (<< 6.8.2-21)
-Pre-Depends: x11-common (>= 1.0)
+Pre-Depends: x11-common (>= 1:1.0)
 Description: X11 Resource extension wire protocol
  This package provides the wire protocol for the Resource extension, used to
  measure resource usage from clients within the X server.

Modified: branches/modular/proto/scrnsaverproto-X11R7.0-1.0.2/debian/changelog
===================================================================
--- branches/modular/proto/scrnsaverproto-X11R7.0-1.0.2/debian/changelog	2006-02-09 02:19:18 UTC (rev 1180)
+++ branches/modular/proto/scrnsaverproto-X11R7.0-1.0.2/debian/changelog	2006-02-09 16:08:24 UTC (rev 1181)
@@ -1,3 +1,10 @@
+x11proto-scrnsaver (1.0.2-2) experimental; urgency=low
+
+  * Add epoch to versioned Pre-Depends on x11-common to make upgrades
+    from monolithic x11-common work (Closes: #351779).
+
+ -- Michel Dänzer <daenzer@debian.org>  Thu,  9 Feb 2006 16:41:05 +0100
+
 x11proto-scrnsaver (1.0.2-1) experimental; urgency=low
 
   * First upload to Debian

Modified: branches/modular/proto/scrnsaverproto-X11R7.0-1.0.2/debian/control
===================================================================
--- branches/modular/proto/scrnsaverproto-X11R7.0-1.0.2/debian/control	2006-02-09 02:19:18 UTC (rev 1180)
+++ branches/modular/proto/scrnsaverproto-X11R7.0-1.0.2/debian/control	2006-02-09 16:08:24 UTC (rev 1181)
@@ -11,7 +11,7 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common
 Conflicts: libxss-dev (<< 6.8.2-21)
 Replaces: libxss-dev (<< 6.8.2-21)
-Pre-Depends: x11-common (>= 1.0)
+Pre-Depends: x11-common (>= 1:1.0)
 Description: X11 Screen Saver extension wire protocol
  This package provides the wire protocol for the MIT-SCREEN-SAVER extension,
  used to notify the server of client screen saver events.

Modified: branches/modular/proto/trapproto-X11R7.0-3.4.3/debian/changelog
===================================================================
--- branches/modular/proto/trapproto-X11R7.0-3.4.3/debian/changelog	2006-02-09 02:19:18 UTC (rev 1180)
+++ branches/modular/proto/trapproto-X11R7.0-3.4.3/debian/changelog	2006-02-09 16:08:24 UTC (rev 1181)
@@ -1,3 +1,10 @@
+x11proto-trap (3.4.3-2) experimental; urgency=low
+
+  * Add epoch to versioned Pre-Depends on x11-common to make upgrades
+    from monolithic x11-common work (Closes: #351779).
+
+ -- Michel Dänzer <daenzer@debian.org>  Thu,  9 Feb 2006 16:41:06 +0100
+
 x11proto-trap (3.4.3-1) experimental; urgency=low
 
   * First upload to Debian

Modified: branches/modular/proto/trapproto-X11R7.0-3.4.3/debian/control
===================================================================
--- branches/modular/proto/trapproto-X11R7.0-3.4.3/debian/control	2006-02-09 02:19:18 UTC (rev 1180)
+++ branches/modular/proto/trapproto-X11R7.0-3.4.3/debian/control	2006-02-09 16:08:24 UTC (rev 1181)
@@ -11,7 +11,7 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common
 Conflicts: libxtrap-dev (<< 6.8.2-25)
 Replaces: libxtrap-dev (<< 6.8.2-25)
-Pre-Depends: x11-common (>= 1.0)
+Pre-Depends: x11-common (>= 1:1.0)
 Description: X11 Trap extension wire protocol
  This package provides the wire protocol for the DEC-XTRAP extension,
  used to synthesise input events.

Modified: branches/modular/proto/videoproto-X11R7.0-2.2.2/debian/changelog
===================================================================
--- branches/modular/proto/videoproto-X11R7.0-2.2.2/debian/changelog	2006-02-09 02:19:18 UTC (rev 1180)
+++ branches/modular/proto/videoproto-X11R7.0-2.2.2/debian/changelog	2006-02-09 16:08:24 UTC (rev 1181)
@@ -1,3 +1,10 @@
+x11proto-video (2.2.2-2) experimental; urgency=low
+
+  * Add epoch to versioned Pre-Depends on x11-common to make upgrades
+    from monolithic x11-common work (Closes: #351779).
+
+ -- Michel Dänzer <daenzer@debian.org>  Thu,  9 Feb 2006 16:41:06 +0100
+
 x11proto-video (2.2.2-1) experimental; urgency=low
 
   * First upload to Debian

Modified: branches/modular/proto/videoproto-X11R7.0-2.2.2/debian/control
===================================================================
--- branches/modular/proto/videoproto-X11R7.0-2.2.2/debian/control	2006-02-09 02:19:18 UTC (rev 1180)
+++ branches/modular/proto/videoproto-X11R7.0-2.2.2/debian/control	2006-02-09 16:08:24 UTC (rev 1181)
@@ -11,7 +11,7 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common
 Conflicts: libxv-dev (<< 6.8.2-25), libxvmc-dev (<< 6.8.2-25)
 Replaces: libxv-dev (<< 6.8.2-25), libxvmc-dev (<< 6.8.2-25)
-Pre-Depends: x11-common (>= 1.0)
+Pre-Depends: x11-common (>= 1:1.0)
 Description: X11 Video extension wire protocol
  This package provides the wire protocol for the XVideo and
  XVideoMotionCompensation extensions, used to accelerate playback of videos

Modified: branches/modular/proto/xcmiscproto-X11R7.0-1.1.2/debian/changelog
===================================================================
--- branches/modular/proto/xcmiscproto-X11R7.0-1.1.2/debian/changelog	2006-02-09 02:19:18 UTC (rev 1180)
+++ branches/modular/proto/xcmiscproto-X11R7.0-1.1.2/debian/changelog	2006-02-09 16:08:24 UTC (rev 1181)
@@ -1,3 +1,10 @@
+x11proto-xcmisc (1.1.2-2) experimental; urgency=low
+
+  * Add epoch to versioned Pre-Depends on x11-common to make upgrades
+    from monolithic x11-common work (Closes: #351779).
+
+ -- Michel Dänzer <daenzer@debian.org>  Thu,  9 Feb 2006 16:41:07 +0100
+
 x11proto-xcmisc (1.1.2-1) experimental; urgency=low
 
   * First upload to Debian

Modified: branches/modular/proto/xcmiscproto-X11R7.0-1.1.2/debian/control
===================================================================
--- branches/modular/proto/xcmiscproto-X11R7.0-1.1.2/debian/control	2006-02-09 02:19:18 UTC (rev 1180)
+++ branches/modular/proto/xcmiscproto-X11R7.0-1.1.2/debian/control	2006-02-09 16:08:24 UTC (rev 1181)
@@ -11,7 +11,7 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common
 Conflicts: libxext-dev (<< 6.8.2-25)
 Replaces: libxext-dev (<< 6.8.2-25)
-Pre-Depends: x11-common (>= 1.0)
+Pre-Depends: x11-common (>= 1:1.0)
 Description: X11 XC-Miscellaneous extension wire protocol
  This package provides the wire protocol for the XC-MISC extension,
  used to get details of XID allocation within the server.

Modified: branches/modular/proto/xextproto-X11R7.0-7.0.2/debian/changelog
===================================================================
--- branches/modular/proto/xextproto-X11R7.0-7.0.2/debian/changelog	2006-02-09 02:19:18 UTC (rev 1180)
+++ branches/modular/proto/xextproto-X11R7.0-7.0.2/debian/changelog	2006-02-09 16:08:24 UTC (rev 1181)
@@ -1,3 +1,10 @@
+x11proto-xext (7.0.2-2) experimental; urgency=low
+
+  * Add epoch to versioned Pre-Depends on x11-common to make upgrades
+    from monolithic x11-common work (Closes: #351779).
+
+ -- Michel Dänzer <daenzer@debian.org>  Thu,  9 Feb 2006 16:41:07 +0100
+
 x11proto-xext (7.0.2-1) experimental; urgency=low
 
   * First upload to Debian

Modified: branches/modular/proto/xextproto-X11R7.0-7.0.2/debian/control
===================================================================
--- branches/modular/proto/xextproto-X11R7.0-7.0.2/debian/control	2006-02-09 02:19:18 UTC (rev 1180)
+++ branches/modular/proto/xextproto-X11R7.0-7.0.2/debian/control	2006-02-09 16:08:24 UTC (rev 1181)
@@ -11,7 +11,7 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common, libxi-dev, libxau-dev
 Conflicts: libxext-dev (<< 6.8.2-25), libxtst-dev (<< 6.8.2-25)
 Replaces: libxext-dev (<< 6.8.2-25), libxtst-dev (<< 6.8.2-25)
-Pre-Depends: x11-common (>= 1.0)
+Pre-Depends: x11-common (>= 1:1.0)
 Description: X11 various extension wire protocol
  This package provides the wire protocol for various extensions, the
  client-side libraries of which are provided in the Xext library.

Modified: branches/modular/proto/xf86bigfontproto-X11R7.0-1.1.2/debian/changelog
===================================================================
--- branches/modular/proto/xf86bigfontproto-X11R7.0-1.1.2/debian/changelog	2006-02-09 02:19:18 UTC (rev 1180)
+++ branches/modular/proto/xf86bigfontproto-X11R7.0-1.1.2/debian/changelog	2006-02-09 16:08:24 UTC (rev 1181)
@@ -1,3 +1,10 @@
+x11proto-xf86bigfont (1.1.2-2) experimental; urgency=low
+
+  * Add epoch to versioned Pre-Depends on x11-common to make upgrades
+    from monolithic x11-common work (Closes: #351779).
+
+ -- Michel Dänzer <daenzer@debian.org>  Thu,  9 Feb 2006 16:41:08 +0100
+
 x11proto-xf86bigfont (1.1.2-1) experimental; urgency=low
 
   * First upload to Debian

Modified: branches/modular/proto/xf86bigfontproto-X11R7.0-1.1.2/debian/control
===================================================================
--- branches/modular/proto/xf86bigfontproto-X11R7.0-1.1.2/debian/control	2006-02-09 02:19:18 UTC (rev 1180)
+++ branches/modular/proto/xf86bigfontproto-X11R7.0-1.1.2/debian/control	2006-02-09 16:08:24 UTC (rev 1181)
@@ -11,7 +11,7 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common
 Conflicts: xlibs-static-dev (<< 6.8.1)
 Replaces: xlibs-static-dev (<< 6.8.1)
-Pre-Depends: x11-common (>= 1.0)
+Pre-Depends: x11-common (>= 1:1.0)
 Description: X11 Big Fonts extension wire protocol
  This package provides the wire protocol for the XF86BIGFONT extension,
  used to make larger font requests possible.

Modified: branches/modular/proto/xf86dgaproto-X11R7.0-2.0.2/debian/changelog
===================================================================
--- branches/modular/proto/xf86dgaproto-X11R7.0-2.0.2/debian/changelog	2006-02-09 02:19:18 UTC (rev 1180)
+++ branches/modular/proto/xf86dgaproto-X11R7.0-2.0.2/debian/changelog	2006-02-09 16:08:24 UTC (rev 1181)
@@ -1,3 +1,10 @@
+x11proto-xf86dga (2.0.2-2) experimental; urgency=low
+
+  * Add epoch to versioned Pre-Depends on x11-common to make upgrades
+    from monolithic x11-common work (Closes: #351779).
+
+ -- Michel Dänzer <daenzer@debian.org>  Thu,  9 Feb 2006 16:41:08 +0100
+
 x11proto-xf86dga (2.0.2-1) experimental; urgency=low
 
   * First upload to Debian

Modified: branches/modular/proto/xf86dgaproto-X11R7.0-2.0.2/debian/control
===================================================================
--- branches/modular/proto/xf86dgaproto-X11R7.0-2.0.2/debian/control	2006-02-09 02:19:18 UTC (rev 1180)
+++ branches/modular/proto/xf86dgaproto-X11R7.0-2.0.2/debian/control	2006-02-09 16:08:24 UTC (rev 1181)
@@ -11,7 +11,7 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common
 Conflicts: xlibs-static-dev (<< 6.8.1), libxxf86dga-dev (<< 6.8.2-25)
 Replaces: xlibs-static-dev (<< 6.8.1), libxxf86dga-dev (<< 6.8.2-25)
-Pre-Depends: x11-common (>= 1.0)
+Pre-Depends: x11-common (>= 1:1.0)
 Description: X11 Direct Graphics Access extension wire protocol
  This package provides the wire protocol for the XFree86-DGA extension,
  which provides direct, framebuffer-like, graphics access.

Modified: branches/modular/proto/xf86driproto-X11R7.0-2.0.3/debian/changelog
===================================================================
--- branches/modular/proto/xf86driproto-X11R7.0-2.0.3/debian/changelog	2006-02-09 02:19:18 UTC (rev 1180)
+++ branches/modular/proto/xf86driproto-X11R7.0-2.0.3/debian/changelog	2006-02-09 16:08:24 UTC (rev 1181)
@@ -1,3 +1,10 @@
+x11proto-xf86dri (2.0.3-2) experimental; urgency=low
+
+  * Add epoch to versioned Pre-Depends on x11-common to make upgrades
+    from monolithic x11-common work (Closes: #351779).
+
+ -- Michel Dänzer <daenzer@debian.org>  Thu,  9 Feb 2006 16:41:09 +0100
+
 x11proto-xf86dri (2.0.3-1) experimental; urgency=low
 
   * First upload to Debian

Modified: branches/modular/proto/xf86driproto-X11R7.0-2.0.3/debian/control
===================================================================
--- branches/modular/proto/xf86driproto-X11R7.0-2.0.3/debian/control	2006-02-09 02:19:18 UTC (rev 1180)
+++ branches/modular/proto/xf86driproto-X11R7.0-2.0.3/debian/control	2006-02-09 16:08:24 UTC (rev 1181)
@@ -9,7 +9,7 @@
 Package: x11proto-xf86dri-dev
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common
-Pre-Depends: x11-common (>= 1.0)
+Pre-Depends: x11-common (>= 1:1.0)
 Description: X11 DRI extension wire protocol
  This package provides the wire protocol for the XFree86-DRI extension, used to
  organise direct rendering support for 3D clients, and help arbiter the

Modified: branches/modular/proto/xf86miscproto-X11R7.0-0.9.2/debian/changelog
===================================================================
--- branches/modular/proto/xf86miscproto-X11R7.0-0.9.2/debian/changelog	2006-02-09 02:19:18 UTC (rev 1180)
+++ branches/modular/proto/xf86miscproto-X11R7.0-0.9.2/debian/changelog	2006-02-09 16:08:24 UTC (rev 1181)
@@ -1,3 +1,10 @@
+x11proto-xf86misc (0.9.2-2) experimental; urgency=low
+
+  * Add epoch to versioned Pre-Depends on x11-common to make upgrades
+    from monolithic x11-common work (Closes: #351779).
+
+ -- Michel Dänzer <daenzer@debian.org>  Thu,  9 Feb 2006 16:41:09 +0100
+
 x11proto-xf86misc (0.9.2-1) experimental; urgency=low
 
   * First upload to Debian

Modified: branches/modular/proto/xf86miscproto-X11R7.0-0.9.2/debian/control
===================================================================
--- branches/modular/proto/xf86miscproto-X11R7.0-0.9.2/debian/control	2006-02-09 02:19:18 UTC (rev 1180)
+++ branches/modular/proto/xf86miscproto-X11R7.0-0.9.2/debian/control	2006-02-09 16:08:24 UTC (rev 1181)
@@ -11,7 +11,7 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common
 Conflicts: xlibs-static-dev (<< 6.8.1), libxxf86misc-dev (<< 6.8.2-25)
 Replaces: xlibs-static-dev (<< 6.8.1), libxxf86misc-dev (<< 6.8.2-25)
-Pre-Depends: x11-common (>= 1.0)
+Pre-Depends: x11-common (>= 1:1.0)
 Description: X11 XFree86-Miscellaneous extension wire protocol
  This package provides the wire protocol for the XFree86-Misc extension,
  which provides a means to access input device configuration settings

Modified: branches/modular/proto/xf86vidmodeproto-X11R7.0-2.2.2/debian/changelog
===================================================================
--- branches/modular/proto/xf86vidmodeproto-X11R7.0-2.2.2/debian/changelog	2006-02-09 02:19:18 UTC (rev 1180)
+++ branches/modular/proto/xf86vidmodeproto-X11R7.0-2.2.2/debian/changelog	2006-02-09 16:08:24 UTC (rev 1181)
@@ -1,3 +1,10 @@
+x11proto-xf86vidmode (2.2.2-2) experimental; urgency=low
+
+  * Add epoch to versioned Pre-Depends on x11-common to make upgrades
+    from monolithic x11-common work (Closes: #351779).
+
+ -- Michel Dänzer <daenzer@debian.org>  Thu,  9 Feb 2006 16:41:10 +0100
+
 x11proto-xf86vidmode (2.2.2-1) experimental; urgency=low
 
   * First upload to Debian

Modified: branches/modular/proto/xf86vidmodeproto-X11R7.0-2.2.2/debian/control
===================================================================
--- branches/modular/proto/xf86vidmodeproto-X11R7.0-2.2.2/debian/control	2006-02-09 02:19:18 UTC (rev 1180)
+++ branches/modular/proto/xf86vidmodeproto-X11R7.0-2.2.2/debian/control	2006-02-09 16:08:24 UTC (rev 1181)
@@ -11,7 +11,7 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common
 Conflicts: xlibs-static-dev (<< 6.8.1), libxxf86vidmode-dev (<< 6.8.2-25)
 Replaces: xlibs-static-dev (<< 6.8.1), libxxf86vidmode-dev (<< 6.8.2-25)
-Pre-Depends: x11-common (>= 1.0)
+Pre-Depends: x11-common (>= 1:1.0)
 Description: X11 Video Mode extension wire protocol
  This package provides the wire protocol for the XFree86-VidMode extension,
  which provides access to detailed timings of video modes currently in use,

Modified: branches/modular/proto/xineramaproto-X11R7.0-1.1.2/debian/changelog
===================================================================
--- branches/modular/proto/xineramaproto-X11R7.0-1.1.2/debian/changelog	2006-02-09 02:19:18 UTC (rev 1180)
+++ branches/modular/proto/xineramaproto-X11R7.0-1.1.2/debian/changelog	2006-02-09 16:08:24 UTC (rev 1181)
@@ -1,3 +1,10 @@
+x11proto-xinerama (1.1.2-2) experimental; urgency=low
+
+  * Add epoch to versioned Pre-Depends on x11-common to make upgrades
+    from monolithic x11-common work (Closes: #351779).
+
+ -- Michel Dänzer <daenzer@debian.org>  Thu,  9 Feb 2006 16:41:10 +0100
+
 x11proto-xinerama (1.1.2-1) experimental; urgency=low
 
   * First upload to Debian

Modified: branches/modular/proto/xineramaproto-X11R7.0-1.1.2/debian/control
===================================================================
--- branches/modular/proto/xineramaproto-X11R7.0-1.1.2/debian/control	2006-02-09 02:19:18 UTC (rev 1180)
+++ branches/modular/proto/xineramaproto-X11R7.0-1.1.2/debian/control	2006-02-09 16:08:24 UTC (rev 1181)
@@ -11,7 +11,7 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common
 Conflicts: libxinerama-dev (<< 6.8.2-21), x11proto-panoramix-dev
 Replaces: libxinerama-dev (<< 6.8.2-21), x11proto-panoramix-dev
-Pre-Depends: x11-common (>= 1.0)
+Pre-Depends: x11-common (>= 1:1.0)
 Description: X11 Xinerama extension wire protocol
  This package provides the wire protocol for the XINERAMA extension, used to
  use and manage a multiple-screen display.  The terms 'Xinerama' and 'PanoramiX'

Modified: branches/modular/proto/xproto-X11R7.0-7.0.4/debian/changelog
===================================================================
--- branches/modular/proto/xproto-X11R7.0-7.0.4/debian/changelog	2006-02-09 02:19:18 UTC (rev 1180)
+++ branches/modular/proto/xproto-X11R7.0-7.0.4/debian/changelog	2006-02-09 16:08:24 UTC (rev 1181)
@@ -1,3 +1,10 @@
+x11proto-core (7.0.4-2) experimental; urgency=low
+
+  * Add epoch to versioned Pre-Depends on x11-common to make upgrades
+    from monolithic x11-common work (Closes: #351779).
+
+ -- Michel Dänzer <daenzer@debian.org>  Thu,  9 Feb 2006 16:41:11 +0100
+
 x11proto-core (7.0.4-1) experimental; urgency=low
 
   * First upload to Debian

Modified: branches/modular/proto/xproto-X11R7.0-7.0.4/debian/control
===================================================================
--- branches/modular/proto/xproto-X11R7.0-7.0.4/debian/control	2006-02-09 02:19:18 UTC (rev 1180)
+++ branches/modular/proto/xproto-X11R7.0-7.0.4/debian/control	2006-02-09 16:08:24 UTC (rev 1181)
@@ -11,7 +11,7 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common
 Conflicts: x-dev (<< 6.8.99.7-1)
 Replaces: x-dev (<< 6.8.99.7-1)
-Pre-Depends: x11-common (>= 0.99)
+Pre-Depends: x11-common (>= 1:1.0)
 Description: X11 core wire protocol and auxiliary headers
  This package provides the wire protocol for the core X11 protocol, and also
  provides a number of utility headers, used to abstract OS-specific functions.