[Pkg-xfce-commits] r4224 - desktop/branches/lenny-backports/libxfce4menu/debian

Yves-Alexis Perez corsac at alioth.debian.org
Sun Aug 15 04:29:42 UTC 2010


Author: corsac
Date: 2010-08-15 16:29:38 +0000 (Sun, 15 Aug 2010)
New Revision: 4224

Added:
   desktop/branches/lenny-backports/libxfce4menu/debian/docs
   desktop/branches/lenny-backports/libxfce4menu/debian/libxfce4menu-0.1-0.shlibs
   desktop/branches/lenny-backports/libxfce4menu/debian/source/
Modified:
   desktop/branches/lenny-backports/libxfce4menu/debian/changelog
   desktop/branches/lenny-backports/libxfce4menu/debian/control
   desktop/branches/lenny-backports/libxfce4menu/debian/rules
   desktop/branches/lenny-backports/libxfce4menu/debian/watch
Log:
merge changes from latest version in squeeze to backports

Modified: desktop/branches/lenny-backports/libxfce4menu/debian/changelog
===================================================================
--- desktop/branches/lenny-backports/libxfce4menu/debian/changelog	2010-08-15 15:34:35 UTC (rev 4223)
+++ desktop/branches/lenny-backports/libxfce4menu/debian/changelog	2010-08-15 16:29:38 UTC (rev 4224)
@@ -1,9 +1,30 @@
-libxfce4menu (4.6.1-1~bpo50+1) lenny-backports; urgency=low
+libxfce4menu (4.6.2-1~bpo50+1) lenny-backports; urgency=low
 
   * Rebuild for lenny-backports.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Tue, 30 Jun 2009 21:57:21 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 15 Aug 2010 17:33:13 +0200
 
+libxfce4menu (4.6.2-1) unstable; urgency=low
+
+  [ Stefan Ott ]
+  * debian/watch edited to track Xfce archive reorganisation.
+
+  [ Yves-Alexis Perez ]
+  * New upstream release.
+  * Switch to 3.0 (quilt) source format.
+  * debian/control:
+    - add ${misc:Depends} to Depends.
+    - bump debhelper build-dep because of dh_override use.
+  * debian/rules:
+    - switch to debhelper 7 tiny rules.
+    - override dh_strip to create a dbg package.
+    - override dh_install, add --fail-missing.
+    - override dh_auto_test: don't run the testsuite which fails if X is not
+      running. 
+  * debian/docs added, install NEWS, TODO and README.Debian.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sat, 22 May 2010 14:24:13 +0200
+
 libxfce4menu (4.6.1-1) unstable; urgency=low
 
   * New upstream release.

Modified: desktop/branches/lenny-backports/libxfce4menu/debian/control
===================================================================
--- desktop/branches/lenny-backports/libxfce4menu/debian/control	2010-08-15 15:34:35 UTC (rev 4223)
+++ desktop/branches/lenny-backports/libxfce4menu/debian/control	2010-08-15 16:29:38 UTC (rev 4224)
@@ -3,9 +3,9 @@
 Section: xfce
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
 Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>, Mike Massonnet <mmassonnet at gmail.com>
-Build-Depends: debhelper (>= 7), libxfce4util-dev (>= 4.6.0),
+Build-Depends: debhelper (>= 7.0.50~), libxfce4util-dev (>= 4.6.0),
  libgtk2.0-dev, intltool (>= 0.31)
-Standards-Version: 3.8.1
+Standards-Version: 3.8.4
 Homepage: http://www.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/branches/svn-snapshots/libxfce4menu/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/branches/svn-snapshots/libxfce4menu/
@@ -13,7 +13,7 @@
 Package: libxfce4menu-0.1-dev
 Section: libdevel
 Architecture: any
-Depends: libxfce4menu-0.1-0 (= ${binary:Version}), 
+Depends: libxfce4menu-0.1-0 (= ${binary:Version}), ${misc:Depends},
  libxfce4util-dev (>= 4.6.0), libglib2.0-dev
 Suggests: devhelp
 Description: Development files for libxfce4menu
@@ -26,7 +26,7 @@
 Package: libxfce4menu-0.1-0
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: freedesktop.org compliant menu implementation for Xfce
  libxfce4menu is a menu implementation for the Xfce Desktop Environment
  that is compliant with the Desktop Menu Specification of freedesktop.org
@@ -35,6 +35,7 @@
 Section: debug
 Priority: extra
 Architecture: any
-Depends: ${shlibs:Depends}, libxfce4menu-0.1-0 (= ${binary:Version})
+Depends: ${shlibs:Depends}, libxfce4menu-0.1-0 (= ${binary:Version}), 
+ ${misc:Depends}
 Description: debugging symbols for libxfce4menu
- This package contains debugging symbols and informations for libxfce4menu.
+ This package contains debugging symbols and information for libxfce4menu.

Copied: desktop/branches/lenny-backports/libxfce4menu/debian/docs (from rev 4058, desktop/trunk/libxfce4menu/debian/docs)
===================================================================
--- desktop/branches/lenny-backports/libxfce4menu/debian/docs	                        (rev 0)
+++ desktop/branches/lenny-backports/libxfce4menu/debian/docs	2010-08-15 16:29:38 UTC (rev 4224)
@@ -0,0 +1,3 @@
+NEWS
+TODO
+debian/README.Debian

Copied: desktop/branches/lenny-backports/libxfce4menu/debian/libxfce4menu-0.1-0.shlibs (from rev 4058, desktop/trunk/libxfce4menu/debian/libxfce4menu-0.1-0.shlibs)
===================================================================
--- desktop/branches/lenny-backports/libxfce4menu/debian/libxfce4menu-0.1-0.shlibs	                        (rev 0)
+++ desktop/branches/lenny-backports/libxfce4menu/debian/libxfce4menu-0.1-0.shlibs	2010-08-15 16:29:38 UTC (rev 4224)
@@ -0,0 +1 @@
+libxfce4menu-0.1 0 libxfce4menu-0.1-0 (>= 4.6.0)

Modified: desktop/branches/lenny-backports/libxfce4menu/debian/rules
===================================================================
--- desktop/branches/lenny-backports/libxfce4menu/debian/rules	2010-08-15 15:34:35 UTC (rev 4223)
+++ desktop/branches/lenny-backports/libxfce4menu/debian/rules	2010-08-15 16:29:38 UTC (rev 4224)
@@ -11,51 +11,14 @@
 	CFLAGS += -O2
 endif
 
-config.status: configure
-	dh_testdir
-	./configure CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --sysconfdir=/etc
+override_dh_strip:
+	dh_strip --dbg-package=libxfce4menu-0.1-dbg
 
-build: build-stamp
-build-stamp:  config.status 
-	dh_testdir
-	$(MAKE)
-	touch $@
+override_dh_install:
+	rm debian/tmp/usr/lib/libxfce4menu-0.1.la
+	dh_install --fail-missing
 
-clean: 
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp 
-	
-	[ ! -f Makefile ] || $(MAKE) distclean
+override_dh_auto_test:
 
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-	
-	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
-
-	rm -f debian/tmp/usr/lib/libxfce4menu-0.1.la
-
-binary-indep: build install
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs ChangeLog
-	dh_installdocs NEWS TODO debian/README.Debian
-	dh_install --fail-missing --sourcedir=debian/tmp
-	dh_strip --dbg-package=libxfce4menu-0.1-dbg
-	dh_compress
-	dh_fixperms
-	dh_makeshlibs -V 'libxfce4menu-0.1-0 (>= 4.6.0)'
-	dh_shlibdeps
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+%:
+	dh $@

Modified: desktop/branches/lenny-backports/libxfce4menu/debian/watch
===================================================================
--- desktop/branches/lenny-backports/libxfce4menu/debian/watch	2010-08-15 15:34:35 UTC (rev 4223)
+++ desktop/branches/lenny-backports/libxfce4menu/debian/watch	2010-08-15 16:29:38 UTC (rev 4224)
@@ -1,3 +1,3 @@
 version=3
-http://www.xfce.org/archive/xfce-(.*)/src/ \
-	libxfce4menu-(.*)\.tar\.bz2
+http://archive.xfce.org/src/xfce/libxfce4menu/([\d\.]+)/ \
+	libxfce4menu-([\d\.]+)\.tar\.(?:gz|bz2)




More information about the Pkg-xfce-commits mailing list