[Pkg-ocaml-maint-commits] [SCM] nurpawiki packaging branch, master, updated. upstream/1.2.1-19-g8ac711c

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 8ac711ca53a1a18d42d5a92cbc573bf620116aa6
Author: Stephane Glondu <steph at glondu.net>
Date:   Wed Oct 15 01:04:38 2008 +0200

    All patches have been merged in upstream

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 5757c40..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,59 +0,0 @@
-Building Nurpawiki for Debian
------------------------------
-
-The nurpawiki source package uses quilt to apply and remove its
-patches.  Please refer to /usr/share/doc/quilt/README.source for
-information about how to use quilt for source packages.
-
-The quilt series is, however, generated from the Git repository, using
-TopGit. Please refer to /usr/share/doc/topgit/README.source for more
-information.
-
-
-1. Cloning the repository
-~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Cloning a TopGit repository requires an additional step to normal Git
-cloning:
-
- 1. git clone ssh://git.debian.org/git/pkg-ocaml-maint/packages/nurpawiki.git
- 2. cd nurpawiki
- 3. tg remote --populate origin
-
-
-2. Building from the Git repository
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
- 1. Checkout the master branch
- 2. Update (and commit) TG_BRANCHES in debian/rules (if needed)
- 3. Checkout the build branch, and merge master into it
- 4. Generate debian/patches:
-      debian/rules tg-export
- 5. Update the branch (if needed):
-      git checkout build
-      git add -f -u
-      git add -f debian/patches
-      git commit "Releasing ${VERSION}"
- 6. Build the package (and tag):
-      git-buildpackage \
-        --git-pristine-tar --git-tag \
-        --git-debian-branch=build [options]
-
-During development/tests, you can work directly on branch master,
-provided you tell git to ignore debian/patches. You can then skip
-steps 3 and 5, and forget --git-tag and --git-debian-branch options in
-step 6:
-
-  git-buildpackage --git-pristine-tar [options]
-
-Notes:
- - don't commit serialized patches into master
- - don't commit patched sources into master ("git status" will be
-   meaningful only after "debclean")
-
-
-3. Known problems
-~~~~~~~~~~~~~~~~~
-
-The failure of any step explained here or in TopGit's README.source
-may be difficult to sort out and result in headaches!
diff --git a/debian/control b/debian/control
index b375869..72bdb3f 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,6 @@ Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Stephane Glondu <steph at glondu.net>
 DM-Upload-Allowed: yes
 Build-Depends:
- quilt,
  debhelper (>= 7),
  ocsigen-dev (>= 1.1.0),
  libcalendar-ocaml-dev,
diff --git a/debian/rules b/debian/rules
index a5d3e3b..bf9dc9d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,14 +4,9 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-TG_BRANCHES = fixes/ocsigen-1.1.0 fixes/calendar-2.0.2
-
 # For ocamlfind
 export OCAMLFIND_DESTDIR = debian/nurpawiki/usr/lib/ocsigen
 
-# We want to use quilt
-include /usr/share/quilt/quilt.make
-
 build: build-stamp
 build-stamp: $(QUILT_STAMPFN)
 	dh build
@@ -39,17 +34,4 @@ binary-arch: install-stamp
 
 binary: binary-indep binary-arch
 
-tg-export:
-	tg create stage-debian $(TG_BRANCHES)
-	git commit -m "staging"
-	rm -Rf debian/patches.new
-	tg export --quilt debian/patches.new
-	git rm -f .top*
-	git checkout master
-	tg delete stage-debian
-	rm debian/patches.new/stage-*
-	sed -i '/^stage-/d' debian/patches.new/series
-	rm -Rf debian/patches
-	mv debian/patches.new debian/patches
-
 .PHONY: build clean binary-indep binary-arch binary install tg-export

-- 
nurpawiki packaging