r14432 - in /packages/unstable/update-notifier/debian: changelog control.in rules update-notifier-common.install update-notifier.install

alanbach-guest at users.alioth.debian.org alanbach-guest at users.alioth.debian.org
Tue Feb 5 06:22:20 UTC 2008 

Author: alanbach-guest
Date: Tue Feb  5 06:22:20 2008
New Revision: 14432

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=14432
Log:
* debian/control*:
  - updated my email address
  - updated uploaders/maintainers
* Updated debian/*.install for proper locations
* debian/rules:
  - merged upstream changes
  - extra space clean-ups

Modified:
    packages/unstable/update-notifier/debian/changelog
    packages/unstable/update-notifier/debian/control.in
    packages/unstable/update-notifier/debian/rules
    packages/unstable/update-notifier/debian/update-notifier-common.install
    packages/unstable/update-notifier/debian/update-notifier.install

Modified: packages/unstable/update-notifier/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/update-notifier/debian/changelog?rev=14432&op=diff
==============================================================================
--- packages/unstable/update-notifier/debian/changelog (original)
+++ packages/unstable/update-notifier/debian/changelog Tue Feb  5 06:22:20 2008
@@ -4,21 +4,27 @@
   * New upstream stable release
   * debian/changelog.ubuntu:
     - updated from the Ubuntu package
-  * debian/control:
+  * debian/control*:
     - bump standards version to 3.7.3
     - bump minimum libgtk2.0-dev build-dep to >= 2.10.0
     - bump minimum libdbus-glib-1-dev build-dep to >= 0.60
     - added update-notifier-common to put shared things there
-    - added update-notifier-common to update-notifier's deps   
-   * Added debian/15update-stamp:
+    - added update-notifier-common to update-notifier's deps
+    - updated my email address
+    - updated uploaders/maintainers
+  * Added debian/15update-stamp:
     - move the update stamp hook into its own configuration
       (LP: #181189)
+  * Updated debian/*.install for proper locations
+  * debian/rules:
+    - merged upstream changes
+    - extra space clean-ups
 
   [ Gustavo Noronha Silva ]
   * debian/control:
   - Make GNOME team the maintainer, I can no longer be involved
 
- -- Alan Baghumian <alan at technotux.org>  Tue, 05 Feb 2008 08:40:10 +0330
+ -- Alan Baghumian <alan at technotux.org>  Tue, 05 Feb 2008 09:50:39 +0330
 
 update-notifier (0.59.5.debian-1) unstable; urgency=low
 

Modified: packages/unstable/update-notifier/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/update-notifier/debian/control.in?rev=14432&op=diff
==============================================================================
--- packages/unstable/update-notifier/debian/control.in (original)
+++ packages/unstable/update-notifier/debian/control.in Tue Feb  5 06:22:20 2008
@@ -1,22 +1,22 @@
 Source: update-notifier
 Section: gnome
 Priority: optional
-Maintainer: Gustavo Noronha Silva <kov at debian.org>
-Uploaders: Alan Baghumain <alan at technotux.com>, @GNOME_TEAM@
+Maintainer: @GNOME_TEAM@
+Uploaders: Alan Baghumain <alan at technotux.org>
 Build-Depends: cdbs,
                debhelper (>= 4.1.0),
                gnome-pkg-tools (>= 0.12.3),
-               libgtk2.0-dev,
+               libgtk2.0-dev (>= 2.10.0),
                libgnomeui-dev,
                libglade2-dev,
                libgconf2-dev,
                libgamin-dev,
                libhal-dev (>= 0.5.1),
-               libdbus-glib-1-dev,
+               libdbus-glib-1-dev (>= 0.60),
                intltool,
                libnotify-dev (>= 0.3.0),
                sng
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
 
 Package: update-notifier
 Architecture: any
@@ -29,6 +29,7 @@
          update-manager,
          hal,
          notification-daemon,
+         update-notifier-common,
          gksu
 Provides: upgrade-notifier
 Conflicts: upgrade-notifier
@@ -48,3 +49,13 @@
  This package works with any Desktop system that implements the
  FreeDesktop notification area specification, like GNOME, KDE and
  XFCE.
+
+Package: update-notifier-common
+Replaces: update-notifier (<< 0.59.4)
+Conflicts: update-notifier (<< 0.59.4)
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Files shared between update-notifier and adept
+ Apt setup files and reboot notification scripts shared between
+ update-notifier and adept-notifier.
+

Modified: packages/unstable/update-notifier/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/update-notifier/debian/rules?rev=14432&op=diff
==============================================================================
--- packages/unstable/update-notifier/debian/rules (original)
+++ packages/unstable/update-notifier/debian/rules Tue Feb  5 06:22:20 2008
@@ -1,17 +1,110 @@
 #!/usr/bin/make -f
+# -*- makefile -*-
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
 
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
-include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
-include /usr/share/gnome-pkg-tools/1/rules/ubuntu-get-source.mk
+tmp := $(CURDIR)/debian/tmp
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-DEB_CONFIGURE_EXTRA_FLAGS = --with-pkg-manager="/usr/bin/update-manager"
+PKG=update-notifier
+DEBVER=$(shell dpkg-parsechangelog |sed -n -e '/^Version:/s/^Version: //p')
+DEB_BUILD_PROG:=debuild --preserve-envvar PATH --preserve-envvar CCACHE_DIR -us -uc $(DEB_BUILD_PROG_OPTS)
 
-clean::
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+	INSTALL_PROGRAM += -s
+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 --with-pkg-manager="/usr/bin/update-manager" --sysconfdir=/etc 
+
+build: build-stamp
+
+build-stamp:  config.status
+	dh_testdir
+	# Add here commands to compile the package.
+	$(MAKE)
+	(cd po; intltool-update -p --verbose)
+	(cd debian/gdm-signal && $(MAKE))
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp 
+
+	# Add here commands to clean up after the build process.
+	-$(MAKE) distclean
+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
+
+	dh_clean
 	-cd debian/gdm-signal && $(MAKE) clean
 
-common-build-arch::
-	cd debian/gdm-signal && $(MAKE)
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k 
+	dh_installdirs
 
+	# Add here commands to install the package into debian/upgrade-notifier.
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 
+	#install -p -m 755 debian/synaptic-wrapper $(tmp)/usr/bin
+	mkdir -p $(tmp)/etc/apt/apt.conf.d
+	install -p -m 644 debian/99update-notifier $(tmp)/etc/apt/apt.conf.d
+	install -p -m 644 debian/10periodic $(tmp)/etc/apt/apt.conf.d
+	install -p -m 644 debian/15update-stamp $(tmp)/etc/apt/apt.conf.d
+	install -p -m 644 debian/20archive $(tmp)/etc/apt/apt.conf.d
+	install -p -m 644 debian/gdm-signal/gdm-signal $(tmp)/usr/lib/update-notifier
+
+# 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_icons
+	dh_install --sourcedir=debian/tmp
+	dh_gconf
+	dh_installman
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+arch-build: 
+	#-$(MAKE) distclean
+	rm -rf debian/arch-build
+	mkdir -p debian/arch-build/$(PKG)-$(DEBVER)
+	tar -c --exclude=arch-build --no-recursion -f - `bzr inventory` | (cd debian/arch-build/$(PKG)-$(DEBVER);tar xf -)
+	debian/arch-build/$(PKG)-$(DEBVER)/autogen.sh
+	# HACK to fix the *$§/$&"§" automake generated po/Makefile.in
+	sed -i 's/@install_sh@/..\/install-sh/' debian/arch-build/$(PKG)-$(DEBVER)/po/Makefile.in.in
+	(cd debian/arch-build/$(PKG)-$(DEBVER) && $(DEB_BUILD_PROG))
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install

Modified: packages/unstable/update-notifier/debian/update-notifier-common.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/update-notifier/debian/update-notifier-common.install?rev=14432&op=diff
==============================================================================
--- packages/unstable/update-notifier/debian/update-notifier-common.install (original)
+++ packages/unstable/update-notifier/debian/update-notifier-common.install Tue Feb  5 06:22:20 2008
@@ -1,5 +1,12 @@
-/etc/apt/apt.conf.d/99update-notifier
-/etc/apt/apt.conf.d/10periodic
-/etc/apt/apt.conf.d/15update-stamp
-/etc/apt/apt.conf.d/20archive
-/usr/share/update-notifier/notify-reboot-required
+usr/share/update-notifier/notify-reboot-required
+usr/share/gconf/schemas/update-notifier.schemas
+usr/share/update-notifier/glade/preferences.glade
+usr/share/update-notifier/glade/hooks-dialog.glade
+usr/share/update-notifier/glade/reboot-dialog.glade
+etc/xdg/autostart/update-notifier.desktop
+usr/share/icons/hicolor/
+usr/lib/update-notifier/apt-check
+usr/lib/update-notifier/apt-cdrom-check
+usr/lib/update-notifier/cddistupgrader
+
+

Modified: packages/unstable/update-notifier/debian/update-notifier.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/update-notifier/debian/update-notifier.install?rev=14432&op=diff
==============================================================================
--- packages/unstable/update-notifier/debian/update-notifier.install (original)
+++ packages/unstable/update-notifier/debian/update-notifier.install Tue Feb  5 06:22:20 2008
@@ -1,13 +1,1 @@
-etc/xdg/autostart/update-notifier.desktop
-usr/lib/update-notifier/apt-check
-usr/lib/update-notifier/apt-cdrom-check
-usr/lib/update-notifier/cddistupgrader
-usr/share/update-notifier/glade/preferences.glade
-usr/share/update-notifier/glade/hooks-dialog.glade
-usr/share/update-notifier/glade/reboot-dialog.glade
-usr/share/icons/hicolor/16x16/
-usr/share/icons/hicolor/22x22/
-usr/share/icons/hicolor/24x24/
-usr/share/icons/hicolor/48x48/
-usr/share/gconf/schemas/update-notifier.schemas
 usr/bin/update-notifier

More information about the pkg-gnome-commits mailing list