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

libxmu: Changes to 'debian-unstable'



 debian/changelog      |    7 +++++++
 debian/control        |    4 ++--
 debian/xsfbs/xsfbs.mk |    7 +++----
 3 files changed, 12 insertions(+), 6 deletions(-)

New commits:
commit a7906221624529d55d9f2fc7de19f071b0afdfdc
Author: Julien Cristau <jcristau@debian.org>
Date:   Wed Apr 18 01:45:26 2007 +0200

    Make libxmu*-dev depend on libxmu-headers (= ${source:Version}).

diff --git a/debian/changelog b/debian/changelog
index 6b1c0b7..d6ba51f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libxmu (1:1.0.3-2) UNRELEASED; urgency=low
+
+  * Make libxmu*-dev depend on libxmu-headers (= ${source:Version}).  Thanks,
+    Josh Triplett.
+
+ -- Julien Cristau <jcristau@debian.org>  Wed, 18 Apr 2007 01:42:29 +0200
+
 libxmu (1:1.0.3-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 5c95a3f..8d8730e 100644
--- a/debian/control
+++ b/debian/control
@@ -41,7 +41,7 @@ Description: X11 miscellaneous utility library (debug package)
 Package: libxmu-dev
 Section: libdevel
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common, libxext-dev, libxt-dev, libxmu6 (= ${binary:Version}), libxmu-headers
+Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common, libxext-dev, libxt-dev, libxmu6 (= ${binary:Version}), libxmu-headers (= ${source:Version})
 Description: X11 miscellaneous utility library (development headers)
  libXmu provides a set of miscellaneous utility convenience functions for X
  libraries to use.  libXmuu is a lighter-weight version that does not depend
@@ -87,7 +87,7 @@ Description: X11 miscellaneous micro-utility library (debug package)
 Package: libxmuu-dev
 Section: libdevel
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common, libxmuu1 (= ${binary:Version}), libxmu-headers
+Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common, libxmuu1 (= ${binary:Version}), libxmu-headers (= ${source:Version})
 Description: X11 miscellaneous micro-utility library (development headers)
  libXmuu provides a set of miscellaneous utility convenience functions for X
  libraries to use.  It is a lighter version of libXmu that does not depend

commit 271778bd6338575afa3e4ae7f614f38cdff8e2fb
Author: Branden Robinson <branden@sisyphus.(none)>
Date:   Thu Apr 12 23:18:32 2007 -0400

    Test for existence of debian/patches directory before creating a symlink to it.
    
    This prevents packages that apply no patches from ending up with a broken
    symlink in them.
    
    Remove SVN keyword.
    
    Update copyright notice.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index d88c6db..63dde45 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -1,11 +1,10 @@
 #!/usr/bin/make -f
-# $Id$
 
-# Debian rules file for xorg-x11 source package
+# Debian X Strike Force Build System (XSFBS): Make portion
 
 # Copyright 1996 Stephen Early
 # Copyright 1997 Mark Eichin
-# Copyright 1998-2005 Branden Robinson
+# Copyright 1998-2005, 2007 Branden Robinson
 # Copyright 2005 David Nusinow
 #
 # Licensed under the GNU General Public License, version 2.  See the file
@@ -127,7 +126,7 @@ $(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir
 	if [ ! -e $(STAMP_DIR)/log ]; then \
 		mkdir $(STAMP_DIR)/log; \
 	fi; \
-	if [ ! -e patches ]; then \
+	if [ -e debian/patches ] && [ ! -e patches ]; then \
 		ln -s debian/patches patches; \
 	fi; \
 	>$@



Reply to: