[Pkg-xfce-commits] r4814 - desktop/branches/experimental/orage/debian

Yves-Alexis Perez corsac at alioth.debian.org
Mon Jan 17 02:29:21 UTC 2011


Author: corsac
Date: 2011-01-17 14:29:20 +0000 (Mon, 17 Jan 2011)
New Revision: 4814

Modified:
   desktop/branches/experimental/orage/debian/changelog
   desktop/branches/experimental/orage/debian/control
   desktop/branches/experimental/orage/debian/rules
Log:
switch to dh7


Modified: desktop/branches/experimental/orage/debian/changelog
===================================================================
--- desktop/branches/experimental/orage/debian/changelog	2011-01-17 13:05:35 UTC (rev 4813)
+++ desktop/branches/experimental/orage/debian/changelog	2011-01-17 14:29:20 UTC (rev 4814)
@@ -11,10 +11,10 @@
   * debian/rules:
     - update configure flags.
     - drop useless call to dh_desktop.
-    - run xdt-autogen after applying patches.
     - pick {C,LD}FLAGS from dpkg-buildflags.
     - add -O1, -z,defs and --as-needed to LDFLAGS.
     - add hardening flags to {C,LD}FLAGS.
+    - drop cdbs for dh with overrides.
   * debian/patches
     - 01-dont-duplicate dropped.
   * debian/copyright updated to include complete text of BSD license.
@@ -23,7 +23,7 @@
   [ Lionel Le Folgoc ]
   * debian/control: add myself to Uploaders.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Mon, 17 Jan 2011 14:04:24 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Mon, 17 Jan 2011 14:07:30 +0100
 
 orage (4.6.1-1) unstable; urgency=low
 

Modified: desktop/branches/experimental/orage/debian/control
===================================================================
--- desktop/branches/experimental/orage/debian/control	2011-01-17 13:05:35 UTC (rev 4813)
+++ desktop/branches/experimental/orage/debian/control	2011-01-17 14:29:20 UTC (rev 4814)
@@ -5,7 +5,7 @@
 Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>,
  Yves-Alexis Perez <corsac at debian.org>, Michael Casadevall <sonicmctails at gmail.com>,
  Lionel Le Folgoc <mrpouit at gmail.com>
-Build-Depends: debhelper (>= 7), cdbs, libxml-parser-perl,
+Build-Depends: debhelper (>= 7.0.50~), libxml-parser-perl,
  libgtk2.0-dev (>= 2.10.1), xfce4-panel-dev (>= 4.6.0), chrpath,
  libxfcegui4-dev (>= 4.6.0), libnotify-dev, libdbus-1-dev, intltool, 
  libdbus-1-dev, libical-dev, libpopt-dev, xfce4-dev-tools, libtool,

Modified: desktop/branches/experimental/orage/debian/rules
===================================================================
--- desktop/branches/experimental/orage/debian/rules	2011-01-17 13:05:35 UTC (rev 4813)
+++ desktop/branches/experimental/orage/debian/rules	2011-01-17 14:29:20 UTC (rev 4814)
@@ -1,12 +1,7 @@
 #!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-
 include /usr/share/hardening-includes/hardening.make
 
 
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-dbus --enable-libical
-
 LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
 CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
 LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed -Wl,-O1
@@ -14,6 +9,13 @@
 
 export CFLAGS LDFLAGS
 
-install/orage::
-	chrpath -d -k `pwd`/debian/orage/usr/bin/* \
-		`pwd`/debian/orage/usr/lib/orage/xfce4/*/*
+override_dh_auto_configure:
+	dh_auto_configure -- --enable-dbus --enable-libical
+
+override_dh_install:
+	chrpath -d -k $(CURDIR)/debian/orage/usr/bin/* \
+		$(CURDIR)/debian/orage/usr/lib/orage/xfce4/*/*
+	dh_install --fail-missing
+
+%:
+	dh $@




More information about the Pkg-xfce-commits mailing list