[Pkg-xfce-commits] r3630 - desktop/trunk/libxfcegui4/debian

Yves-Alexis Perez corsac at alioth.debian.org
Sun Oct 25 08:20:53 UTC 2009


Author: corsac
Date: 2009-10-25 20:20:53 +0000 (Sun, 25 Oct 2009)
New Revision: 3630

Added:
   desktop/trunk/libxfcegui4/debian/README.source
   desktop/trunk/libxfcegui4/debian/xfce-keyboard-shortcuts.install
Modified:
   desktop/trunk/libxfcegui4/debian/changelog
   desktop/trunk/libxfcegui4/debian/control
   desktop/trunk/libxfcegui4/debian/rules
Log:
* Add a new xfce-keyboard-shortcuts containing the xfconf file for keyboard
  shortcuts. This will enable people to co-install libxfcegui4 and
  libxfce4ui.
* debian/control:
  - update standards version to 3.8.3 ;
  - update quilt build-dep to use dh --with quilt ;
  - add ${misc:Depends} to all Depends: lines ;
  - drop chrpath build-dep.
* debian/README.source added.
* debian/rules:
  - big cleanup, use tiny rule from debhelper 7.

Added: desktop/trunk/libxfcegui4/debian/README.source
===================================================================
--- desktop/trunk/libxfcegui4/debian/README.source	                        (rev 0)
+++ desktop/trunk/libxfcegui4/debian/README.source	2009-10-25 20:20:53 UTC (rev 3630)
@@ -0,0 +1,2 @@
+This package uses quilt patch system to apply patch at build-time. More
+information can be found in /usr/share/doc/quilt/README.source.

Modified: desktop/trunk/libxfcegui4/debian/changelog
===================================================================
--- desktop/trunk/libxfcegui4/debian/changelog	2009-10-25 20:20:03 UTC (rev 3629)
+++ desktop/trunk/libxfcegui4/debian/changelog	2009-10-25 20:20:53 UTC (rev 3630)
@@ -1,3 +1,19 @@
+libxfcegui4 (4.6.1-2) UNRELEASED; urgency=low
+
+  * Add a new xfce-keyboard-shortcuts containing the xfconf file for keyboard
+    shortcuts. This will enable people to co-install libxfcegui4 and
+    libxfce4ui.
+  * debian/control:
+    - update standards version to 3.8.3 ;
+    - update quilt build-dep to use dh --with quilt ;
+    - add ${misc:Depends} to all Depends: lines ;
+    - drop chrpath build-dep.
+  * debian/README.source added.
+  * debian/rules:
+    - big cleanup, use tiny rule from debhelper 7.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 25 Oct 2009 16:31:04 +0100
+
 libxfcegui4 (4.6.1-1) unstable; urgency=low
 
   * debian/control:

Modified: desktop/trunk/libxfcegui4/debian/control
===================================================================
--- desktop/trunk/libxfcegui4/debian/control	2009-10-25 20:20:03 UTC (rev 3629)
+++ desktop/trunk/libxfcegui4/debian/control	2009-10-25 20:20:53 UTC (rev 3630)
@@ -5,9 +5,9 @@
 Uploaders: Martin Loschwitz <madkiss at debian.org>, Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>, Michael Casadevall <sonicmctails at gmail.com>
 Build-Depends: debhelper (>= 7.0.0), libgtk2.0-dev (>= 2.10.6), 
  libxfce4util-dev (>= 4.6.0), libxfconf-0-dev (>=4.6.0),
- libstartup-notification0-dev, quilt, libglade2-dev, libgladeui-1-dev, 
- intltool, chrpath
-Standards-Version: 3.8.1
+ libstartup-notification0-dev, quilt (>= 0.46-7), libglade2-dev, 
+ libgladeui-1-dev, intltool
+Standards-Version: 3.8.3
 Homepage: http://www.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/libxfcegui4/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/libxfcegui4/
@@ -15,7 +15,7 @@
 Package: glade-xfce
 Section: xfce
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: glade, libxfcegui4-dev
 Description: glade modules for xfce
  This package contains the modules that allow Glade to provide Xfce widgets in
@@ -25,7 +25,7 @@
 Section: libdevel
 Architecture: any
 Depends: libxfcegui4-4 (= ${binary:Version}), libxfce4util-dev (>= 4.6.0),
- libgtk2.0-dev
+ libgtk2.0-dev, ${misc:Depends}
 Suggests: devhelp
 Description: Development files for libxfcegui4-4
  This package contains the headers and the static library
@@ -39,7 +39,7 @@
 Package: libxfcegui4-4
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, xfce-keyboard-shortcuts
 Description: Basic GUI C functions for Xfce4
  This package contains a library which provides the very
  basic GUI functions used by the Xfce4 desktop suite. If
@@ -50,7 +50,18 @@
 Section: debug
 Architecture: any
 Priority: extra
-Depends: ${shlibs:Depends}, libxfcegui4-4 (= ${binary:Version})
+Depends: ${shlibs:Depends}, libxfcegui4-4 (= ${binary:Version}), 
+ ${misc:Depends}
 Description: debugging informations for libxfcegui4
  This package contains debugging symbols for libxfcegui4, which provides the
  very basic GUI functions used by the Xfce4 desktop suite.
+
+Package: xfce-keyboard-shortcuts
+Section: xfce
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: libxfcegui4-4
+Replaces: libxfcegui4-4 (<< 4.6.1-2)
+Description: xfce keyboard shortcuts configuration
+ This package only contains the default shortcut configuration for Xfce.
+ .

Modified: desktop/trunk/libxfcegui4/debian/rules
===================================================================
--- desktop/trunk/libxfcegui4/debian/rules	2009-10-25 20:20:03 UTC (rev 3629)
+++ desktop/trunk/libxfcegui4/debian/rules	2009-10-25 20:20:53 UTC (rev 3630)
@@ -1,84 +1,6 @@
 #!/usr/bin/make -f
 
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-include /usr/share/quilt/quilt.make
-
 LDFLAGS+=-Wl,-z,defs -Wl,--as-needed
-CFLAGS = -Wall -g
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
-config.status: configure
-	
-	dh_testdir
-	./configure \
-    --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
-    --sysconfdir=/etc --prefix=/usr --enable-final \
-    --enable-startup-notification --enable-keyboard-library \
-    --enable-gladeui --with-x
-
-build: patch build-stamp
-build-stamp: config.status
-	
-	dh_testdir
-	$(MAKE)
-	touch build-stamp
-
-clean: unpatch
-	
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp 
-
-	[ ! -f Makefile ] || $(MAKE) distclean
-
-	dh_clean
-
-install: build
-	
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-
-	rm -f $(CURDIR)/debian/tmp/usr/lib/libxfcegui4.la
-	rm -f $(CURDIR)/debian/tmp/usr/lib/libxfce4kbd-private.la
-	rm -f $(CURDIR)/debian/tmp/usr/lib/libglade/2.0/libxfce4.la
-	rm -f $(CURDIR)/debian/tmp/usr/lib/glade3/modules/libgladexfce4.la
-
-	chrpath -d -k $(CURDIR)/debian/tmp/usr/lib/*.so.*
-
-binary-indep: build install
-binary-arch: build install
-	
-	dh_testdir
-	dh_testroot
-	
-	dh_installchangelogs ChangeLog
-	dh_installdocs README
-	
-	dh_install --fail-missing --sourcedir=debian/tmp
-	dh_strip --dbg-package=libxfcegui4-4-dbg
-	
-	dh_compress
-	dh_fixperms
-	
-	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 patch unpatch
+%:
+	dh --with quilt $@

Added: desktop/trunk/libxfcegui4/debian/xfce-keyboard-shortcuts.install
===================================================================
--- desktop/trunk/libxfcegui4/debian/xfce-keyboard-shortcuts.install	                        (rev 0)
+++ desktop/trunk/libxfcegui4/debian/xfce-keyboard-shortcuts.install	2009-10-25 20:20:53 UTC (rev 3630)
@@ -0,0 +1 @@
+etc




More information about the Pkg-xfce-commits mailing list