Bug#342518: teatime: diff of NMU
Ian Wienand
ianw at debian.org
Mon Jul 10 02:39:49 UTC 2006
Package: teatime
Version: 2.6.0-1.1
Followup-For: Bug #342518
Attached is a diff of the NMU for teatime 2.6
-i
-- System Information:
Debian Release: testing/unstable
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: i386 (i686)
Shell: /bin/sh linked to /bin/bash
Kernel: Linux 2.6.17
Locale: LANG=en_AU, LC_CTYPE=en_AU (charmap=ISO-8859-1)
Versions of packages teatime depends on:
ii gconf2 2.14.0-1 GNOME configuration database syste
ii libart-2.0-2 2.3.17-1 Library of functions for 2D graphi
ii libatk1.0-0 1.11.4-2 The ATK accessibility toolkit
ii libbonobo2-0 2.14.0-1 Bonobo CORBA interfaces library
ii libbonoboui2-0 2.14.0-3 The Bonobo UI library
ii libc6 2.3.6-15 GNU C Library: Shared libraries
ii libcairo2 1.2.0-2 The Cairo 2D vector graphics libra
ii libdbus-1-2 0.62-4 simple interprocess messaging syst
ii libfontconfig1 2.3.2-7 generic font configuration library
ii libgconf2-4 2.14.0-1 GNOME configuration database syste
ii libglib2.0-0 2.10.3-2 The GLib library of C routines
ii libgnome-keyring0 0.4.9-1 GNOME keyring services library
ii libgnome2-0 2.14.1-2 The GNOME 2 library - runtime file
ii libgnomecanvas2-0 2.14.0-2 A powerful object-oriented display
ii libgnomeui-0 2.14.1-2 The GNOME 2 libraries (User Interf
ii libgnomevfs2-0 2.14.2-1 GNOME virtual file-system (runtime
ii libgstreamer-gconf0.8-0 0.8.12-4 GConf support for GStreamer
ii libgstreamer0.8-0 0.8.12-2 Core GStreamer libraries, plugins,
ii libgtk2.0-0 2.8.18-1 The GTK+ graphical user interface
ii libice6 1:1.0.0-3 X11 Inter-Client Exchange library
ii liborbit2 1:2.14.0-2 libraries for ORBit2 - a CORBA ORB
ii libpanel-applet2-0 2.14.2-1 library for GNOME 2 panel applets
ii libpango1.0-0 1.12.3-1 Layout and rendering of internatio
ii libpng12-0 1.2.8rel-5.1 PNG library - runtime
ii libpopt0 1.10-2 lib for parsing cmdline parameters
ii libsm6 1:1.0.0-4 X11 Session Management library
ii libx11-6 2:1.0.0-7 X11 client-side library
ii libxcursor1 1.1.5.2-5 X cursor management library
ii libxext6 1:1.0.0-4 X11 miscellaneous extension librar
ii libxfixes3 1:3.0.1.2-4 X11 miscellaneous 'fixes' extensio
ii libxi6 1:1.0.0-5 X11 Input extension library
ii libxinerama1 1:1.0.1-4 X11 Xinerama extension library
ii libxml2 2.6.26.dfsg-2 GNOME XML library
ii libxrandr2 2:1.1.0.2-4 X11 RandR extension library
ii libxrender1 1:0.9.0.2-4 X Rendering Extension client libra
ii zlib1g 1:1.2.3-12 compression library - runtime
teatime recommends no packages.
-- no debconf information
-------------- next part --------------
diff -u teatime-2.4/debian/changelog teatime-2.6.0/debian/changelog
--- teatime-2.4/debian/changelog 2006-07-10 12:18:46.000000000 +1000
+++ teatime-2.6.0/debian/changelog 2006-07-06 10:54:41.000000000 +1000
@@ -1,3 +1,14 @@
+teatime (2.6.0-1.1) unstable; urgency=low
+
+ * Non-maintainer upload
+ * New upstream (Closes: #296874, #342518, #293595, #313902, #260517)
+ * Remove old patches no longer required
+ * Add patches/no-libexec.patch; unfortunately requires regenerating Makefiles
+ which leads to a big diff
+ * Update homepage in control, copyright
+
+ -- Ian Wienand <ianw at debian.org> Wed, 5 Jul 2006 23:15:28 +1000
+
teatime (2.4-2.1) unstable; urgency=low
* Non-maintainer upload.
diff -u teatime-2.4/debian/control teatime-2.6.0/debian/control
--- teatime-2.4/debian/control 2006-07-10 12:18:46.000000000 +1000
+++ teatime-2.6.0/debian/control 2006-07-06 10:55:38.000000000 +1000
@@ -2,9 +2,9 @@
Section: gnome
Priority: optional
Maintainer: Arnaud Patard <arnaud.patard at rtp-net.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Akira TAGOH <tagoh at debian.org>, Andreas Rottmann <rotty at debian.org>, Andrew Lau <netsnipe at users.sourceforge.net>, Cl?ment Stenac <zorglub at debian.org>, Dafydd Harries <daf at debian.org>, Guilherme de S. Pastore <gpastore at debian.org>, Gustavo Franco <stratus at debian.org>, Gustavo Noronha Silva <kov at debian.org>, J.H.M. Dassen (Ray) <jdassen at debian.org>, Jordi Mallach <jordi at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>, Marc 'HE' Brockschmidt <he at debian.org>, Marco Cabizza <marco87 at gmail.com>, Ond?ej Sur? <ondrej at debian.org>, Ross Burton <ross at debian.org>, Sebastien Bacher <seb128 at debian.org>, Sjoerd Simons <sjoerd at debian.org>, Takuo KITAME <kitame at debian.org>
-Build-Depends: cdbs, debhelper (>= 4.1), gnome-pkg-tools, libgtk2.0-dev, libgnomeui-dev (>= 2.2), libpanel-applet2-dev, libgstreamer0.8-dev (>= 0.8.1-2), libgstreamer-gconf0.8-dev (>= 0.8.1-2), libxml2-dev, libxml-perl
-Standards-Version: 3.6.1
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Andrew Lau <netsnipe at users.sourceforge.net>, Cl?ment Stenac <zorglub at debian.org>, Dafydd Harries <daf at debian.org>, Guilherme de S. Pastore <gpastore at debian.org>, Gustavo Franco <stratus at debian.org>, Gustavo Noronha Silva <kov at debian.org>, J.H.M. Dassen (Ray) <jdassen at debian.org>, Jordi Mallach <jordi at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>, Marc 'HE' Brockschmidt <he at debian.org>, Marco Cabizza <marco87 at gmail.com>, Oystein Gisnas <oystein at gisnas.net>, Ond?ej Sur? <ondrej at debian.org>, Ross Burton <ross at debian.org>, Sebastien Bacher <seb128 at debian.org>, Sjoerd Simons <sjoerd at debian.org>
+Build-Depends: , cdbs (>= 0.4.23-1.1), autotools-dev, debhelper (>= 4.2.0), patchutils (>= 0.2.25), debhelper (>= 4.2.21), automake1.9, autoconf, debhelper (>= 4.1), gnome-pkg-tools, libgtk2.0-dev, libgnomeui-dev (>= 2.2), libpanel-applet2-dev, libgstreamer0.8-dev (>= 0.8.1-2), libgstreamer-gconf0.8-dev (>= 0.8.1-2), libxml2-dev, libxml-perl
+Standards-Version: 3.7.2
Package: teatime
Architecture: any
diff -u teatime-2.4/debian/control.in teatime-2.6.0/debian/control.in
--- teatime-2.4/debian/control.in 2006-07-10 12:18:46.000000000 +1000
+++ teatime-2.6.0/debian/control.in 2006-07-05 23:42:19.000000000 +1000
@@ -3,8 +3,8 @@
Priority: optional
Maintainer: Arnaud Patard <arnaud.patard at rtp-net.org>
Uploaders: @GNOME_TEAM@
-Build-Depends: cdbs, debhelper (>= 4.1), gnome-pkg-tools, libgtk2.0-dev, libgnomeui-dev (>= 2.2), libpanel-applet2-dev, libgstreamer0.8-dev (>= 0.8.1-2), libgstreamer-gconf0.8-dev (>= 0.8.1-2), libxml2-dev, libxml-perl
-Standards-Version: 3.6.1
+Build-Depends: @cdbs@, debhelper (>= 4.1), gnome-pkg-tools, libgtk2.0-dev, libgnomeui-dev (>= 2.2), libpanel-applet2-dev, libgstreamer0.8-dev (>= 0.8.1-2), libgstreamer-gconf0.8-dev (>= 0.8.1-2), libxml2-dev, libxml-perl
+Standards-Version: 3.7.2
Package: teatime
Architecture: any
diff -u teatime-2.4/debian/copyright teatime-2.6.0/debian/copyright
--- teatime-2.4/debian/copyright 2006-07-10 12:18:46.000000000 +1000
+++ teatime-2.6.0/debian/copyright 2006-07-06 10:54:29.000000000 +1000
@@ -1,7 +1,7 @@
This package was debianized by Arnaud Patard <arnaud.patard at rtp-net.org> on
Wed, 14 Apr 2004 18:58:10 +0200
-It was downloaded from <http://teatime.sourceforge.net/Teatime-2.4.tar.gz>
+It was downloaded from <http://det.cable.nu/pakete/teatime_applet_2-2.6.0.tar.gz>
Upstream Authors:
Detlef Reichl <detlef.reichl at gmx.org>
Only in teatime-2.6.0/debian/: files
Common subdirectories: teatime-2.4/debian/patches and teatime-2.6.0/debian/patches
diff -u teatime-2.4/debian/rules teatime-2.6.0/debian/rules
--- teatime-2.4/debian/rules 2006-07-10 12:18:46.000000000 +1000
+++ teatime-2.6.0/debian/rules 2006-07-05 23:37:03.000000000 +1000
@@ -1,9 +1,19 @@
#!/usr/bin/make -f
+# see patches/no-libexecdir.patch
+DEB_AUTO_UPDATE_AUTOMAKE := 1.9
+DEB_AUTO_UPDATE_AUTOCONF := 2.50
+
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/class/gnome.mk
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
+
+DEB_CONFIGURE_EXTRA_FLAGS := --libexecdir=/usr/lib/teatime/
+
clean::
+ #workaround for gnome uploaders; see
+ #http://perso.duckcorp.org/duck/cdbs-doc/cdbs-doc.xhtml
+ sed -i "s/@cdbs@/$(CDBS_BUILD_DEPENDS)/g" debian/control
rm -f GNOME_TeatimeApplet_Factory.server
Only in teatime-2.6.0/debian/: stamp-autotools-files
Only in teatime-2.6.0/debian/: stamp-makefile-build
Only in teatime-2.6.0/debian/: stamp-patched
Only in teatime-2.6.0/debian/: stamp-patch-no-libexec.patch
Only in teatime-2.6.0/debian/: teatime
Only in teatime-2.6.0/debian/: teatime.postinst.debhelper
Only in teatime-2.6.0/debian/: teatime.postrm.debhelper
Only in teatime-2.6.0/debian/: teatime.prerm.debhelper
Only in teatime-2.6.0/debian/: teatime.substvars
More information about the Pkg-gnome-maintainers
mailing list