Somewhat newer upstream snapshot, still not released

diff --git a/debian/changelog b/debian/changelog
index 0fcefbf1b17d94159499e0963016a88e879f008a..e2b83b0d6d74654f97300ed2c3f3a0e89bee0b3e 100644 (file)
--- 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 954cac5fae688b5f144dc6e4ee375ae6d7e34d76..0ba54e2578ec9cd2aea2280ff89cf086aa19b95d 100644 (file)
--- 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 0e5eee334a4f3ee2c270e2071df8b4d127b44e18..867e624a564017fc2c027f747d7b495855ff6f22 100755 (executable)
--- 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 (file)
index b7ef1c1..0000000
--- 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 (file)
index 8c95db7..0000000
--- a/debian/systemd.install
+++ /dev/null
@@ -1,4 +0,0 @@
-sbin
-lib
-bin
-etc/dbus-1/system.d/