[Pkg-samba-maint] [Git][samba-team/samba][master] 3 commits: d/README.source.md: ldb is not external anymore

[Michael Tokarev (@mjt)]

Michael Tokarev pushed to branch master at Debian Samba Team / samba


Commits:
99a35c81 by Michael Tokarev at 2022-03-31T16:48:19+03:00
d/README.source.md: ldb is not external anymore

- - - - -
1bfe30ea by Michael Tokarev at 2022-03-31T16:52:06+03:00
d/README.source.md: use quilt instead of git am to apply debian/patches/

- - - - -
21e9b29a by Michael Tokarev at 2022-03-31T16:54:30+03:00
d/README.source.md: give alternative way to build source

git-buildpackage does many extra things, like checking
everything's committed, there's no extra files etc.
But it does not do any changes to the source when asked
to build a package, - regular dpkg-buildpackage can be
used for the same task too. Give it as an alternative
example.

This might be good starting point for ones who are
not immediately familiar with cowbuilder or
gbp buildpackage.

- - - - -


2 changed files:

- debian/README.source.md
- debian/changelog


Changes:

=====================================
debian/README.source.md
=====================================
@@ -22,6 +22,13 @@ Each time:
     gbp pull --track-missing
     gbp buildpackage --git-pbuilder --git-dist=sid --git-arch=amd64
 
+Alternatively, source-only:
+
+    cd samba
+    git checkout master
+    dpkg-buildpackage -S -d
+    # build the resulting ../samba_*.dsc with other means
+
 Merging minor upstream releases
 ===============================
 
@@ -76,14 +83,14 @@ After `gbp pull`:
 
 Then several steps are needed:
 
-- Apply all patches:
+- Check patches:
 
-        git am $(cat debian/patches/series | sed s@^@debian/patches/@)
+        QUILT_PATCHES=debian/patches quilt push -a
         # then update or drop patches as needed
 
-- Bump talloc, tdb, tevent and ldb Build-Depends in debian/control, from lib/*/wscript
+- Bump talloc, tdb, and tevent Build-Depends in debian/control, from lib/*/wscript
 
-        grep ^VERSION lib/{talloc,tdb,tevent,ldb}/wscript
+        grep ^VERSION lib/{talloc,tdb,tevent}/wscript
         editor debian/control
 
 - Check if other Build-Depends need to be bumped


=====================================
debian/changelog
=====================================
@@ -42,6 +42,8 @@ samba (2:4.16.0+dfsg-1) UNRELEASED; urgency=medium
     variant only, no build-dir one.
   * samba-common-bin.postinst: explicitly mkdir /run/samba before invoking
     samba binaries (Closes: #953530)
+  * in the salsa git repository of samba, stop keeping debian patches in
+    applied form, keep them in d/patches/ only as most other packages do.
 
  -- Michael Tokarev <mjt at tls.msk.ru>  Thu, 24 Mar 2022 13:54:07 +0300
 



View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/9cfe68cfa99d6c283f6fc468a626e1a9698ed309...21e9b29a38aa58b2347414eb96e1fefae7e0da7d

-- 
View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/9cfe68cfa99d6c283f6fc468a626e1a9698ed309...21e9b29a38aa58b2347414eb96e1fefae7e0da7d
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-samba-maint/attachments/20220331/e1dd545a/attachment-0001.htm>