[Pkg-xfce-commits] r5430 - desktop/trunk/mousepad/debian

Tue Apr 19 03:42:59 UTC 2011

Author: corsac
Date: 2011-04-19 15:42:58 +0000 (Tue, 19 Apr 2011)
New Revision: 5430

Added:
   desktop/trunk/mousepad/debian/mousepad.1
   desktop/trunk/mousepad/debian/mousepad.manpages
Modified:
   desktop/trunk/mousepad/debian/changelog
   desktop/trunk/mousepad/debian/control
   desktop/trunk/mousepad/debian/mousepad.sgml
   desktop/trunk/mousepad/debian/rules
Log:
  - update debhelper build-dep because of overrides.
  - add build-dep on hardening-includes.
	- switch to dh7 tiny rules.
	- pick build-flags from dpkg-buildflags
  - add hardening flags to build flags.

Modified: desktop/trunk/mousepad/debian/changelog
===================================================================

--- desktop/trunk/mousepad/debian/changelog	2011-04-19 15:42:18 UTC (rev 5429)
+++ desktop/trunk/mousepad/debian/changelog	2011-04-19 15:42:58 UTC (rev 5430)
@@ -3,11 +3,16 @@
   * debian/control:
     - update section to editors.
     - update standards version to 3.9.2.
+    - update debhelper build-dep because of overrides.
+    - add build-dep on hardening-includes.
   * Switch to 3.0 (quilt) source format.
   * debian/rules:
     - drop quilt stuff.
+  	- switch to dh7 tiny rules.
+  	- pick build-flags from dpkg-buildflags
+    - add hardening flags to build flags.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Tue, 19 Apr 2011 17:26:08 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Tue, 19 Apr 2011 17:35:11 +0200
 
 mousepad (0.2.16-4) unstable; urgency=low
 

Modified: desktop/trunk/mousepad/debian/control
===================================================================
--- desktop/trunk/mousepad/debian/control	2011-04-19 15:42:18 UTC (rev 5429)
+++ desktop/trunk/mousepad/debian/control	2011-04-19 15:42:58 UTC (rev 5430)
@@ -4,8 +4,9 @@
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
 Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, 
  Yves-Alexis Perez <corsac at debian.org>
-Build-Depends: debhelper (>= 7), docbook-to-man, 
- libxfcegui4-dev (>= 4.6.0), pkg-config, libxml-parser-perl, chrpath, intltool,
+Build-Depends: debhelper (>= 7.0.50~), 
+ libxfcegui4-dev (>= 4.6.0), pkg-config, libxml-parser-perl, intltool,
+ hardening-includes
 Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/mousepad/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/mousepad/

Added: desktop/trunk/mousepad/debian/mousepad.1
===================================================================
--- desktop/trunk/mousepad/debian/mousepad.1	                        (rev 0)
+++ desktop/trunk/mousepad/debian/mousepad.1	2011-04-19 15:42:58 UTC (rev 5430)
@@ -0,0 +1,31 @@
+.TH "MOUSEPAD" "1" 
+.SH "NAME" 
+mousepad \(em simple text editor for Xfce 
+.SH "SYNOPSIS" 
+.PP 
+\fBmousepad\fR\ [files] 
+ 
+.SH "DESCRIPTION" 
+.PP 
+This manual page documents briefly the 
+\fBmousepad\fR command. 
+.PP 
+\fBmousepad\fR is a simple text 
+editor for the Xfce Desktop Environment. 
+ 
+.SH "SEE ALSO" 
+.PP 
+xfprint4 (1). 
+.SH "AUTHOR" 
+.PP 
+This manual page was written by Yves-Alexis Perez <corsac at debian.org> for 
+the \fBDebian\fP system (but may be used by others).  Permission is 
+granted to copy, distribute and/or modify this document under 
+the terms of the GNU General Public License, Version 2 any  
+later version published by the Free Software Foundation. 
+ 
+.PP 
+On Debian systems, the complete text of the GNU General Public 
+License can be found in /usr/share/common-licenses/GPL. 
+ 
+.\" created by instant / docbook-to-man, Tue 19 Apr 2011, 17:31 

Added: desktop/trunk/mousepad/debian/mousepad.manpages
===================================================================
--- desktop/trunk/mousepad/debian/mousepad.manpages	                        (rev 0)
+++ desktop/trunk/mousepad/debian/mousepad.manpages	2011-04-19 15:42:58 UTC (rev 5430)
@@ -0,0 +1 @@
+debian/mousepad.1

Modified: desktop/trunk/mousepad/debian/mousepad.sgml
===================================================================
--- desktop/trunk/mousepad/debian/mousepad.sgml	2011-04-19 15:42:18 UTC (rev 5429)
+++ desktop/trunk/mousepad/debian/mousepad.sgml	2011-04-19 15:42:58 UTC (rev 5430)
@@ -20,11 +20,11 @@
   <!ENTITY dhfirstname "<firstname>Yves-Alexis</firstname>">
   <!ENTITY dhsurname   "<surname>Perez</surname>">
   <!-- Please adjust the date whenever revising the manpage. -->
-  <!ENTITY dhdate      "<date>May 27, 2007</date>">
+  <!ENTITY dhdate      "<date>Apr 19, 2011</date>">
   <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
        allowed: see man(7), man(1). -->
   <!ENTITY dhsection   "<manvolnum>1</manvolnum>">
-  <!ENTITY dhemail     "<email>corsac at corsac.net</email>">
+  <!ENTITY dhemail     "<email>corsac at debian.org</email>">
   <!ENTITY dhusername  "Yves-Alexis Perez">
   <!ENTITY dhucpackage "<refentrytitle>MOUSEPAD</refentrytitle>">
   <!ENTITY dhpackage   "mousepad">

Modified: desktop/trunk/mousepad/debian/rules
===================================================================
--- desktop/trunk/mousepad/debian/rules	2011-04-19 15:42:18 UTC (rev 5429)
+++ desktop/trunk/mousepad/debian/rules	2011-04-19 15:42:58 UTC (rev 5430)
@@ -1,85 +1,27 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
+include /usr/share/hardening-includes/hardening.make
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
+LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
+LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed -Wl,-O1
+CFLAGS+=$(HARDENING_CFLAGS)
 
-# 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
 
-LDFLAGS+=-Wl,-z,defs -Wl,--as-needed
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
-config.status: configure
-	dh_testdir
-	# Add here commands to configure the package.
-	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --sysconfdir=/etc --enable-final
-
-
-build: build-stamp
-
-build-stamp:  config.status
-	dh_testdir
-
-	# Add here commands to compile the package.
-	$(MAKE)
-	docbook-to-man debian/mousepad.sgml > mousepad.1
-
-	touch build-stamp
-
-clean: 
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp mousepad.1
-
-	# Add here commands to clean up after the build process.
-	[ ! -f Makefile ] || $(MAKE) distclean
-
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-
-	# Add here commands to install the package into debian/mousepad.
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/mousepad
+override_dh_install:
+	# install menu pixmap
 	install -D -m 644 $(CURDIR)/debian/mousepad.xpm \
 		$(CURDIR)/debian/mousepad/usr/share/pixmaps/mousepad.xpm
+	dh_install
 
-	chrpath -d -k $(CURDIR)/debian/mousepad/usr/bin/mousepad
+override_dh_auto_configure:
+	dh_auto_configure
+	find .pc -type f -name '*.c' -exec echo '{}' >> po/POTFILES.skip \;
 
+override_dh_auto_clean:
+	rm -f po/POTFILES.skip
+	dh_auto_clean
 
-# 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_installmenu
-	dh_installman mousepad.1
-	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 $@


