From: Tollef Fog Heen <tfheen@err.no>
Date: Sat, 5 Jun 2010 06:01:20 +0000 (+0200)
Subject: Somewhat newer upstream snapshot, still not released
X-Git-Tag: 0.git+20100605+dfd8ee-1~10
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=80d60d19226c95243b78b7725c662b50a9250beb;p=systemd

Somewhat newer upstream snapshot, still not released
---

diff --git a/debian/changelog b/debian/changelog
index 0fcefbf1..e2b83b0d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-systemd (0~git+afb757b-1) experimental; urgency=low
+systemd (0~git+20100527+f306f4-1) experimental; urgency=low
 
   * Initial release, upload to experimental.  Closes: #580814
 
diff --git a/debian/control b/debian/control
index 954cac5f..0ba54e25 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Package: systemd
 Architecture: linux-any
 Section: admin
 Priority: extra
-Depends: ${shlibs:Depends}, ${misc:Depends}, systemd-services
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: system and session manager
  systemd is a replacement for sysvinit.  It is dependency-based and
  able to read the LSB init script headers in addition to parsing rcN.d
@@ -18,19 +18,3 @@ Description: system and session manager
  It also provides process supervision using cgroups and the ability to
  not only depend on other init script being started, but also
  availability of a given mount point or dbus service.
-
-Package: systemd-services
-Architecture: all
-Section: admin
-Priority: extra
-Recommends: systemd
-Description: system and session manager - service scripts
- systemd is a replacement for sysvinit.  It is dependency-based and
- able to read the LSB init script headers in addition to parsing rcN.d
- links as hints.
- .
- It also provides process supervision using cgroups and the ability to
- not only depend on other init script being started, but also
- availability of a given mount point or dbus service.
- .
- This package contains the service scripts that systemd needs.
diff --git a/debian/rules b/debian/rules
index 0e5eee33..867e624a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,10 +8,16 @@ export DEB_BUILD_OPTIONS="nostrip"
 override_dh_auto_configure:
 #	mkdir build
 #	cd build &&
-	./configure --build=$(DEB_BUILD_GNU_TYPE) --prefix=/ --mandir=/usr/share/man --sysconfdir=/etc --datarootdir=/lib --localstatedir=/var --libexecdir=/lib
+	dh_auto_configure -- --prefix=/ --mandir=/usr/share/man --sysconfdir=/etc --datarootdir=/lib --localstatedir=/var --libexecdir=/lib
 
-override_dh_install:
-	dh_install -O--parallel --fail-missing
+override_dh_auto_build:
+	dh_auto_build -- interfacedir=/usr/share/dbus-1/interfaces
+
+override_dh_auto_install:
+	dh_auto_install -- interfacedir=/usr/share/dbus-1/interfaces
+
+#override_dh_install:
+#	dh_install -O--parallel --fail-missing
 
 #export DH_VERBOSE=1
 
diff --git a/debian/systemd-services.install b/debian/systemd-services.install
deleted file mode 100644
index b7ef1c17..00000000
--- a/debian/systemd-services.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/system/ etc/systemd/
diff --git a/debian/systemd.install b/debian/systemd.install
deleted file mode 100644
index 8c95db76..00000000
--- a/debian/systemd.install
+++ /dev/null
@@ -1,4 +0,0 @@
-sbin
-lib
-bin
-etc/dbus-1/system.d/