r10682 - in /desktop/unstable/seahorse/debian: changelog control.in
rules
lool at users.alioth.debian.org
lool at users.alioth.debian.org
Wed May 2 06:34:22 UTC 2007
Author: lool
Date: Wed May 2 06:34:21 2007
New Revision: 10682
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=10682
Log:
* Cleanups.
* Wrap build-deps and deps.
Modified:
desktop/unstable/seahorse/debian/changelog
desktop/unstable/seahorse/debian/control.in
desktop/unstable/seahorse/debian/rules
Modified: desktop/unstable/seahorse/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/changelog?rev=10682&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/changelog (original)
+++ desktop/unstable/seahorse/debian/changelog Wed May 2 06:34:21 2007
@@ -1,12 +1,17 @@
seahorse (1.0.1-4) UNRELEASED; urgency=low
+ [ Sebastian Dröge ]
* NOT RELEASED YET
* debian/control,
debian/control.in,
debian/rules:
+ Put @GNOME_TEAM@ in Uploaders and include the required stuff in rules.
- -- Sebastian Dröge <slomo at debian.org> Tue, 1 May 2007 23:38:06 +0200
+ [ Loic Minier ]
+ * Cleanups.
+ * Wrap build-deps and deps.
+
+ -- Loic Minier <lool at dooz.org> Wed, 02 May 2007 08:34:10 +0200
seahorse (1.0.1-3) unstable; urgency=low
Modified: desktop/unstable/seahorse/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/control.in?rev=10682&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/control.in (original)
+++ desktop/unstable/seahorse/debian/control.in Wed May 2 06:34:21 2007
@@ -3,13 +3,38 @@
Priority: optional
Maintainer: Jose Carlos Garcia Sogo <jsogo at debian.org>
Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper (>= 5), libgnome2-dev (>= 2.14.0), libglade2-dev, libgnomeui-dev (>= 2.10.0), scrollkeeper, libgpgme11-dev, autotools-dev, dpatch, libxml-parser-perl, gedit-dev (>= 2.10.0), libsoup2.2-dev, libldap2-dev, libnautilus-extension-dev (>= 2.9.0), libnotify-dev, libpanel-applet2-dev (>= 2.9.4), libavahi-glib-dev, libdbus-glib-1-dev, gnome-doc-utils, libgnome-keyring-dev, libglib2.0-dev (>= 2.10.0), libgtk2.0-dev (>= 2.10.0), epiphany-browser-dev (>= 2.14), libxml2-dev (>= 2.6.0), libxul-dev (>= 1.8), gnome-pkg-tools
+Build-Depends: debhelper (>= 5),
+ libgnome2-dev (>= 2.14.0),
+ libglade2-dev,
+ libgnomeui-dev (>= 2.10.0),
+ scrollkeeper,
+ libgpgme11-dev,
+ autotools-dev,
+ dpatch,
+ libxml-parser-perl,
+ gedit-dev (>= 2.10.0),
+ libsoup2.2-dev,
+ libldap2-dev,
+ libnautilus-extension-dev (>= 2.9.0),
+ libnotify-dev,
+ libpanel-applet2-dev (>= 2.9.4),
+ libavahi-glib-dev,
+ libdbus-glib-1-dev,
+ gnome-doc-utils,
+ libgnome-keyring-dev,
+ libglib2.0-dev (>= 2.10.0),
+ libgtk2.0-dev (>= 2.10.0),
+ epiphany-browser-dev (>= 2.14),
+ libxml2-dev (>= 2.6.0),
+ libxul-dev (>= 1.8),
+ gnome-pkg-tools
Build-Conflicts: gnupg2
Standards-Version: 3.7.2
Package: seahorse
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
Recommends: openssh-client
Conflicts: gnupg-agent
Description: A Gnome front end for GnuPG
Modified: desktop/unstable/seahorse/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/rules?rev=10682&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/rules (original)
+++ desktop/unstable/seahorse/debian/rules Wed May 2 06:34:21 2007
@@ -1,31 +1,24 @@
#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-# Modified for Seahorse
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
# C compiler information
-CC = gcc
-CFLAGS = -Wall -g
-LDFLAGS = -Wl,-O1
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
+CC = gcc
+CFLAGS = -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
+LDFLAGS = -Wl,-O1
export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
+
+confflags += --prefix=/usr \
+ --sysconfdir=/etc \
+ --disable-update-mime-database \
+ --disable-schemas-install \
+ --disable-scrollkeeper
+
ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
confflags += --build $(DEB_HOST_GNU_TYPE)
else
confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
endif
-
include /usr/share/dpatch/dpatch.make
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
@@ -33,7 +26,8 @@
# The autotools target is used to get the latest version of config.[guess,sub]
# files. This should avoid autobuild errors, but adds a Build-Dependency
# in autotools-dev
-autotools:
+autotools: autotools-stamp
+autotools-stamp: autotools
-if [ -f config.sub.old ]; then \
rm -f config.sub; \
else \
@@ -46,27 +40,20 @@
fi
ln -s /usr/share/misc/config.sub config.sub
ln -s /usr/share/misc/config.guess config.guess
-
- touch autotools
+ touch $@
configure: patch-stamp configure-stamp
-configure-stamp: autotools
+configure-stamp: autotools-stamp
dh_testdir
-
CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
- ./configure $(confflags) --prefix=/usr --sysconfdir=/etc \
- --disable-update-mime-database --disable-schemas-install \
- --disable-scrollkeeper
-
- touch configure-stamp
+ ./configure $(confflags)
+ touch $@
build: build-stamp
-build-stamp: configure
+build-stamp: configure-stamp
dh_testdir
-
$(MAKE)
-
- touch build-stamp
+ touch $@
clean:: unpatch
dh_testdir
@@ -74,21 +61,16 @@
rm -f build-stamp
rm -f configure-stamp
rm -f autotools
-
-$(MAKE) distclean
-
-rm -f config.log
-rm -rf debian/seahorse
-
-if [ -f config.sub.old ]; then \
mv config.sub.old config.sub; \
fi
-if [ -f config.guess.old ]; then \
mv config.guess.old config.guess; \
fi
-
-rm -rf debian/patched
-
dh_clean
install: build
@@ -96,15 +78,11 @@
dh_testroot
dh_clean -k
dh_installdirs
-
$(MAKE) install DESTDIR=$(CURDIR)/debian/seahorse
-
mkdir -p $(CURDIR)/debian/seahorse/etc/X11/Xsession.d
cp debian/seahorse.Xsession $(CURDIR)/debian/seahorse/etc/X11/Xsession.d/60seahorse
-
# Remove mime-type catalog, it's in shared-mime-info since 0.20
rm -f debian/seahorse/usr/share/mime/packages/seahorse.xml
-
# Remove library link
rm -f debian/seahorse/usr/lib/*.so
rm -rf debian/seahorse/usr/include
@@ -117,7 +95,6 @@
binary-arch: build install
dh_testdir
dh_testroot
-
dh_install
dh_installdocs NEWS README TODO debian/NEWS.Debian
dh_installmenu
@@ -139,5 +116,4 @@
binary: binary-indep binary-arch
-.PHONY: configure build clean binary-indep binary-arch binary install
-
+.PHONY: autotools configure build install clean binary-indep binary-arch binary
More information about the pkg-gnome-commits
mailing list