r42593 - in /attic/libgksu/debian: changelog control control.in patches/04_automake.patch patches/28_ld_no_as_needed.patch patches/series rules
rbalint at users.alioth.debian.org
rbalint at users.alioth.debian.org
Sat Sep 6 18:03:03 UTC 2014
Author: rbalint
Date: Sat Sep 6 18:03:03 2014
New Revision: 42593
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=42593
Log:
Adding myself to uploaders
Convert packaging to Debhelper
Build-depend on dh-autoreconf
Regenerate makefile structure (Closes: #749167)
Added:
attic/libgksu/debian/patches/04_automake.patch
- copied, changed from r42563, attic/libgksu/debian/patches/28_ld_no_as_needed.patch
Removed:
attic/libgksu/debian/patches/28_ld_no_as_needed.patch
Modified:
attic/libgksu/debian/changelog
attic/libgksu/debian/control
attic/libgksu/debian/control.in
attic/libgksu/debian/patches/series
attic/libgksu/debian/rules
Modified: attic/libgksu/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libgksu/debian/changelog?rev=42593&op=diff
==============================================================================
--- attic/libgksu/debian/changelog [utf-8] (original)
+++ attic/libgksu/debian/changelog [utf-8] Sat Sep 6 18:03:03 2014
@@ -1,3 +1,12 @@
+libgksu (2.0.13~pre1-8) UNRELEASED; urgency=medium
+
+ * Adding myself to uploaders
+ * Convert packaging to Debhelper
+ * Build-depend on dh-autoreconf
+ * Regenerate makefile structure (Closes: #749167)
+
+ -- Balint Reczey <balint at balintreczey.hu> Sat, 06 Sep 2014 19:30:49 +0200
+
libgksu (2.0.13~pre1-7) unstable; urgency=low
[ Josselin Mouette ]
Modified: attic/libgksu/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libgksu/debian/control?rev=42593&op=diff
==============================================================================
--- attic/libgksu/debian/control [utf-8] (original)
+++ attic/libgksu/debian/control [utf-8] Sat Sep 6 18:03:03 2014
@@ -7,9 +7,10 @@
Section: admin
Priority: optional
Maintainer: Gustavo Noronha Silva <kov at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Martin Pitt <mpitt at debian.org>, Michael Biebl <biebl at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Martin Pitt <mpitt at debian.org>, Michael Biebl <biebl at debian.org>, Balint Reczey <balint at balintreczey.hu>
Build-Depends: cdbs,
debhelper (>= 8),
+ dh-autoreconf,
libgtk2.0-dev (>= 2.12),
libgconf2-dev,
libstartup-notification0-dev,
Modified: attic/libgksu/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libgksu/debian/control.in?rev=42593&op=diff
==============================================================================
--- attic/libgksu/debian/control.in [utf-8] (original)
+++ attic/libgksu/debian/control.in [utf-8] Sat Sep 6 18:03:03 2014
@@ -2,9 +2,10 @@
Section: admin
Priority: optional
Maintainer: Gustavo Noronha Silva <kov at debian.org>
-Uploaders: @GNOME_TEAM@
+Uploaders: @GNOME_TEAM@, Balint Reczey <balint at balintreczey.hu>
Build-Depends: cdbs,
debhelper (>= 8),
+ dh-autoreconf,
libgtk2.0-dev (>= 2.12),
libgconf2-dev,
libstartup-notification0-dev,
Copied: attic/libgksu/debian/patches/04_automake.patch (from r42563, attic/libgksu/debian/patches/28_ld_no_as_needed.patch)
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libgksu/debian/patches/04_automake.patch?rev=42593&op=diff
==============================================================================
--- attic/libgksu/debian/patches/28_ld_no_as_needed.patch [utf-8] (original)
+++ attic/libgksu/debian/patches/04_automake.patch [utf-8] Sat Sep 6 18:03:03 2014
@@ -1,117 +1,37 @@
-Description: Fix build failures with binutils-gold
-Author: Matthias Klose <doko at ubuntu.com>
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=555180
-Index: libgksu-2.0.12/libgksuui/Makefile.in
-===================================================================
---- libgksu-2.0.12.orig/libgksuui/Makefile.in 2009-08-16 23:20:32.000000000 +0200
-+++ libgksu-2.0.12/libgksuui/Makefile.in 2011-10-24 02:14:08.139984529 +0200
-@@ -46,7 +46,8 @@
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- LTLIBRARIES = $(noinst_LTLIBRARIES)
--libgksuui1_0_la_LIBADD =
-+libgksuui1_0_la_LIBADD = `pkg-config --libs gtk+-2.0 gconf-2.0 x11`
-+libgksuui1_0_la_LDFLAGS = -Wl,-O1
- am_libgksuui1_0_la_OBJECTS = gksuui-dialog.lo
- libgksuui1_0_la_OBJECTS = $(am_libgksuui1_0_la_OBJECTS)
- libgksuui1_0_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-@@ -56,6 +57,7 @@
- am_test_gksuui_OBJECTS = test-gksuui.$(OBJEXT)
- test_gksuui_OBJECTS = $(am_test_gksuui_OBJECTS)
- test_gksuui_DEPENDENCIES = libgksuui1.0.la
-+test_gksuui_LDADD = libgksuui1.0.la `pkg-config --libs glib-2.0 x11`
- test_gksuui_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(test_gksuui_LDFLAGS) $(LDFLAGS) -o $@
-@@ -233,7 +235,7 @@
+Description: Fix build failures with latest autotools
+Author: Balint Reczey <balint at balintreczey.hu>
+--- a/libgksuui/Makefile.am
++++ b/libgksuui/Makefile.am
+@@ -4,7 +4,7 @@
+
+ noinst_LTLIBRARIES = libgksuui1.0.la
+ libgksuui1_0_la_SOURCES = gksuui-dialog.c
+-libgksuui1_0_la_LDFLAGS = -Wl,-O1 `pkg-config --libs gtk+-2.0 gconf-2.0`
++libgksuui1_0_la_LDFLAGS = -Wl,-O1 `pkg-config --libs gtk+-2.0 gconf-2.0 x11`
+
noinst_HEADERS = defines.h gksuui.h gksuui-dialog.h
+ includedir = ${prefix}/include/$(PACKAGE)
+@@ -12,4 +12,4 @@
+ noinst_PROGRAMS = test-gksuui
test_gksuui_SOURCES = test-gksuui.c
test_gksuui_LDADD = libgksuui1.0.la
-test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0`
+test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0 x11`
- all: all-am
-
- .SUFFIXES:
-Index: libgksu-2.0.12/libgksuui/Makefile.am
-===================================================================
---- libgksu-2.0.12.orig/libgksuui/Makefile.am 2008-05-09 19:39:54.000000000 +0200
-+++ libgksu-2.0.12/libgksuui/Makefile.am 2011-10-24 02:14:08.139984529 +0200
-@@ -4,12 +4,13 @@
-
- noinst_LTLIBRARIES = libgksuui1.0.la
- libgksuui1_0_la_SOURCES = gksuui-dialog.c
--libgksuui1_0_la_LDFLAGS = -Wl,-O1 `pkg-config --libs gtk+-2.0 gconf-2.0`
-+libgksuui1_0_la_LDFLAGS = -Wl,-O1
-+libgksuui1_0_la_LIBADD = `pkg-config --libs gtk+-2.0 gconf-2.0 x11`
-
- noinst_HEADERS = defines.h gksuui.h gksuui-dialog.h
- includedir = ${prefix}/include/$(PACKAGE)
-
- noinst_PROGRAMS = test-gksuui
- test_gksuui_SOURCES = test-gksuui.c
--test_gksuui_LDADD = libgksuui1.0.la
--test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0`
-+test_gksuui_LDADD = libgksuui1.0.la `pkg-config --libs glib-2.0 x11`
-+test_gksuui_LDFLAGS =
-Index: libgksu-2.0.12/libgksu/Makefile.in
-===================================================================
---- libgksu-2.0.12.orig/libgksu/Makefile.in 2009-08-16 23:20:32.000000000 +0200
-+++ libgksu-2.0.12/libgksu/Makefile.in 2011-10-24 02:14:08.147984429 +0200
-@@ -261,18 +261,19 @@
- # major -> breaks backward compatibility (changes to existing ABI)
- # minor -> keeps compatibility (additions to the API)
- # micro -> no change to the API/ABI
--libgksu2_la_LIBADD = ../libgksuui/libgksuui1.0.la
--libgksu2_la_LDFLAGS = -version-info 0:2:0 -Wl,-O1 -lutil \
-- ${LIBGKSU_LIBS} $(am__append_2)
-+libgksu2_la_LIBADD = ../libgksuui/libgksuui1.0.la -lutil ${LIBGKSU_LIBS}
-+libgksu2_la_LDFLAGS = -version-info 0:2:0 -Wl,-O1 \
-+ $(am__append_2)
- noinst_HEADERS = defines.h
- include_HEADERS = gksu.h libgksu.h
- pkgconfigdir = ${libdir}/pkgconfig
+--- a/libgksu/Makefile.am
++++ b/libgksu/Makefile.am
+@@ -27,13 +27,13 @@
pkgconfig_DATA = libgksu2.pc
--gksu_run_helper_LDFLAGS = `pkg-config --libs glib-2.0`
-+gksu_run_helper_LDFLAGS =
-+gksu_run_helper_LDADD = `pkg-config --libs glib-2.0`
- gksu_run_helper_SOURCES = gksu-run-helper.c
- test_gksu_SOURCES = test-gksu.c
--test_gksu_LDADD = libgksu2.la
--test_gksu_LDFLAGS = `pkg-config --libs glib-2.0`
-+test_gksu_LDADD = libgksu2.la `pkg-config --libs gtk+-2.0`
-+test_gksu_LDFLAGS =
- EXTRA_DIST = libgksu.ver
- all: all-am
-
-Index: libgksu-2.0.12/libgksu/Makefile.am
-===================================================================
---- libgksu-2.0.12.orig/libgksu/Makefile.am 2009-08-16 23:20:16.000000000 +0200
-+++ libgksu-2.0.12/libgksu/Makefile.am 2011-10-24 02:14:08.155984327 +0200
-@@ -12,8 +12,8 @@
- # major -> breaks backward compatibility (changes to existing ABI)
- # minor -> keeps compatibility (additions to the API)
- # micro -> no change to the API/ABI
--libgksu2_la_LIBADD = ../libgksuui/libgksuui1.0.la
--libgksu2_la_LDFLAGS = -version-info 0:2:0 -Wl,-O1 -lutil ${LIBGKSU_LIBS}
-+libgksu2_la_LIBADD = ../libgksuui/libgksuui1.0.la -lutil ${LIBGKSU_LIBS}
-+libgksu2_la_LDFLAGS = -version-info 0:2:0 -Wl,-O1
- if USE_VERSION_SCRIPT
- libgksu2_la_LDFLAGS += -Wl,--version-script=libgksu.ver
- endif
-@@ -28,12 +28,13 @@
pkglibdir = ${libdir}/${PACKAGE}
- pkglib_PROGRAMS = gksu-run-helper
--gksu_run_helper_LDFLAGS = `pkg-config --libs glib-2.0`
-+gksu_run_helper_LDFLAGS =
-+gksu_run_helper_LDADD = `pkg-config --libs glib-2.0`
+-pkglib_PROGRAMS = gksu-run-helper
++pkglibexec_PROGRAMS = gksu-run-helper
+ gksu_run_helper_LDFLAGS = `pkg-config --libs glib-2.0`
gksu_run_helper_SOURCES = gksu-run-helper.c
noinst_PROGRAMS = test-gksu
test_gksu_SOURCES = test-gksu.c
--test_gksu_LDADD = libgksu2.la
+ test_gksu_LDADD = libgksu2.la
-test_gksu_LDFLAGS = `pkg-config --libs glib-2.0`
-+test_gksu_LDADD = libgksu2.la `pkg-config --libs gtk+-2.0`
-+test_gksu_LDFLAGS =
++test_gksu_LDFLAGS = `pkg-config --libs glib-2.0 gtk+-2.0`
EXTRA_DIST = libgksu.ver
Modified: attic/libgksu/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libgksu/debian/patches/series?rev=42593&op=diff
==============================================================================
--- attic/libgksu/debian/patches/series [utf-8] (original)
+++ attic/libgksu/debian/patches/series [utf-8] Sat Sep 6 18:03:03 2014
@@ -1,5 +1,5 @@
01_tcdrain_kfreebsd.patch
02_format-security.patch
03_makefile_spaces.patch
-28_ld_no_as_needed.patch
+04_automake.patch
99_intltool.patch
Modified: attic/libgksu/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libgksu/debian/rules?rev=42593&op=diff
==============================================================================
--- attic/libgksu/debian/rules [utf-8] (original)
+++ attic/libgksu/debian/rules [utf-8] Sat Sep 6 18:03:03 2014
@@ -1,25 +1,11 @@
#!/usr/bin/make -f
-GNOME_DOWNLOAD_URL = http://people.debian.org/~kov/gksu/$(GNOME_TARBALL)
+DEB_CONFIGURE_EXTRA_FLAGS := --disable-gtk-doc --enable-gnome-keyring
+DEB_CONFIGURE_LIBEXECDIR = "\$${prefix}/lib"
-ALLOWED_DISTS += unstable
+%:
+ dh $@ --with autoreconf
-include /usr/share/cdbs/1/rules/buildcore.mk
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/gnome.mk
--include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
-include /usr/share/gnome-pkg-tools/1/rules/check-dist.mk
-include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
-
-DEB_CONFIGURE_EXTRA_FLAGS := --disable-gtk-doc --enable-gnome-keyring
-
-clean::
- -test -d po.old && (rm -rf po; mv po.old po)
-
-post-patches::
- if ! test -d po.old; then \
- cp -a po po.old; \
- cp -a debian/pos/* po/; \
- rm po/*gmo po/stamp-po || true; \
- fi
+override_dh_autoreconf:
+ touch NEWS README
+ dh_autoreconf
More information about the pkg-gnome-commits
mailing list