[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

libxinerama: Changes to 'debian-unstable'



 debian/changelog                 |   14 ++++++++++++--
 debian/control                   |   16 ++++++++++++----
 debian/libxinerama1-udeb.install |    1 +
 debian/rules                     |    2 +-
 4 files changed, 26 insertions(+), 7 deletions(-)

New commits:
commit 6dfcc7a915ee6b4bc53157bd89db516f0b35e4dc
Author: Cyril Brulebois <kibi@debian.org>
Date:   Thu Mar 11 04:47:58 2010 +0100

    Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index ba06469..1578241 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libxinerama (2:1.1-3) UNRELEASED; urgency=low
+libxinerama (2:1.1-3) unstable; urgency=low
 
   [ Julien Cristau ]
   * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
@@ -14,7 +14,7 @@ libxinerama (2:1.1-3) UNRELEASED; urgency=low
   * Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed).
   * Add myself to Uploaders.
 
- -- Julien Cristau <jcristau@debian.org>  Sat, 16 Jan 2010 16:47:38 +0000
+ -- Cyril Brulebois <kibi@debian.org>  Thu, 11 Mar 2010 04:45:40 +0100
 
 libxinerama (2:1.1-2) unstable; urgency=low
 

commit 5f58c5baa85f542bbc37e571c99982018532478d
Author: Cyril Brulebois <kibi@debian.org>
Date:   Thu Mar 11 04:45:37 2010 +0100

    Add myself to Uploaders.

diff --git a/debian/changelog b/debian/changelog
index 1d8a334..ba06469 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ libxinerama (2:1.1-3) UNRELEASED; urgency=low
      - libx11-dev
      - libxext-dev
   * Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed).
+  * Add myself to Uploaders.
 
  -- Julien Cristau <jcristau@debian.org>  Sat, 16 Jan 2010 16:47:38 +0000
 
diff --git a/debian/control b/debian/control
index f48d6f3..e7c35c7 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: libxinerama
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>
+Uploaders: David Nusinow <dnusinow@debian.org>, Cyril Brulebois <kibi@debian.org>
 Build-Depends:
  debhelper (>= 5.0.0),
  libx11-dev (>= 2:1.3.3-2),

commit 03af750ad3bf8044aadf7463cf41bcd5857f3a47
Author: Cyril Brulebois <kibi@debian.org>
Date:   Thu Mar 11 04:43:40 2010 +0100

    Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed).

diff --git a/debian/changelog b/debian/changelog
index e6ef0aa..1d8a334 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ libxinerama (2:1.1-3) UNRELEASED; urgency=low
     the (recently-added) udebs rather than on the libraries:
      - libx11-dev
      - libxext-dev
+  * Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed).
 
  -- Julien Cristau <jcristau@debian.org>  Sat, 16 Jan 2010 16:47:38 +0000
 
diff --git a/debian/control b/debian/control
index 5d7fcb5..f48d6f3 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends:
  automake,
  libtool,
  xutils-dev (>= 1:7.5~1)
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxinerama
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxinerama.git
 

commit 3b1b09d775b38ff1eb6cb453a3eee9595f75da90
Author: Cyril Brulebois <kibi@debian.org>
Date:   Fri Feb 26 07:20:22 2010 +0100

    Use XC-Package-Type to save some memory.

diff --git a/debian/control b/debian/control
index 7e4d0f7..5d7fcb5 100644
--- a/debian/control
+++ b/debian/control
@@ -37,7 +37,7 @@ Description: X11 Xinerama extension library
  git://anongit.freedesktop.org/git/xorg/lib/libXinerama
 
 Package: libxinerama1-udeb
-Package-Type: udeb
+XC-Package-Type: udeb
 Section: debian-installer
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}

commit c680729c28c50d958f2e544234b550629ffba8b6
Author: Cyril Brulebois <kibi@debian.org>
Date:   Sun Feb 7 00:02:22 2010 +0000

    Version/Bump some B-D to make sure the udeb gets its dependencies on udebs.

diff --git a/debian/changelog b/debian/changelog
index bc706a7..e6ef0aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,10 @@ libxinerama (2:1.1-3) UNRELEASED; urgency=low
 
   [ Cyril Brulebois ]
   * Add udeb needed for the graphical installer: libxinerama1-udeb.
+  * Version/Bump some B-D to make sure the udeb gets its dependencies on
+    the (recently-added) udebs rather than on the libraries:
+     - libx11-dev
+     - libxext-dev
 
  -- Julien Cristau <jcristau@debian.org>  Sat, 16 Jan 2010 16:47:38 +0000
 
diff --git a/debian/control b/debian/control
index b32506d..7e4d0f7 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,8 @@ Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
 Uploaders: David Nusinow <dnusinow@debian.org>
 Build-Depends:
  debhelper (>= 5.0.0),
- libx11-dev (>= 1:0.99.2),
- libxext-dev (>= 1:0.99.1),
+ libx11-dev (>= 2:1.3.3-2),
+ libxext-dev (>= 2:1.1.1-3),
  x11proto-xinerama-dev (>= 1.2),
  pkg-config,
  automake,

commit 2513c0462d3be3e93973b5d7a90fb497b6f18f30
Author: Cyril Brulebois <kibi@debian.org>
Date:   Sat Feb 6 23:57:19 2010 +0000

    Add udeb needed for the graphical installer: libxinerama1-udeb.

diff --git a/debian/changelog b/debian/changelog
index 56b4a3b..bc706a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
 libxinerama (2:1.1-3) UNRELEASED; urgency=low
 
+  [ Julien Cristau ]
   * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
     good reason.  Thanks, Colin Watson!
   * Remove myself from Uploaders
 
+  [ Cyril Brulebois ]
+  * Add udeb needed for the graphical installer: libxinerama1-udeb.
+
  -- Julien Cristau <jcristau@debian.org>  Sat, 16 Jan 2010 16:47:38 +0000
 
 libxinerama (2:1.1-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 05728d4..b32506d 100644
--- a/debian/control
+++ b/debian/control
@@ -36,6 +36,14 @@ Description: X11 Xinerama extension library
  This module can be found at
  git://anongit.freedesktop.org/git/xorg/lib/libXinerama
 
+Package: libxinerama1-udeb
+Package-Type: udeb
+Section: debian-installer
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: X11 Xinerama extension library
+ This is a udeb, or a microdeb, for the debian-installer.
+
 Package: libxinerama1-dbg
 Section: debug
 Priority: extra
diff --git a/debian/libxinerama1-udeb.install b/debian/libxinerama1-udeb.install
new file mode 100644
index 0000000..eba365f
--- /dev/null
+++ b/debian/libxinerama1-udeb.install
@@ -0,0 +1 @@
+usr/lib/libXinerama.so.1*
diff --git a/debian/rules b/debian/rules
index 3ded07d..24e59ef 100755
--- a/debian/rules
+++ b/debian/rules
@@ -83,7 +83,7 @@ binary-arch: build install
 	dh_strip --dbg-package=$(PACKAGE)-dbg
 	dh_compress
 	dh_fixperms
-	dh_makeshlibs
+	dh_makeshlibs --add-udeb=$(PACKAGE)-udeb
 	dh_shlibdeps
 	dh_installdeb
 	dh_gencontrol


Reply to: