r21233 - in /desktop/unstable/nautilus-cd-burner/debian: changelog control control.in rules

[joss at users.alioth.debian.org]

Author: joss
Date: Thu Sep  3 06:06:52 2009
New Revision: 21233

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=21233
Log:
Remove broken kfreebsd-specific logic. We always need libhal, and 
libcam is not needed by the development package. Closes: #543372.

Modified:
    desktop/unstable/nautilus-cd-burner/debian/changelog
    desktop/unstable/nautilus-cd-burner/debian/control
    desktop/unstable/nautilus-cd-burner/debian/control.in
    desktop/unstable/nautilus-cd-burner/debian/rules

Modified: desktop/unstable/nautilus-cd-burner/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus-cd-burner/debian/changelog?rev=21233&op=diff
==============================================================================
--- desktop/unstable/nautilus-cd-burner/debian/changelog [utf-8] (original)
+++ desktop/unstable/nautilus-cd-burner/debian/changelog [utf-8] Thu Sep  3 06:06:52 2009
@@ -1,3 +1,10 @@
+nautilus-cd-burner (2.24.0-5) UNRELEASED; urgency=low
+
+  * Remove broken kfreebsd-specific logic. We always need libhal, and 
+    libcam is not needed by the development package. Closes: #543372.
+
+ -- Josselin Mouette <joss at debian.org>  Thu, 03 Sep 2009 08:05:49 +0200
+
 nautilus-cd-burner (2.24.0-4) unstable; urgency=low
 
   * Remove the nautilus-cd-burner package, only keep the library.

Modified: desktop/unstable/nautilus-cd-burner/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus-cd-burner/debian/control?rev=21233&op=diff
==============================================================================
--- desktop/unstable/nautilus-cd-burner/debian/control [utf-8] (original)
+++ desktop/unstable/nautilus-cd-burner/debian/control [utf-8] Thu Sep  3 06:06:52 2009
@@ -38,7 +38,7 @@
 Depends: libnautilus-burn4 (= ${binary:Version}),
          libglib2.0-dev (>= 2.15.4),
          libgtk2.0-dev (>= 2.5.4),
-         ${libhal-dev}
+         libhal-dev (>= 0.5.7)
 Description: Nautilus Burn Library - development version
  Lets you burn CDs and DVDs easily with GNOME, by drag-and-dropping files in the
  GNOME file manager.

Modified: desktop/unstable/nautilus-cd-burner/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus-cd-burner/debian/control.in?rev=21233&op=diff
==============================================================================
--- desktop/unstable/nautilus-cd-burner/debian/control.in [utf-8] (original)
+++ desktop/unstable/nautilus-cd-burner/debian/control.in [utf-8] Thu Sep  3 06:06:52 2009
@@ -38,7 +38,7 @@
 Depends: libnautilus-burn4 (= ${binary:Version}),
          libglib2.0-dev (>= 2.15.4),
          libgtk2.0-dev (>= 2.5.4),
-         ${libhal-dev}
+         libhal-dev (>= 0.5.7)
 Description: Nautilus Burn Library - development version
  Lets you burn CDs and DVDs easily with GNOME, by drag-and-dropping files in the
  GNOME file manager.

Modified: desktop/unstable/nautilus-cd-burner/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus-cd-burner/debian/rules?rev=21233&op=diff
==============================================================================
--- desktop/unstable/nautilus-cd-burner/debian/rules [utf-8] (original)
+++ desktop/unstable/nautilus-cd-burner/debian/rules [utf-8] Thu Sep  3 06:06:52 2009
@@ -14,14 +14,5 @@
 
 DEB_DH_MAKESHLIBS_ARGS_nautilus-cd-burner := --no-act
 
-binary-predeb/libnautilus-burn-dev::
-ifeq (linux,$(DEB_HOST_ARCH_OS))
-	echo "libhal-dev=libhal-dev (>= 0.5.7)" >> debian/libnautilus-burn-dev.substvars
-else
-ifeq (kfreebsd,$(DEB_HOST_ARCH_OS))
-	echo "libhal-dev=libcam-dev" >> debian/libnautilus-burn-dev.substvars
-endif
-endif
-
 clean::
 	rm -f intltool-update intltool-merge intltool-extract