[Pkg-gtkpod-devel] r372 - gtkpod/trunk/debian

djpig at alioth.debian.org djpig at alioth.debian.org
Sun Jan 25 01:19:13 UTC 2009 

Author: djpig
Date: 2009-01-25 01:19:13 +0000 (Sun, 25 Jan 2009)
New Revision: 372

Added:
   gtkpod/trunk/debian/clean
   gtkpod/trunk/debian/gtkpod-data.dirs
   gtkpod/trunk/debian/gtkpod-data.docs
   gtkpod/trunk/debian/gtkpod-data.install
   gtkpod/trunk/debian/gtkpod-data.links
   gtkpod/trunk/debian/gtkpod-data.lintian-overrides
   gtkpod/trunk/debian/gtkpod-data.manpages
   gtkpod/trunk/debian/gtkpod-data.menu
   gtkpod/trunk/debian/gtkpod.install
   gtkpod/trunk/debian/gtkpod.links
Removed:
   gtkpod/trunk/debian/dirs
   gtkpod/trunk/debian/docs
   gtkpod/trunk/debian/install
   gtkpod/trunk/debian/menu
Modified:
   gtkpod/trunk/debian/changelog
   gtkpod/trunk/debian/compat
   gtkpod/trunk/debian/control
   gtkpod/trunk/debian/rules
Log:
Reorganise packaging. Move arch-indep data to
gtkpod-data package and rewrite debian/rules to
use dh.


Modified: gtkpod/trunk/debian/changelog
===================================================================
--- gtkpod/trunk/debian/changelog	2009-01-24 23:28:38 UTC (rev 371)
+++ gtkpod/trunk/debian/changelog	2009-01-25 01:19:13 UTC (rev 372)
@@ -4,6 +4,9 @@
     + drop patch 10_usage--auto, applied upstream
     + drop patch 20_scripts_bashisms, applied upstream
     + bump libgpod-dev build-dependency to >= 0.7.0
+  * Reorganise packaging. Move arch-indep data to
+    gtkpod-data package and rewrite debian/rules to
+    use dh.
   * Fix watch file to use SF.net redirector implicetly
   * Bump Standards-Version to 3.8.0
     + Add debian README.source about dpatch

Added: gtkpod/trunk/debian/clean
===================================================================
--- gtkpod/trunk/debian/clean	                        (rev 0)
+++ gtkpod/trunk/debian/clean	2009-01-25 01:19:13 UTC (rev 372)
@@ -0,0 +1,2 @@
+gtkpod.1
+pixmaps/gtkpod.glade*

Modified: gtkpod/trunk/debian/compat
===================================================================
--- gtkpod/trunk/debian/compat	2009-01-24 23:28:38 UTC (rev 371)
+++ gtkpod/trunk/debian/compat	2009-01-25 01:19:13 UTC (rev 372)
@@ -1 +1 @@
-6
+7

Modified: gtkpod/trunk/debian/control
===================================================================
--- gtkpod/trunk/debian/control	2009-01-24 23:28:38 UTC (rev 371)
+++ gtkpod/trunk/debian/control	2009-01-25 01:19:13 UTC (rev 372)
@@ -3,7 +3,12 @@
 Priority: extra
 Maintainer: gtkpod Maintainers <pkg-gtkpod-devel at lists.alioth.debian.org>
 Uploaders: Frank Lichtenheld <djpig at debian.org>, Nico Golde <nion at debian.org>
-Build-Depends: debhelper (>= 6), gettext, flex, autotools-dev, perl, libxml-parser-perl, libgtk2.0-dev, libglade2-dev, libgnomecanvas2-dev, libgnomevfs2-dev, libid3tag0-dev, libvorbis-dev, libflac-dev, libgpod-dev (>= 0.7.0), libcurl4-gnutls-dev, libhal-dev, dpatch
+Build-Depends: debhelper (>= 7), dpatch,
+ gettext, flex, autotools-dev, perl, libxml-parser-perl,
+ libgtk2.0-dev, libglade2-dev, libgnomecanvas2-dev, libgnomevfs2-dev,
+ libid3tag0-dev, libvorbis-dev, libflac-dev,
+ libcurl4-gnutls-dev, libhal-dev,
+ libgpod-dev (>= 0.7.0)
 Standards-Version: 3.8.0
 Homepage: http://www.gtkpod.org
 Vcs-Svn: svn://svn.debian.org/svn/pkg-gtkpod/gtkpod/trunk
@@ -11,7 +16,8 @@
 
 Package: gtkpod
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ gtkpod-data (= ${source:Version})
 Recommends: id3v2, vorbis-tools
 Suggests: mp3gain, python, perl, faad,
 # not in Debian:
@@ -22,3 +28,18 @@
  tag editing, multiple charsets for ID3 tags, detects duplicate songs,
  allows offline modification of the database with later synchronisation,
  and more.
+
+Package: gtkpod-data
+Architecture: all
+Depends: ${misc:Depends}
+Suggests: gtkpod
+Replaces: gtkpod (<< 0.99.14)
+Description: architecture-independent files for gtkpod
+ gtkpod is a platform independent GUI for Apple's iPod using GTK2. It
+ allows you to upload songs and playlists to your iPod. It supports ID3
+ tag editing, multiple charsets for ID3 tags, detects duplicate songs,
+ allows offline modification of the database with later synchronisation,
+ and more.
+ .
+ This package contains documentation, translations and images for
+ gtkpod.

Deleted: gtkpod/trunk/debian/dirs
===================================================================
--- gtkpod/trunk/debian/dirs	2009-01-24 23:28:38 UTC (rev 371)
+++ gtkpod/trunk/debian/dirs	2009-01-25 01:19:13 UTC (rev 372)
@@ -1,2 +0,0 @@
-usr/bin
-usr/share/pixmaps

Deleted: gtkpod/trunk/debian/docs
===================================================================
--- gtkpod/trunk/debian/docs	2009-01-24 23:28:38 UTC (rev 371)
+++ gtkpod/trunk/debian/docs	2009-01-25 01:19:13 UTC (rev 372)
@@ -1 +0,0 @@
-README

Copied: gtkpod/trunk/debian/gtkpod-data.dirs (from rev 362, gtkpod/trunk/debian/dirs)
===================================================================
--- gtkpod/trunk/debian/gtkpod-data.dirs	                        (rev 0)
+++ gtkpod/trunk/debian/gtkpod-data.dirs	2009-01-25 01:19:13 UTC (rev 372)
@@ -0,0 +1 @@
+usr/share/pixmaps


Property changes on: gtkpod/trunk/debian/gtkpod-data.dirs
___________________________________________________________________
Name: svn:mergeinfo
   + 

Copied: gtkpod/trunk/debian/gtkpod-data.docs (from rev 362, gtkpod/trunk/debian/docs)
===================================================================
--- gtkpod/trunk/debian/gtkpod-data.docs	                        (rev 0)
+++ gtkpod/trunk/debian/gtkpod-data.docs	2009-01-25 01:19:13 UTC (rev 372)
@@ -0,0 +1 @@
+README


Property changes on: gtkpod/trunk/debian/gtkpod-data.docs
___________________________________________________________________
Name: svn:mergeinfo
   + 

Copied: gtkpod/trunk/debian/gtkpod-data.install (from rev 362, gtkpod/trunk/debian/install)
===================================================================
--- gtkpod/trunk/debian/gtkpod-data.install	                        (rev 0)
+++ gtkpod/trunk/debian/gtkpod-data.install	2009-01-25 01:19:13 UTC (rev 372)
@@ -0,0 +1,3 @@
+debian/tmp/usr/share usr
+debian/gtkpod-icon-32x32.xpm usr/share/pixmaps
+debian/gtkpod.desktop usr/share/applications


Property changes on: gtkpod/trunk/debian/gtkpod-data.install
___________________________________________________________________
Name: svn:mergeinfo
   + 

Added: gtkpod/trunk/debian/gtkpod-data.links
===================================================================
--- gtkpod/trunk/debian/gtkpod-data.links	                        (rev 0)
+++ gtkpod/trunk/debian/gtkpod-data.links	2009-01-25 01:19:13 UTC (rev 372)
@@ -0,0 +1 @@
+/usr/share/gtkpod/doc /usr/share/doc/gtkpod/html

Added: gtkpod/trunk/debian/gtkpod-data.lintian-overrides
===================================================================
--- gtkpod/trunk/debian/gtkpod-data.lintian-overrides	                        (rev 0)
+++ gtkpod/trunk/debian/gtkpod-data.lintian-overrides	2009-01-25 01:19:13 UTC (rev 372)
@@ -0,0 +1,5 @@
+# gtkpod-data is only useful together with gtkpod
+gtkpod-data: python-script-but-no-python-dep ./usr/share/gtkpod/scripts/sync-palm-jppy.py
+gtkpod-data: desktop-command-not-in-package /usr/share/applications/gtkpod.desktop gtkpod
+gtkpod-data: pkg-not-in-package-test gtkpod /usr/share/menu/gtkpod-data
+gtkpod-data: menu-command-not-in-package /usr/share/menu/gtkpod-data:3 /usr/bin/gtkpod

Added: gtkpod/trunk/debian/gtkpod-data.manpages
===================================================================
--- gtkpod/trunk/debian/gtkpod-data.manpages	                        (rev 0)
+++ gtkpod/trunk/debian/gtkpod-data.manpages	2009-01-25 01:19:13 UTC (rev 372)
@@ -0,0 +1 @@
+gtkpod.1

Copied: gtkpod/trunk/debian/gtkpod-data.menu (from rev 362, gtkpod/trunk/debian/menu)
===================================================================
--- gtkpod/trunk/debian/gtkpod-data.menu	                        (rev 0)
+++ gtkpod/trunk/debian/gtkpod-data.menu	2009-01-25 01:19:13 UTC (rev 372)
@@ -0,0 +1,3 @@
+?package(gtkpod):needs="X11" section="Applications/Sound" \
+  title="gtkpod" command="/usr/bin/gtkpod" \
+  icon="/usr/share/pixmaps/gtkpod-icon-32x32.xpm"


Property changes on: gtkpod/trunk/debian/gtkpod-data.menu
___________________________________________________________________
Name: svn:mergeinfo
   + 

Added: gtkpod/trunk/debian/gtkpod.install
===================================================================
--- gtkpod/trunk/debian/gtkpod.install	                        (rev 0)
+++ gtkpod/trunk/debian/gtkpod.install	2009-01-25 01:19:13 UTC (rev 372)
@@ -0,0 +1 @@
+usr/bin usr

Added: gtkpod/trunk/debian/gtkpod.links
===================================================================
--- gtkpod/trunk/debian/gtkpod.links	                        (rev 0)
+++ gtkpod/trunk/debian/gtkpod.links	2009-01-25 01:19:13 UTC (rev 372)
@@ -0,0 +1 @@
+/usr/share/doc/gtkpod-data /usr/share/doc/gtkpod

Deleted: gtkpod/trunk/debian/install
===================================================================
--- gtkpod/trunk/debian/install	2009-01-24 23:28:38 UTC (rev 371)
+++ gtkpod/trunk/debian/install	2009-01-25 01:19:13 UTC (rev 372)
@@ -1,2 +0,0 @@
-debian/gtkpod-icon-32x32.xpm usr/share/pixmaps
-debian/gtkpod.desktop usr/share/applications

Deleted: gtkpod/trunk/debian/menu
===================================================================
--- gtkpod/trunk/debian/menu	2009-01-24 23:28:38 UTC (rev 371)
+++ gtkpod/trunk/debian/menu	2009-01-25 01:19:13 UTC (rev 372)
@@ -1,3 +0,0 @@
-?package(gtkpod):needs="X11" section="Applications/Sound" \
-  title="gtkpod" command="/usr/bin/gtkpod" \
-  icon="/usr/share/pixmaps/gtkpod-icon-32x32.xpm"

Modified: gtkpod/trunk/debian/rules
===================================================================
--- gtkpod/trunk/debian/rules	2009-01-24 23:28:38 UTC (rev 371)
+++ gtkpod/trunk/debian/rules	2009-01-25 01:19:13 UTC (rev 372)
@@ -1,67 +1,31 @@
 #!/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)
-
-CFLAGS = -Wall -g
-
 include /usr/share/dpatch/dpatch.make
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
-config.status: patch-stamp configure
-	dh_testdir
-	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
-
 build: build-stamp
 
-build-stamp:  config.status
+build-stamp: patch-stamp
 	dh_testdir
 
-	$(MAKE)
+	dh build
 	pod2man --release "gtkpod 0.99.12" --center "gtkpod Manual" debian/gtkpod.pod >gtkpod.1
 	touch build-stamp
 
 clean: unpatch
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp gtkpod.1 pixmaps/gtkpod.glade*
-	[ ! -f Makefile ] || $(MAKE) distclean
-	dh_clean
+	dh clean
 
 install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/gtkpod
+	dh install --before dh_installdocs
+	dh_installdocs -i
+	dh_installchangelogs -i
+	dh_installexamples -i
+	dh install --after dh_installexamples
 
 binary-indep: build install
+	dh binary-indep
 
 binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-	dh_installmenu
-	dh_installman gtkpod.1
-	dh_install
-	dh_icons
-	dh_desktop
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+	dh binary-arch
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install

More information about the Pkg-gtkpod-devel mailing list