[Pkg-xfce-commits] r5254 - in goodies/trunk/xfce4-cellmodem-plugin: . debian

Sat Apr 2 03:06:00 UTC 2011

Author: corsac
Date: 2011-04-02 15:05:54 +0000 (Sat, 02 Apr 2011)
New Revision: 5254

Added:
   goodies/trunk/xfce4-cellmodem-plugin/debian/patches/
   goodies/trunk/xfce4-cellmodem-plugin/debian/source/
Modified:
   goodies/trunk/xfce4-cellmodem-plugin/
   goodies/trunk/xfce4-cellmodem-plugin/debian/changelog
   goodies/trunk/xfce4-cellmodem-plugin/debian/control
   goodies/trunk/xfce4-cellmodem-plugin/debian/rules
Log:
merge experimental branch into trunk



Property changes on: goodies/trunk/xfce4-cellmodem-plugin
___________________________________________________________________
Added: svn:mergeinfo
   + /goodies/branches/experimental/xfce4-cellmodem-plugin:4300-5253

Modified: goodies/trunk/xfce4-cellmodem-plugin/debian/changelog
===================================================================

--- goodies/trunk/xfce4-cellmodem-plugin/debian/changelog	2011-04-02 15:00:59 UTC (rev 5253)
+++ goodies/trunk/xfce4-cellmodem-plugin/debian/changelog	2011-04-02 15:05:54 UTC (rev 5254)
@@ -8,9 +8,30 @@
   * debian/watch edited to track Xfce archive reorganisation.
   * debian/control:
     - add myself to Uploaders.
+    - update debhelper build dep to 7.0.50~ for dh7 rules and overrides.
+    - add build-dep on libxfcegui4-dev.
+    - add build-dep on automake, autoconf, intltool and xfce4-dev-tools in 
+      order to run xdt-autogen after patching configure.ac/Makefile.am.
+    - add build-dep on hardening-includes.
+  * Switch to 3.0 (quilt) source format.
+  * Update standards version to 3.9.1.
+  * debian/rules:
+    - switch to dh 7 rules.
+    - run xdt-autogen before configure.
+    - add --as-needed to LDFLAGS.
+    - add hardening flags to {C,LD}FLAGS.
+  * debian/patches:
+    - 01_explicit-linking-to-libxfcegui4 and 02_typo-linking added, fix
+      linking with libxfcegui4 before port to Xfce 4.7 and libxfce4ui is done.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Mon, 03 Aug 2009 18:26:52 +0200
+  [ Lionel Le Folgoc ]
+  * debian/rules:
+    - pass NOCONFIGURE=1 to xdt-autogen, otherwise ./configure is run twice
+    - clean up generated files changed by xdt-autogen.
+  * debian/control: add myself to Uploaders.
 
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 17 Oct 2010 15:14:05 +0200
+
 xfce4-cellmodem-plugin (0.0.5-1) unstable; urgency=low
 
   * Initial release                                             closes: #477329

Modified: goodies/trunk/xfce4-cellmodem-plugin/debian/control
===================================================================
--- goodies/trunk/xfce4-cellmodem-plugin/debian/control	2011-04-02 15:00:59 UTC (rev 5253)
+++ goodies/trunk/xfce4-cellmodem-plugin/debian/control	2011-04-02 15:05:54 UTC (rev 5254)
@@ -3,9 +3,11 @@
 Priority: optional
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
 Uploaders: Evgeni Golov <evgeni at debian.org>, 
- Yves-Alexis Perez <corsac at debian.org>
-Build-Depends: debhelper (>= 5), autotools-dev, libpci-dev, libusb-dev, libxml-parser-perl, pkg-config, xfce4-panel-dev
-Standards-Version: 3.8.2
+ Yves-Alexis Perez <corsac at debian.org>, Lionel Le Folgoc <mrpouit at gmail.com>
+Build-Depends: debhelper (>= 7.0.50~), autotools-dev, libpci-dev, libusb-dev,
+ libxml-parser-perl, pkg-config, xfce4-panel-dev, libxfcegui4-dev,
+ intltool, automake, autoconf, xfce4-dev-tools, hardening-includes
+Standards-Version: 3.9.1
 Homepage: http://goodies.xfce.org/projects/panel-plugins/xfce4-cellmodem-plugin
 Vcs-Svn: svn://svn.debian.org/svn/pkg-xfce/goodies/trunk/xfce4-cellmodem-plugin/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-cellmodem-plugin/

Modified: goodies/trunk/xfce4-cellmodem-plugin/debian/rules
===================================================================
--- goodies/trunk/xfce4-cellmodem-plugin/debian/rules	2011-04-02 15:00:59 UTC (rev 5253)
+++ goodies/trunk/xfce4-cellmodem-plugin/debian/rules	2011-04-02 15:05:54 UTC (rev 5254)
@@ -1,83 +1,28 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/hardening-includes/hardening.make
 
+CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
+LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
+CFLAGS+=$(HARDENING_CFLAGS)
+LDFLAGS+=-Wl,-z,defs -Wl,--as-needed $(HARDENING_LDFLAGS)
 
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+export CFLAGS LDFLAGS
 
+override_dh_auto_configure:
+	NOCONFIGURE=1 xdt-autogen
+	echo panel-plugin/cellmodem.desktop.in.in >> po/POTFILES.skip
+	dh_auto_configure -- --mandir=\$${prefix}/share/man \
+		--infodir=\$${prefix}/share/info --libexecdir=\$${prefix}/lib
 
-config.status: configure
-	dh_testdir
-	# Add here commands to configure the package.
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess config.guess
-endif
-	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
-	--prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
-	--libexecdir=\$${prefix}/lib \
-	CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
+override_dh_auto_clean:
+	dh_auto_clean
+	
+	rm -f $$(find -name 'Makefile.in*')
+	rm -f INSTALL aclocal.m4 configure depcomp install-sh missing mkinstalldirs
+	rm -f config.h.in intltool-extract.in intltool-merge.in intltool-update.in
+	rm -f po/POTFILES.skip
 
-
-build: build-stamp
-
-build-stamp:  config.status
-	dh_testdir
-
-	# Add here commands to compile the package.
-	$(MAKE)
-
-	touch $@
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp 
-
-	# Add here commands to clean up after the build process.
-	[ ! -f Makefile ] || $(MAKE) distclean
-	rm -f config.sub config.guess
-
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-
-	# Add here commands to install the package into debian/xfce4-cellmodem-plugin.
-	$(MAKE) DESTDIR=$(CURDIR)/debian/xfce4-cellmodem-plugin install
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-	dh_installexamples
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+%:
+	dh $@


