[Restricted-changes] r187 - in dists/trunk/hot-babe/debian: . desktop patches

fabian-guest at alioth.debian.org fabian-guest at alioth.debian.org
Tue Jan 13 11:58:53 UTC 2009


Author: fabian-guest
Date: 2009-01-13 11:58:53 +0000 (Tue, 13 Jan 2009)
New Revision: 187

Added:
   dists/trunk/hot-babe/debian/desktop/
   dists/trunk/hot-babe/debian/desktop/hot-babe.desktop
   dists/trunk/hot-babe/debian/patches/01-cflags.patch
   dists/trunk/hot-babe/debian/patches/series
Removed:
   dists/trunk/hot-babe/debian/bug/
   dists/trunk/hot-babe/debian/hot-babe-dbg.lintian-overrides
   dists/trunk/hot-babe/debian/hot-babe.examples
   dists/trunk/hot-babe/debian/hot-babe.lintian-overrides
   dists/trunk/hot-babe/debian/patches/01_cflags-ldflags.patch
Modified:
   dists/trunk/hot-babe/debian/changelog
   dists/trunk/hot-babe/debian/control
   dists/trunk/hot-babe/debian/copyright
   dists/trunk/hot-babe/debian/hot-babe.menu
   dists/trunk/hot-babe/debian/rules
Log:
Updates to the hot-babe packaging.



Modified: dists/trunk/hot-babe/debian/changelog
===================================================================
--- dists/trunk/hot-babe/debian/changelog	2009-01-13 11:55:59 UTC (rev 186)
+++ dists/trunk/hot-babe/debian/changelog	2009-01-13 11:58:53 UTC (rev 187)
@@ -1,11 +1,5 @@
-hot-babe (0.2.2-2) unstable; urgency=low
-
-  * Converted Debian packaging to CDBS.
-
- -- Fabian Greffrath <fabian at debian-unofficial.org>  Fri,  1 Aug 2008 00:00:00 +0100
-
 hot-babe (0.2.2-1) unstable; urgency=low
 
   * Initial release.
 
- -- Fabian Greffrath <fabian at debian-unofficial.org>  Thu, 18 Aug 2005 00:00:00 +0100
+ -- Fabian Greffrath <fabian at debian-unofficial.org>  Mon, 22 Dec 2008 00:00:00 +0100

Modified: dists/trunk/hot-babe/debian/control
===================================================================
--- dists/trunk/hot-babe/debian/control	2009-01-13 11:55:59 UTC (rev 186)
+++ dists/trunk/hot-babe/debian/control	2009-01-13 11:58:53 UTC (rev 187)
@@ -1,39 +1,33 @@
 Source: hot-babe
-Section: restricted/x11
+Section: x11
 Priority: optional
-Maintainer: Debian Restricted <restricted-devel at lists.alioth.debian.org>
-Uploaders: Fabian Greffrath <fabian at debian-unofficial.org>, Daniel Baumann <daniel at debian.org>
-Origin: debian-unofficial.org
-Bugs: mailto:restricted-devel at lists.alioth.debian.org
-Build-Depends: cdbs (>= 0.4.41), debhelper (>= 7), libgtk2.0-dev
+Maintainer: Fabian Greffrath <fabian at debian-unofficial.org>
+Build-Depends: debhelper (>= 7), libgtk2.0-dev, quilt
 Standards-Version: 3.8.0
-Vcs-Svn: svn://svn.debian.org/restricted/dists/trunk/hot-babe/
-Vcs-Browser: http://svn.debian.org/wsvn/restricted/dists/trunk/hot-babe/
 Homepage: http://www.dindinx.net/hotbabe/
+Vcs-Browser: http://svn.debian.org/wsvn/restricted/dists/trunk/hot-babe/
+Vcs-Svn: svn://svn.debian.org/restricted/dists/trunk/hot-babe/
 
 Package: hot-babe
-Section: restricted/x11
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: sexy graphical system activity monitor
- Hot-babe is a small graphical utility which displays the system activity in a
+Description: display the system activity in a very special way
+ Hot-Babe is a small graphical utility which displays the system activity in a
  very special way. When the CPU is idle, it displays a dressed girl, and when
  the activity goes up, as the temperature increases, the girl begins to undress,
- to finish totally naked when the system activity reaches 100%.
- .
- WARNING: Of course, if you can be shocked by nudity, don't use it!
+ to finish totally naked when the system activity reaches 100%. Of course, if
+ you can be shocked by nudity, don't use it!
 
 Package: hot-babe-dbg
-Section: restricted/devel
+Section: devel
 Priority: extra
 Architecture: any
 Depends: hot-babe (= ${binary:Version}), ${misc:Depends}
-Description: sexy graphical system activity monitor (debug)
- Hot-babe is a small graphical utility which displays the system activity in a
+Description: display the system activity in a very special way (debug)
+ Hot-Babe is a small graphical utility which displays the system activity in a
  very special way. When the CPU is idle, it displays a dressed girl, and when
  the activity goes up, as the temperature increases, the girl begins to undress,
- to finish totally naked when the system activity reaches 100%.
+ to finish totally naked when the system activity reaches 100%. Of course, if
+ you can be shocked by nudity, don't use it!
  .
- WARNING: Of course, if you can be shocked by nudity, don't use it!
- .
  This package contains the debug symbols.

Modified: dists/trunk/hot-babe/debian/copyright
===================================================================
--- dists/trunk/hot-babe/debian/copyright	2009-01-13 11:55:59 UTC (rev 186)
+++ dists/trunk/hot-babe/debian/copyright	2009-01-13 11:58:53 UTC (rev 187)
@@ -1,34 +1,24 @@
 Authors:
-	David Odin <david at dindinx.org>
-	Cyprien Laplace <cyprien33 at laposte.net>
-	Bruno Bellamy <bruno at bellaminettes.com>
+ David Odin <david at dindinx.org>
+ Cyprien Laplace <cyprien33 at laposte.net>
+ Bruno Bellamy <bruno at bellaminettes.com>
 Download: http://www.dindinx.net/hotbabe/download.php
 
 Files: *
 Copyright:
-	© 2002-2004, David Odin
-	© 2002-2004, Cyprien Laplace
-	© 2002-2004, Bruno Bellamy
+ © 2002-2004, David Odin
+ © 2002-2004, Cyprien Laplace
+ © 2002-2004, Bruno Bellamy
 License: Artistic
  This program is free software; you can redistribute it and/or modify
  it under the terms of the Artistic License.
  .
  On Debian systems, the complete text of the Artistic License
- can be found in the `/usr/share/common-licenses/Artistic' file.
+ can be found in `/usr/share/common-licenses/Artistic'.
 
-Files: hb01/*
-Copyright: © 2002-2004, Bruno Bellamy
-License: Artistic
- This program is free software; you can redistribute it and/or modify
- it under the terms of the Artistic License.
- .
- On Debian systems, the complete text of the Artistic License
- can be found in the `/usr/share/common-licenses/Artistic' file.
-
 Files: debian/*
 Copyright: © 2005-2008, Fabian Greffrath <fabian at debian-unofficial.org>
-License: GPL-2+
- The Debian packaging is licensed under the GPL, version 2 or later.
- .
- On Debian systems, the complete text of the GNU General Public License
- version 2 can be found in file `/usr/share/common-licenses/GPL-2'.
+License: GAP
+ Copying and distribution of this file, with or without modification,
+ are permitted in any medium without royalty provided the copyright
+ notice and this notice are preserved.

Added: dists/trunk/hot-babe/debian/desktop/hot-babe.desktop
===================================================================
--- dists/trunk/hot-babe/debian/desktop/hot-babe.desktop	                        (rev 0)
+++ dists/trunk/hot-babe/debian/desktop/hot-babe.desktop	2009-01-13 11:58:53 UTC (rev 187)
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=Hot-Babe
+Comment=Display the system activity in a very special way
+Icon=hot-babe
+TryExec=hot-babe
+Exec=hot-babe -d 20 -i -N
+Categories=Utility;Amusement;

Deleted: dists/trunk/hot-babe/debian/hot-babe-dbg.lintian-overrides
===================================================================
--- dists/trunk/hot-babe/debian/hot-babe-dbg.lintian-overrides	2009-01-13 11:55:59 UTC (rev 186)
+++ dists/trunk/hot-babe/debian/hot-babe-dbg.lintian-overrides	2009-01-13 11:58:53 UTC (rev 187)
@@ -1 +0,0 @@
-hot-babe-dbg: unknown-section restricted/devel

Deleted: dists/trunk/hot-babe/debian/hot-babe.examples
===================================================================
--- dists/trunk/hot-babe/debian/hot-babe.examples	2009-01-13 11:55:59 UTC (rev 186)
+++ dists/trunk/hot-babe/debian/hot-babe.examples	2009-01-13 11:58:53 UTC (rev 187)
@@ -1 +0,0 @@
-config.example

Deleted: dists/trunk/hot-babe/debian/hot-babe.lintian-overrides
===================================================================
--- dists/trunk/hot-babe/debian/hot-babe.lintian-overrides	2009-01-13 11:55:59 UTC (rev 186)
+++ dists/trunk/hot-babe/debian/hot-babe.lintian-overrides	2009-01-13 11:58:53 UTC (rev 187)
@@ -1 +0,0 @@
-hot-babe: unknown-section restricted/x11

Modified: dists/trunk/hot-babe/debian/hot-babe.menu
===================================================================
--- dists/trunk/hot-babe/debian/hot-babe.menu	2009-01-13 11:55:59 UTC (rev 186)
+++ dists/trunk/hot-babe/debian/hot-babe.menu	2009-01-13 11:58:53 UTC (rev 187)
@@ -1,3 +1,6 @@
-?package(hot-babe):needs="X11" section="Games/Toys"\
-  title="Hot-Babe" longtitle="sexy graphical system activity monitor"\
-  command="/usr/bin/hot-babe -i -N -d 20" icon="/usr/share/pixmaps/hot-babe.xpm"
+?package(hot-babe):needs="X11" \
+  section="Games/Toys" \
+  title="Hot-Babe" \
+  longtitle="Display the system activity in a very special way" \
+  command="/usr/bin/hot-babe -d 20 -i -N" \
+  icon="/usr/share/pixmaps/hot-babe.xpm"

Added: dists/trunk/hot-babe/debian/patches/01-cflags.patch
===================================================================
--- dists/trunk/hot-babe/debian/patches/01-cflags.patch	                        (rev 0)
+++ dists/trunk/hot-babe/debian/patches/01-cflags.patch	2009-01-13 11:58:53 UTC (rev 187)
@@ -0,0 +1,22 @@
+Remove hardcoded optimization flags, consider LDFLAGS.
+
+--- hot-babe-0.2.2.orig/Makefile
++++ hot-babe-0.2.2/Makefile
+@@ -3,7 +3,7 @@
+ VERSION := 0.2.2
+ 
+ # optimization cflags
+-CFLAGS += -O2 -Wall -g `pkg-config gdk-2.0 gdk-pixbuf-2.0  --cflags` -DPREFIX=\"$(PREFIX)\" -DVERSION=\"$(VERSION)\"
++CFLAGS += `pkg-config gdk-2.0 gdk-pixbuf-2.0  --cflags` -DPREFIX=\"$(PREFIX)\" -DVERSION=\"$(VERSION)\"
+ 
+ OBJS = hot-babe.o loader.o
+ CC = gcc
+@@ -14,7 +14,7 @@
+ all: hot-babe
+ 
+ hot-babe: $(OBJS)
+-	$(CC) -o hot-babe $(OBJS) $(LIBS)
++	$(CC) -o hot-babe $(OBJS) $(LDFLAGS) $(LIBS)
+ 
+ clean:
+ 	rm -f hot-babe *.o

Deleted: dists/trunk/hot-babe/debian/patches/01_cflags-ldflags.patch
===================================================================
--- dists/trunk/hot-babe/debian/patches/01_cflags-ldflags.patch	2009-01-13 11:55:59 UTC (rev 186)
+++ dists/trunk/hot-babe/debian/patches/01_cflags-ldflags.patch	2009-01-13 11:58:53 UTC (rev 187)
@@ -1,28 +0,0 @@
-diff -Nur hot-babe-0.2.2/Makefile hot-babe-0.2.2.new/Makefile
---- hot-babe-0.2.2/Makefile
-+++ hot-babe-0.2.2.new/Makefile
-@@ -3,7 +3,8 @@
- VERSION := 0.2.2
- 
- # optimization cflags
--CFLAGS += -O2 -Wall -g `pkg-config gdk-2.0 gdk-pixbuf-2.0  --cflags` -DPREFIX=\"$(PREFIX)\" -DVERSION=\"$(VERSION)\"
-+CFLAGS += -O2 -Wall -g
-+ALL_CFLAGS += `pkg-config gdk-2.0 gdk-pixbuf-2.0  --cflags` -DPREFIX=\"$(PREFIX)\" -DVERSION=\"$(VERSION)\" $(CFLAGS)
- 
- OBJS = hot-babe.o loader.o
- CC = gcc
-@@ -11,10 +12,13 @@
- 
- DOC = ChangeLog NEWS TODO LICENSE CONTRIBUTORS copyright config.example
- 
-+%.o: %.c
-+	$(CC) $(ALL_CFLAGS) -c $< -o $@
-+
- all: hot-babe
- 
- hot-babe: $(OBJS)
--	$(CC) -o hot-babe $(OBJS) $(LIBS)
-+	$(CC) -o hot-babe $(OBJS) $(LDFLAGS) $(LIBS)
- 
- clean:
- 	rm -f hot-babe *.o

Added: dists/trunk/hot-babe/debian/patches/series
===================================================================
--- dists/trunk/hot-babe/debian/patches/series	                        (rev 0)
+++ dists/trunk/hot-babe/debian/patches/series	2009-01-13 11:58:53 UTC (rev 187)
@@ -0,0 +1 @@
+01-cflags.patch

Modified: dists/trunk/hot-babe/debian/rules
===================================================================
--- dists/trunk/hot-babe/debian/rules	2009-01-13 11:55:59 UTC (rev 186)
+++ dists/trunk/hot-babe/debian/rules	2009-01-13 11:58:53 UTC (rev 187)
@@ -1,16 +1,52 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/makefile.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/quilt/quilt.make
 
-LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
+build: build-stamp
+build-stamp: $(QUILT_STAMPFN)
+	dh_testdir
 
-DEB_MAKE_BUILD_TARGET += PREFIX=/usr
-DEB_MAKE_INSTALL_TARGET += install PREFIX=/usr DESTDIR=$(CURDIR)/debian/hot-babe DOC="NEWS TODO CONTRIBUTORS"
+	$(MAKE) LDFLAGS+=-Wl,--as-needed PREFIX=/usr
 
-common-install-impl::
-	# Installing bug control
-	for BUG in debian/bug/*; do \
-		install -D -m 0644 $$BUG debian/`basename $$BUG`/usr/share/bug/`basename $$BUG`/control || exit 1; \
-	done
+	touch $@
+
+clean: unpatch
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp
+
+	$(MAKE) clean
+
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_prep
+	dh_installdirs
+
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/hot-babe DOC="NEWS TODO CONTRIBUTORS" PREFIX=/usr
+
+binary-indep:
+
+binary-arch: install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs ChangeLog
+	dh_installdocs
+	dh_installexamples config.example
+	dh_install
+	dh_installmenu
+	dh_desktop
+	dh_strip --dbg-package=hot-babe-dbg
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+
+.PHONY: build clean binary-indep binary-arch binary install




More information about the Restricted-changes mailing list