[Pkg-xfce-commits] r5345 - in desktop/trunk/xfprint4/debian: . patches
Yves-Alexis Perez
corsac at alioth.debian.org
Sun Apr 3 02:32:18 UTC 2011
Author: corsac
Date: 2011-04-03 14:32:12 +0000 (Sun, 03 Apr 2011)
New Revision: 5345
Added:
desktop/trunk/xfprint4/debian/docs
desktop/trunk/xfprint4/debian/patches/05_fix-g_print-format.patch
desktop/trunk/xfprint4/debian/xfprint4.lintian-overrides
desktop/trunk/xfprint4/debian/xfprint4.manpages
Removed:
desktop/trunk/xfprint4/debian/lintian
Modified:
desktop/trunk/xfprint4/debian/changelog
desktop/trunk/xfprint4/debian/control
desktop/trunk/xfprint4/debian/patches/series
desktop/trunk/xfprint4/debian/rules
Log:
- add build-deps on hardening-includes.
* debian/rules:
- switch to dh7 tiny rules.
- pick build flags from dpkg-buildflags.
- add -O1, -z,defs and --as-needed to LDFLAGS.
- add hardening flags to {C,LD}FLAGS.
* debian/patches:
- 05_fix-g_print-format added, fix g_print() call without format.
Modified: desktop/trunk/xfprint4/debian/changelog
===================================================================
--- desktop/trunk/xfprint4/debian/changelog 2011-04-03 13:42:57 UTC (rev 5344)
+++ desktop/trunk/xfprint4/debian/changelog 2011-04-03 14:32:12 UTC (rev 5345)
@@ -14,9 +14,17 @@
* debian/control:
- drop Emanuele and Simon from uploaders, thanks to them.
- update standards version to 3.9.1.
+ - add build-deps on hardening-includes.
* Switch to 3.0 (quilt) source format.
+ * debian/rules:
+ - switch to dh7 tiny rules.
+ - pick build flags from dpkg-buildflags.
+ - add -O1, -z,defs and --as-needed to LDFLAGS.
+ - add hardening flags to {C,LD}FLAGS.
+ * debian/patches:
+ - 05_fix-g_print-format added, fix g_print() call without format.
- -- Yves-Alexis Perez <corsac at debian.org> Sun, 03 Apr 2011 15:42:44 +0200
+ -- Yves-Alexis Perez <corsac at debian.org> Sun, 03 Apr 2011 16:19:52 +0200
xfprint4 (4.6.1-1) unstable; urgency=low
Modified: desktop/trunk/xfprint4/debian/control
===================================================================
--- desktop/trunk/xfprint4/debian/control 2011-04-03 13:42:57 UTC (rev 5344)
+++ desktop/trunk/xfprint4/debian/control 2011-04-03 14:32:12 UTC (rev 5345)
@@ -6,7 +6,7 @@
Lionel Le Folgoc <mrpouit at gmail.com>
Build-Depends: debhelper (>= 7), libgtk2.0-dev (>= 2.10.6), libxft-dev,
a2ps, lpr, libcups2-dev, chrpath, sharutils, quilt,
- libxfcegui4-dev (>= 4.6.0), libxfconf-0-dev, intltool
+ libxfcegui4-dev (>= 4.6.0), libxfconf-0-dev, intltool, hardening-includes
Standards-Version: 3.9.1
Homepage: http://www.xfce.org/
Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfprint4/
Added: desktop/trunk/xfprint4/debian/docs
===================================================================
--- desktop/trunk/xfprint4/debian/docs (rev 0)
+++ desktop/trunk/xfprint4/debian/docs 2011-04-03 14:32:12 UTC (rev 5345)
@@ -0,0 +1 @@
+README
Deleted: desktop/trunk/xfprint4/debian/lintian
===================================================================
--- desktop/trunk/xfprint4/debian/lintian 2011-04-03 13:42:57 UTC (rev 5344)
+++ desktop/trunk/xfprint4/debian/lintian 2011-04-03 14:32:12 UTC (rev 5345)
@@ -1,2 +0,0 @@
-#xfprint4 includes its library
-xfprint4: package-name-doesnt-match-sonames libxfprint0
Added: desktop/trunk/xfprint4/debian/patches/05_fix-g_print-format.patch
===================================================================
--- desktop/trunk/xfprint4/debian/patches/05_fix-g_print-format.patch (rev 0)
+++ desktop/trunk/xfprint4/debian/patches/05_fix-g_print-format.patch 2011-04-03 14:32:12 UTC (rev 5345)
@@ -0,0 +1,13 @@
+diff --git a/xfprint/xfprintsettings.c b/xfprint/xfprintsettings.c
+index e01b5e8..8ccc5e2 100644
+--- a/xfprint/xfprintsettings.c
++++ b/xfprint/xfprintsettings.c
+@@ -495,7 +495,7 @@ load_settings_from_file(const gchar *filename, XfprintSettings *settings)
+ ctx = g_markup_parse_context_new(&markup_parser, 0, &parser, NULL);
+
+ if (!g_markup_parse_context_parse(ctx, contents, sb.st_size, &error)) {
+- g_print(error->message);
++ g_print("%s", error->message);
+ goto finished3;
+ }
+
Modified: desktop/trunk/xfprint4/debian/patches/series
===================================================================
--- desktop/trunk/xfprint4/debian/patches/series 2011-04-03 13:42:57 UTC (rev 5344)
+++ desktop/trunk/xfprint4/debian/patches/series 2011-04-03 14:32:12 UTC (rev 5345)
@@ -2,3 +2,4 @@
02_refresh-new-settings.patch
03_fix-wl-as-needed.patch
04_fix-implicit-dso-linking.patch
+05_fix-g_print-format.patch
Modified: desktop/trunk/xfprint4/debian/rules
===================================================================
--- desktop/trunk/xfprint4/debian/rules 2011-04-03 13:42:57 UTC (rev 5344)
+++ desktop/trunk/xfprint4/debian/rules 2011-04-03 14:32:12 UTC (rev 5345)
@@ -1,95 +1,35 @@
#!/usr/bin/make -f
-include /usr/share/quilt/quilt.make
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+include /usr/share/hardening-includes/hardening.make
-LDFLAGS+=-Wl,-z,defs -Wl,--as-needed
-CFLAGS = -Wall -g
+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)
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
+export CFLAGS LDFLAGS
-config.status: patch configure
-
- dh_testdir
- ./configure \
- --host=$(DEB_HOST_GNU_TYPE) \
- --build=$(DEB_BUILD_GNU_TYPE) \
- --prefix=/usr \
- --mandir=\$${prefix}/share/man \
- --sysconfdir=/etc \
- --enable-final
+override_dh_auto_configure:
+ dh_auto_configure
+ find .pc -type f -name '*.c' -exec echo '{}' >> po/POTFILES.skip \;
-build: build-stamp
-build-stamp: config.status
+override_dh_auto_clean:
+ rm -f po/POTFILES.skip
+ dh_auto_clean
- dh_testdir
- $(MAKE)
- touch build-stamp
+override_dh_install:
+ rm -f debian/xfprint4/usr/lib/libxfprint.so
-clean: unpatch
-
- dh_testdir
- dh_testroot
- rm -f build-stamp
+ rm -f debian/xfprint4/usr/lib/xfce4/*plugins/*.a
+ rm -f debian/xfprint4/usr/lib/xfce4/*plugins/*.la
+ rm -f debian/xfprint4/usr/lib/*.la
- [ ! -f Makefile ] || $(MAKE) distclean
-
- dh_clean
+ chrpath -d -k debian/xfprint4/usr/lib/*.so.* \
+ debian/xfprint4/usr/bin/* \
+ debian/xfprint4/usr/lib/xfce4/xfprint-plugins/*
-install: build
-
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs
-
- $(MAKE) install DESTDIR=`pwd`/debian/xfprint4
-
- rm -f `pwd`/debian/xfprint4/usr/lib/libxfprint.so
-
- rm -f `pwd`/debian/xfprint4/usr/lib/xfce4/*plugins/*.a
- rm -f `pwd`/debian/xfprint4/usr/lib/xfce4/*plugins/*.la
- rm -f `pwd`/debian/xfprint4/usr/lib/*.la
-
- install -d `pwd`/debian/xfprint4/usr/share/man/man1
- install `pwd`/debian/xfprint4.1 `pwd`/debian/xfprint4/usr/share/man/man1
- install `pwd`/debian/xfprint4-manager.1 `pwd`/debian/xfprint4/usr/share/man/man1
-
- install -D -p -o root -g root -m 644 `pwd`/debian/lintian \
- `pwd`/debian/xfprint4/usr/share/lintian/overrides/xfprint4
-
- chrpath -d -k `pwd`/debian/xfprint4/usr/lib/*.so.* \
- `pwd`/debian/xfprint4/usr/bin/* \
- `pwd`/debian/xfprint4/usr/lib/xfce4/xfprint-plugins/*
-
-binary-indep: build install
-binary-arch: build install
-
- dh_testdir
- dh_testroot
-
- dh_installchangelogs ChangeLog
- dh_installdocs README
-
- dh_strip
- dh_compress
-
- dh_installmenu
- dh_makeshlibs
-
- dh_fixperms
- dh_installdeb
-
+override_dh_shlibdeps:
dh_shlibdeps -l`pwd`/debian/xfprint4/usr/lib/
- dh_gencontrol
-
- dh_md5sums
- dh_builddeb
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install patch unpatch
+%:
+ dh $@
Copied: desktop/trunk/xfprint4/debian/xfprint4.lintian-overrides (from rev 5328, desktop/trunk/xfprint4/debian/lintian)
===================================================================
--- desktop/trunk/xfprint4/debian/xfprint4.lintian-overrides (rev 0)
+++ desktop/trunk/xfprint4/debian/xfprint4.lintian-overrides 2011-04-03 14:32:12 UTC (rev 5345)
@@ -0,0 +1,2 @@
+#xfprint4 includes its library
+xfprint4: package-name-doesnt-match-sonames libxfprint0
Added: desktop/trunk/xfprint4/debian/xfprint4.manpages
===================================================================
--- desktop/trunk/xfprint4/debian/xfprint4.manpages (rev 0)
+++ desktop/trunk/xfprint4/debian/xfprint4.manpages 2011-04-03 14:32:12 UTC (rev 5345)
@@ -0,0 +1,2 @@
+debian/xfprint4-manager.1
+debian/xfprint4.1
More information about the Pkg-xfce-commits
mailing list