r15380 - /packages/unstable/libpanelappletmm2.6/debian/
manphiz-guest at users.alioth.debian.org
manphiz-guest at users.alioth.debian.org
Tue Mar 25 06:39:16 UTC 2008
Author: manphiz-guest
Date: Tue Mar 25 06:39:15 2008
New Revision: 15380
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15380
Log:
* New upstream version.
* Add GNOME Team as Uploaders.
* Migrate building system to cdbs.
* Update compat level to 6, hence debhelper >= 6, cdbs >= 0.4.51 (for
empty -dbg bug).
* Use chrpath to get rid of rpath on 64bit system.
* Clean up (Build-)Depends as per upstream configure.in.
* Use ${binary:Version} instead of deprecated ${Source-Version} for
binNMU safety.
* Update standard version to 3.7.3.
* Add ${misc:Depends} and ${shlibs:Depends} as recommended.
* Remove obsolete dirs file.
* Retain original docs directory hierarchy, and fix doc-base path.
* Refine watch file to be consistent with other GNOME packages.
* Use versioned shared lib, bump to 2.22.0 due to new API.
* Update copyright file, add proper years for copyright holders.
* Refine description to mention documentation in -dev.
* Add `DM-Upload-Allowed: yes'.
Added:
packages/unstable/libpanelappletmm2.6/debian/control.in
- copied, changed from r15379, packages/unstable/libpanelappletmm2.6/debian/control
Removed:
packages/unstable/libpanelappletmm2.6/debian/libpanelappletmm-2.6-1c2.dirs
packages/unstable/libpanelappletmm2.6/debian/libpanelappletmm-2.6-dev.dirs
Modified:
packages/unstable/libpanelappletmm2.6/debian/changelog
packages/unstable/libpanelappletmm2.6/debian/compat
packages/unstable/libpanelappletmm2.6/debian/control
packages/unstable/libpanelappletmm2.6/debian/copyright
packages/unstable/libpanelappletmm2.6/debian/libpanelappletmm-2.6-dev.doc-base.libpanelappletmm2.6-reference
packages/unstable/libpanelappletmm2.6/debian/libpanelappletmm-2.6-dev.docs
packages/unstable/libpanelappletmm2.6/debian/libpanelappletmm-2.6-dev.install
packages/unstable/libpanelappletmm2.6/debian/rules
packages/unstable/libpanelappletmm2.6/debian/watch
Modified: packages/unstable/libpanelappletmm2.6/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libpanelappletmm2.6/debian/changelog?rev=15380&op=diff
==============================================================================
--- packages/unstable/libpanelappletmm2.6/debian/changelog (original)
+++ packages/unstable/libpanelappletmm2.6/debian/changelog Tue Mar 25 06:39:15 2008
@@ -1,3 +1,26 @@
+libpanelappletmm2.6 (2.22.0-1) unstable; urgency=low
+
+ * New upstream version.
+ * Add GNOME Team as Uploaders.
+ * Migrate building system to cdbs.
+ * Update compat level to 6, hence debhelper >= 6, cdbs >= 0.4.51 (for
+ empty -dbg bug).
+ * Use chrpath to get rid of rpath on 64bit system.
+ * Clean up (Build-)Depends as per upstream configure.in.
+ * Use ${binary:Version} instead of deprecated ${Source-Version} for
+ binNMU safety.
+ * Update standard version to 3.7.3.
+ * Add ${misc:Depends} and ${shlibs:Depends} as recommended.
+ * Remove obsolete dirs file.
+ * Retain original docs directory hierarchy, and fix doc-base path.
+ * Refine watch file to be consistent with other GNOME packages.
+ * Use versioned shared lib, bump to 2.22.0 due to new API.
+ * Update copyright file, add proper years for copyright holders.
+ * Refine description to mention documentation in -dev.
+ * Add `DM-Upload-Allowed: yes'.
+
+ -- Deng Xiyue <manphiz-guest at users.alioth.debian.org> Tue, 25 Mar 2008 14:36:49 +0800
+
libpanelappletmm2.6 (2.6.0-4) unstable; urgency=low
* C++ transition (Closes: #328086)
Modified: packages/unstable/libpanelappletmm2.6/debian/compat
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libpanelappletmm2.6/debian/compat?rev=15380&op=diff
==============================================================================
--- packages/unstable/libpanelappletmm2.6/debian/compat (original)
+++ packages/unstable/libpanelappletmm2.6/debian/compat Tue Mar 25 06:39:15 2008
@@ -1,1 +1,1 @@
-4
+6
Modified: packages/unstable/libpanelappletmm2.6/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libpanelappletmm2.6/debian/control?rev=15380&op=diff
==============================================================================
--- packages/unstable/libpanelappletmm2.6/debian/control (original)
+++ packages/unstable/libpanelappletmm2.6/debian/control Tue Mar 25 06:39:15 2008
@@ -2,22 +2,39 @@
Section: libs
Priority: optional
Maintainer: Bradley Bell <btb at debian.org>
-Build-Depends: debhelper (>= 4.0.0), libpanel-applet2-dev (>> 2.6.0), libgconfmm-2.6-dev (>= 2.10.0-3), libgnomemm-2.6-dev (>= 2.10.0-1), doxygen
-Standards-Version: 3.6.1
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Deng Xiyue <manphiz-guest at users.alioth.debian.org>
+DM-Upload-Allowed: yes
+Build-Depends: cdbs (>= 0.4.51),
+ chrpath,
+ debhelper (>= 6),
+ gnome-pkg-tools (>= 0.11),
+ libgconfmm-2.6-dev (>= 2.6.0),
+ libgnomemm-2.6-dev (>= 2.6.0),
+ libgtkmm-2.4-dev (>= 2.4.0),
+ libpanel-applet2-dev (>= 2.14.0),
+ doxygen
+Standards-Version: 3.7.3
Package: libpanelappletmm-2.6-dev
Section: libdevel
Architecture: any
-Depends: libpanelappletmm-2.6-1c2 (= ${Source-Version}), libpanel-applet2-dev (>> 2.6.0), libgconfmm-2.6-dev (>= 2.10.0-3), libgnomemm-2.6-dev (>= 2.10.0-1)
+Depends: ${misc:Depends},
+ ${shlibs:Depends},
+ libpanelappletmm-2.6-1c2 (= ${binary:Version}),
+ libgconfmm-2.6-dev (>= 2.6.0),
+ libgnomemm-2.6-dev (>= 2.6.0),
+ libgtkmm-2.4-dev (>= 2.4.0),
+ libpanel-applet2-dev (>= 2.14.0)
Description: C++ wrappers for libpanel-applet (development files)
Libpanel-applet is the library for GNOME 2 Panel applets.
.
- This package contains development files and examples.
+ This package contains development files and documentation.
Package: libpanelappletmm-2.6-1c2
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${misc:Depends},
+ ${shlibs:Depends}
Conflicts: libpanelappletmm-2.6-1
Replaces: libpanelappletmm-2.6-1
Description: C++ wrappers for libpanel-applet (shared library)
Copied: packages/unstable/libpanelappletmm2.6/debian/control.in (from r15379, packages/unstable/libpanelappletmm2.6/debian/control)
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libpanelappletmm2.6/debian/control.in?rev=15380&op=diff
==============================================================================
--- packages/unstable/libpanelappletmm2.6/debian/control (original)
+++ packages/unstable/libpanelappletmm2.6/debian/control.in Tue Mar 25 06:39:15 2008
@@ -2,22 +2,39 @@
Section: libs
Priority: optional
Maintainer: Bradley Bell <btb at debian.org>
-Build-Depends: debhelper (>= 4.0.0), libpanel-applet2-dev (>> 2.6.0), libgconfmm-2.6-dev (>= 2.10.0-3), libgnomemm-2.6-dev (>= 2.10.0-1), doxygen
-Standards-Version: 3.6.1
+Uploaders: @GNOME_TEAM@
+DM-Upload-Allowed: yes
+Build-Depends: cdbs (>= 0.4.51),
+ chrpath,
+ debhelper (>= 6),
+ gnome-pkg-tools (>= 0.11),
+ libgconfmm-2.6-dev (>= 2.6.0),
+ libgnomemm-2.6-dev (>= 2.6.0),
+ libgtkmm-2.4-dev (>= 2.4.0),
+ libpanel-applet2-dev (>= 2.14.0),
+ doxygen
+Standards-Version: 3.7.3
Package: libpanelappletmm-2.6-dev
Section: libdevel
Architecture: any
-Depends: libpanelappletmm-2.6-1c2 (= ${Source-Version}), libpanel-applet2-dev (>> 2.6.0), libgconfmm-2.6-dev (>= 2.10.0-3), libgnomemm-2.6-dev (>= 2.10.0-1)
+Depends: ${misc:Depends},
+ ${shlibs:Depends},
+ libpanelappletmm-2.6-1c2 (= ${binary:Version}),
+ libgconfmm-2.6-dev (>= 2.6.0),
+ libgnomemm-2.6-dev (>= 2.6.0),
+ libgtkmm-2.4-dev (>= 2.4.0),
+ libpanel-applet2-dev (>= 2.14.0)
Description: C++ wrappers for libpanel-applet (development files)
Libpanel-applet is the library for GNOME 2 Panel applets.
.
- This package contains development files and examples.
+ This package contains development files and documentation.
Package: libpanelappletmm-2.6-1c2
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${misc:Depends},
+ ${shlibs:Depends}
Conflicts: libpanelappletmm-2.6-1
Replaces: libpanelappletmm-2.6-1
Description: C++ wrappers for libpanel-applet (shared library)
Modified: packages/unstable/libpanelappletmm2.6/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libpanelappletmm2.6/debian/copyright?rev=15380&op=diff
==============================================================================
--- packages/unstable/libpanelappletmm2.6/debian/copyright (original)
+++ packages/unstable/libpanelappletmm2.6/debian/copyright Tue Mar 25 06:39:15 2008
@@ -2,30 +2,30 @@
Thu, 1 Jul 2004 12:45:32 -0700.
It was downloaded from:
- http://ftp.gnome.org/pub/GNOME/sources/libpanelappletmm/2.6/
+ http://download.gnome.org/sources/libpanelappletmm/
Upstream Authors: Murray Cumming <murrayc at usa.net>
Bryan Forbes <mxpxfifws at yahoo.com>
Copyright:
-/* Copyright 2003 libpanelappletmm Development Team
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston MA
- * 02111-1307, USA.
- */
+ Copyright (C) 2003-2008 libpanelappletmm Development Team
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with this library; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02110-1301, USA
+
On Debian GNU/Linux systems, the complete text of the GNU Library General
Public License can be found in /usr/share/common-licenses/LGPL file.
Modified: packages/unstable/libpanelappletmm2.6/debian/libpanelappletmm-2.6-dev.doc-base.libpanelappletmm2.6-reference
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libpanelappletmm2.6/debian/libpanelappletmm-2.6-dev.doc-base.libpanelappletmm2.6-reference?rev=15380&op=diff
==============================================================================
--- packages/unstable/libpanelappletmm2.6/debian/libpanelappletmm-2.6-dev.doc-base.libpanelappletmm2.6-reference (original)
+++ packages/unstable/libpanelappletmm2.6/debian/libpanelappletmm-2.6-dev.doc-base.libpanelappletmm2.6-reference Tue Mar 25 06:39:15 2008
@@ -2,8 +2,8 @@
Title: libpanelappletmm 2.6 Reference Manual
Author: Doxygen
Abstract: Reference Manual for libpanelappletmm 2.6 (C++ bindings for libpanel-applet)
-Section: Apps/Programming
+Section: Programming/C++
Format: HTML
-Index: /usr/share/doc/libpanelappletmm-2.6-dev/reference/html/index.html
-Files: /usr/share/doc/libpanelappletmm-2.6-dev/reference/html/*.html
+Index: /usr/share/doc/libpanelappletmm-2.6-dev/docs/reference/html/index.html
+Files: /usr/share/doc/libpanelappletmm-2.6-dev/docs/reference/html/*.html
Modified: packages/unstable/libpanelappletmm2.6/debian/libpanelappletmm-2.6-dev.docs
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libpanelappletmm2.6/debian/libpanelappletmm-2.6-dev.docs?rev=15380&op=diff
==============================================================================
--- packages/unstable/libpanelappletmm2.6/debian/libpanelappletmm-2.6-dev.docs (original)
+++ packages/unstable/libpanelappletmm2.6/debian/libpanelappletmm-2.6-dev.docs Tue Mar 25 06:39:15 2008
@@ -1,4 +1,4 @@
NEWS
README
TODO
-docs/reference
+docs
Modified: packages/unstable/libpanelappletmm2.6/debian/libpanelappletmm-2.6-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libpanelappletmm2.6/debian/libpanelappletmm-2.6-dev.install?rev=15380&op=diff
==============================================================================
--- packages/unstable/libpanelappletmm2.6/debian/libpanelappletmm-2.6-dev.install (original)
+++ packages/unstable/libpanelappletmm2.6/debian/libpanelappletmm-2.6-dev.install Tue Mar 25 06:39:15 2008
@@ -2,5 +2,5 @@
usr/lib/libpanelappletmm-2.6
usr/lib/lib*.a
usr/lib/lib*.so
-usr/lib/pkgconfig/*
-/usr/lib/*.la
+usr/lib/pkgconfig
+usr/lib/*.la
Modified: packages/unstable/libpanelappletmm2.6/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libpanelappletmm2.6/debian/rules?rev=15380&op=diff
==============================================================================
--- packages/unstable/libpanelappletmm2.6/debian/rules (original)
+++ packages/unstable/libpanelappletmm2.6/debian/rules Tue Mar 25 06:39:15 2008
@@ -1,115 +1,30 @@
#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/utils.mk
+include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
+include /usr/share/gnome-pkg-tools/1/rules/clean-la.mk
+-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
+GNOME_MODULE := libpanelappletmm
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+SHARED_PKG := $(shell sed -rn 's/Package:[[:space:]]*(libpanelappletmm-[0-9\.]+-[0-9][0-9a-z]*)[[:space:]]*$$/\1/p' debian/control)
+DEV_PKG := $(shell sed -rn 's/Package:[[:space:]]*(libpanelappletmm-[0-9\.]+-dev)[[:space:]]*$$/\1/p' debian/control)
+SHVER := 2.22.0
+LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
-CXXFLAGS = -Wall -g
+DEB_CONFIGURE_EXTRA_FLAGS += --enable-static
+DEB_DH_INSTALL_SOURCEDIR := debian/tmp
+DEB_DH_MAKESHLIBS_ARGS_$(SHARED_PKG) += -V"$(SHARED_PKG) (>= $(SHVER))"
+DEB_INSTALL_DOCS_$(DEV_PKG) += -XMakefile -XDoxyfile
+DEB_INSTALL_EXAMPLES_$(DEV_PKG) += -XMakefile -X.deps -X.libs -X.o
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CXXFLAGS += -O0
-else
- CXXFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
-endif
+# chrpath hack to get rid of amd64 rpath
+common-install-impl::
+ chrpath -d $(DEB_DH_INSTALL_SOURCEDIR)/usr/lib/*.so*
-
-autogen:
- libtoolize --force --copy
- aclocal-1.8 -I scripts
- automake-1.8 --copy --add-missing
- autoconf
-
-
-config.status: configure
- dh_testdir
- # Add here commands to configure the package.
- ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CXXFLAGS="$(CXXFLAGS)"
-
-
-build: build-stamp
-build-stamp: config.status
- dh_testdir
-
- # Add here commands to compile the package.
- $(MAKE)
+build/$(DEV_PKG)::
$(MAKE) -C docs/reference
-
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp
-
- # Add here commands to clean up after the build process.
- -$(MAKE) distclean
- rm -f docs/reference/libpanelappletmm_doxygen_tags
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- cp -f /usr/share/misc/config.sub scripts/config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- cp -f /usr/share/misc/config.guess scripts/config.guess
-endif
-
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- # Add here commands to install the package into debian/tmp
- $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-
-
-# 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 -XMakefile -XDoxyfile
- dh_installexamples
- dh_install --sourcedir=debian/tmp
-# dh_installmenu
-# dh_installdebconf
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_installinit
-# dh_installcron
-# dh_installinfo
- dh_installman
- dh_link
- dh_strip
- dh_compress -Xdoxygen_tags
- dh_fixperms
-# dh_perl
-# dh_python
- dh_makeshlibs
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
Modified: packages/unstable/libpanelappletmm2.6/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libpanelappletmm2.6/debian/watch?rev=15380&op=diff
==============================================================================
--- packages/unstable/libpanelappletmm2.6/debian/watch (original)
+++ packages/unstable/libpanelappletmm2.6/debian/watch Tue Mar 25 06:39:15 2008
@@ -1,6 +1,4 @@
-# Example watch control file for uscan
-# Rename this file to "watch" and then you can run the "uscan" command
-# to check for upstream updates and more.
-# Site Directory Pattern Version Script
-version=2
-ftp://ftp.gnome.org/pub/GNOME/sources/libpanelappletmm/2.6/libpanelappletmm-(.*)\.tar\.gz debian uupdate
+version=3
+
+http://download.gnome.org/sources/libpanelappletmm/([\d\.]+)[24680]/ \
+ libpanelappletmm-([\d\.]+)\.tar\.gz
More information about the pkg-gnome-commits
mailing list