GNOME.org
 

[sawfish] updated debian packaging scripts

commit 536653468294271f690ed5607523f3cb0e5a13a1
Author: Christopher Roy Bratusek <zanghar freenet de>
Date:   Wed Mar 2 18:42:39 2011 +0100

    updated debian packaging scripts

 ChangeLog                          |   22 ++++++++
 Makefile.in                        |    1 -
 configure.in                       |    5 --
 debian/README.Debian               |   45 ----------------
 debian/README.sawfish-data         |    5 --
 debian/README.source               |   57 --------------------
 debian/README.themes               |    1 -
 debian/{changelog.in => changelog} |    4 +-
 debian/{control.in => control}     |    8 ++--
 debian/patches/series              |    1 +
 debian/rules                       |  103 +----------------------------------
 debian/sawfish-data.docs           |    9 +++
 debian/sawfish-data.install.in     |    1 -
 debian/sawfish-dbg.links           |    2 +-
 debian/sawfish-lisp-source.links   |    2 +-
 debian/sawfish-lisp-source.lintian |    1 -
 debian/sawfish.links               |    2 +-
 debian/source/format               |    2 +-
 debian/watch                       |    3 -
 19 files changed, 45 insertions(+), 229 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index ac3bca6..2f1ebd0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2011-03-02  Christopher Roy Bratusek <zanghar freenet de>
+	* debian/watch
+	* debian/sawfish-lisp-source.lintian
+	* debian/README*: removed
+
+	* debian/changelog.in
+	* debian/changelog: renamed file
+
+	* debian/control.in
+	* debian/control: renamed file
+
+	* configure.in: don't export gitdate
+	                don't generate debian/changelog
+			don't generate debian/control
+
+	* debian/rules: update
+
+	* Makefile.in: don't remove debian/changelog
+	               debian/contro.
+
+	* debian/sawfish-data.docs: added
+
 2011-03-01  Teika Kazura <teika lavabit com>
 	* lisp/sawfish/wm/commands/move-resize.jl
 	* lisp/sawfish/wm/state/iconify.jl
diff --git a/Makefile.in b/Makefile.in
index bd82be5..22b11de 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -106,7 +106,6 @@ gitclean : distclean
 	rm -rf autom4te.cache
 	rm -f sawfish.spec sawfish*.ebuild
 	-fakeroot debian/rules clean
-	rm -f debian/changelog debian/control
 
 
 TAGS :
diff --git a/configure.in b/configure.in
index cbb0ae1..65f5e0d 100644
--- a/configure.in
+++ b/configure.in
@@ -354,8 +354,6 @@ if test $REP_MSGFMT = true; then
 fi
 AC_MSG_RESULT($LINGUAS)
 
-gitdate=`date +%y%m%d`
-
 dnl Nonstandard exported symbols
 AC_SUBST(version)
 AC_SUBST(subversion)
@@ -365,7 +363,6 @@ AC_SUBST(lispdir)
 AC_SUBST(localedir)
 AC_SUBST(install_sh)
 AC_SUBST(datarootdir)
-AC_SUBST(gitdate)
 AC_SUBST(imageloader)
 AC_SUBST(MAKEDEP)
 AC_SUBST(GNOMEDIR)
@@ -422,8 +419,6 @@ scripts/Makefile
 sounds/Makefile
 src/Makefile
 themes/Makefile
-debian/changelog
-debian/control
 ])
 
 AC_OUTPUT
diff --git a/debian/changelog.in b/debian/changelog
similarity index 51%
rename from debian/changelog.in
rename to debian/changelog
index 008a92a..f43e7a0 100644
--- a/debian/changelog.in
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-sawfish (1:@version ~@gitdate -1nano) unstable; urgency=low
+sawfish (1:1.8.0-1nano) unstable; urgency=low
 
-  * New upstream GIT
+  * New upstream release
 
  -- Christopher Roy Bratusek <zanghar freenet de>  Sat, 24 Oct 2009 22:55:17 +0100
diff --git a/debian/control.in b/debian/control
similarity index 91%
rename from debian/control.in
rename to debian/control
index c741b75..77c3c62 100644
--- a/debian/control.in
+++ b/debian/control
@@ -6,17 +6,17 @@ Standards-Version: 3.8.3
 Build-Depends: gettext (>= 0.10.37),
                debhelper (>= 7.0.0),
                libxinerama-dev,
-               rep-gtk (>= 1:@REP_GTK_MIN_VER ~@gitdate@),
+               rep-gtk (>= 1:0.90.4),
                libgmp10-dev | libgmp3-dev (>= 4.1.4-8),
                texinfo (<< 4.11) | texinfo (>= 4.11.dfsg.1-3), 
-               libgtk2.0-dev (>= @GTK_MIN_VER@),
+               libgtk2.0-dev (>= 2.12.0),
                libxrender-dev,
                libxext-dev,
                autotools-dev,
                automake,
                quilt (>=0.40),
-               librep-dev (>= @REP_MIN_VER ~@gitdate@),
-               rep (>= @REP_MIN_VER ~@gitdate@),
+               librep-dev (>= 0.91.0),
+               rep (>= 0.91.0),
                libtool
 Homepage: http://sawfish.wikia.com/
 
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..f8ccc04 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+debian-changes-1:1.8.0-1nano
diff --git a/debian/rules b/debian/rules
index 249b182..bd71e69 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,8 +2,6 @@
 
 export DH_VERBOSE=1
 
-include /usr/share/quilt/quilt.make
-
 version = $(shell sed -n 's/version="\(.*\)"/\1/p' configure.in | head -n 1)
 
 DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -23,50 +21,16 @@ else
 	CFLAGS += -O2
 endif
 
-LC_ALL=
-LINGUAS=
-LANG=
-export LC_ALL LINGUAS LANG
+%:
+	dh $@
 
-configure: configure-stamp
-configure-stamp: $(QUILT_STAMPFN)
-	dh_testdir
-
-	CFLAGS="$(CFLAGS)" ./configure --prefix=/usr --with-readline $(confflags)
-
-# Get rid of rpath
-	set -e; \
-	 tmpfile=`mktemp`; \
-	 sed "s/^REP_LIBS=\(.*\)-Wl,--rpath -Wl,[^ ]* \(.*\)$$/REP_LIBS=\1 \2/" Makedefs >$$tmpfile ;\
-	 mv $$tmpfile Makedefs
-
-	touch configure-stamp
-
-build: build-stamp
-build-stamp: configure-stamp
-
-	$(MAKE)
-
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-
-	[ ! -f Makefile ] || $(MAKE) distclean
-
-	dh_clean
-	$(MAKE) -f debian/rules unpatch
-
-install: build
+override_dh_install:
 	dh_testdir
 	dh_testroot
 	dh_installdirs
 
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 
-# Remove info files installed by Makefile. dh_installinfo will do it again without creating info.dir
 	find debian -type d -name info | xargs rm -rf
 
 	[ ! -f debian/sawfish-lisp-source.install ] || rm debian/sawfish-lisp-source.install
@@ -79,66 +43,5 @@ install: build
 
 	dh_install --fail-missing
 
-# These are scripts. (Actually, they are /usr/bin/sawfish-config before and after compiling)
-# Should that be a symlink?
 	chmod a+x debian/sawfish/usr/share/sawfish/$(version)/lisp/sawfish/cfg/main.jlc
 	chmod a+x debian/sawfish-lisp-source/usr/share/sawfish/$(version)/lisp/sawfish/cfg/main.jl
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-	dh_testdir -i
-	dh_testroot -i
-	dh_installdocs -psawfish-data FAQ NEWS README TODO OPTIONS KEYBINDINGS USERDOC
-	dh_installinfo -psawfish-data
-	dh_installexamples -psawfish-data
-	dh_installmenu -psawfish-data
-	dh_installchangelogs -psawfish-data
-	dh_link -i
-	dh_compress -i
-	dh_fixperms -i
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installmenu -a
-	dh_installman -a
-	dh_installemacsen -a -psawfish
-	dh_link -a
-	dh_strip -a --dbg-package=sawfish-dbg
-	dh_compress -a
-	dh_fixperms -a
-	dh_installdeb -a
-	dh_shlibdeps -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
-
-binary: binary-indep binary-arch
-
-# Obtain upstream source snapshot from svn. Leaves it in
-# debian/sawfish_$version.orig.tar.gz
-# By default will get the latest version available, but can be controlled
-# by setting SVN_REV before calling make
-
-SVN_REPO ?= svn://svn.gnome.org/svn/sawfish/trunk
-SVN_REV  ?= $(shell LANG=C svn info $(SVN_REPO) | grep Revision: | cut -d: -f 2 | sed 's/^ *\([^ ]*\) *$$/\1/')
-export_dir = debian/tmp-src
-
-source:
-	dh_testdir
-	mkdir -p $(export_dir)
-	svn export -q -r $(SVN_REV) $(SVN_REPO) $(export_dir)/sawfish
-# remove unneeded files
-	cd $(export_dir)/sawfish; \
-	 find . -name .cvsignore | xargs rm
-	cd $(export_dir); \
-	  tar czf ../sawfish_$$(sed -n 's/version="\(.*\)"/\1/p' sawfish/configure.in | head -n 1)+svn$(SVN_REV).orig.tar.gz sawfish
-	-rm -rf $(export_dir)
-
-.PHONY: build clean binary-indep binary-arch binary install configure
diff --git a/debian/sawfish-data.docs b/debian/sawfish-data.docs
new file mode 100644
index 0000000..8c3b8f3
--- /dev/null
+++ b/debian/sawfish-data.docs
@@ -0,0 +1,9 @@
+CONTRIBUTING
+COPYING
+COPYING.SOUNDS
+KEYBINDINGS
+README
+README.IMPORTANT
+FAQ
+USERDOC
+TODO
diff --git a/debian/sawfish-data.install.in b/debian/sawfish-data.install.in
index a4be5d8..9ebf9d1 100644
--- a/debian/sawfish-data.install.in
+++ b/debian/sawfish-data.install.in
@@ -1,4 +1,3 @@
-debian/README.themes usr/share/sawfish/themes
 usr/share/locale
 usr/share/sawfish/*/lisp/sawfish/wm/autoload.jl
 usr/share/sawfish/*/lisp/sawfish/wm/custom-defaults.jl
diff --git a/debian/sawfish-dbg.links b/debian/sawfish-dbg.links
index bb74d90..234f6ce 100644
--- a/debian/sawfish-dbg.links
+++ b/debian/sawfish-dbg.links
@@ -1 +1 @@
-usr/share/doc/sawfish-data usr/share/doc/sawfish-dbg
+usr/share/doc/sawfish-dbg usr/share/doc/sawfish-data
diff --git a/debian/sawfish-lisp-source.links b/debian/sawfish-lisp-source.links
index b0f7bc0..c238f1a 100644
--- a/debian/sawfish-lisp-source.links
+++ b/debian/sawfish-lisp-source.links
@@ -1 +1 @@
-usr/share/doc/sawfish-data usr/share/doc/sawfish-lisp-source
+usr/share/doc/sawfish-lisp-source usr/share/doc/sawfish-data 
diff --git a/debian/sawfish.links b/debian/sawfish.links
index 6090aa2..94b99fb 100644
--- a/debian/sawfish.links
+++ b/debian/sawfish.links
@@ -1 +1 @@
-usr/share/doc/sawfish-data usr/share/doc/sawfish
+usr/share/doc/sawfish usr/share/doc/sawfish-data
diff --git a/debian/source/format b/debian/source/format
index 89ae9db..163aaf8 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-3.0 (native)
+3.0 (quilt)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]